Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 67771: [CRT] Don't mess up with the stack nor leak resources
by pschweitzer＠svn.reactos.org 16 May '15

16 May '15

Author: pschweitzer Date: Sat May 16 12:07:38 2015 New Revision: 67771 URL: http://svn.reactos.org/svn/reactos?rev=67771&view=rev Log: [CRT] Don't mess up with the stack nor leak resources Modified: trunk/reactos/lib/sdk/crt/process/process.c Modified: trunk/reactos/lib/sdk/crt/process/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/proces… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/process.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/process.c [iso-8859-1] Sat May 16 12:07:38 2015 @@ -344,6 +344,7 @@ ret = do_spawnT(mode, cmdname, args, NULL); free(args); } + va_end(argp); return ret; } @@ -398,6 +399,7 @@ { free(envs); } + va_end(argp); return ret; } @@ -459,6 +461,7 @@ ret = do_spawnT(mode, find_execT(cmdname, pathname), args, NULL); free(args); } + va_end(argp); return ret; } @@ -495,6 +498,7 @@ { free(envs); } + va_end(argp); return ret; } @@ -529,6 +533,7 @@ ret = do_spawnT(_P_OVERLAY, cmdname, args, NULL); free(args); } + va_end(argp); return ret; } @@ -572,6 +577,7 @@ { free(envs); } + va_end(argp); return ret; } @@ -604,6 +610,7 @@ ret = do_spawnT(_P_OVERLAY, find_execT(cmdname, pathname), args, NULL); free(args); } + va_end(argp); return ret; } @@ -648,6 +655,7 @@ { free(envs); } + va_end(argp); return ret; }

1 0

[tkreuzer] 67770: [NDK] - Add coprocessor constants [NTOSKRNL] - Handle process in NtFlushInstructionCache and validate parameters - Use _MoveToCoprocessor instead of GCC inline assembly for ARM
by tkreuzer＠svn.reactos.org 16 May '15

16 May '15

Author: tkreuzer Date: Sat May 16 11:30:28 2015 New Revision: 67770 URL: http://svn.reactos.org/svn/reactos?rev=67770&view=rev Log: [NDK] - Add coprocessor constants [NTOSKRNL] - Handle process in NtFlushInstructionCache and validate parameters - Use _MoveToCoprocessor instead of GCC inline assembly for ARM Modified: trunk/reactos/drivers/crypto/ksecdd/ksecdd.h trunk/reactos/drivers/crypto/ksecdd/random.c trunk/reactos/include/asm/ksarm.template.h trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/drivers/crypto/ksecdd/ksecdd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd.h [iso-8859-1] Sat May 16 11:30:28 2015 @@ -9,6 +9,7 @@ #define _NO_KSECDD_IMPORT_ #include <ntifs.h> #include <ndk/exfuncs.h> +#include <ndk/ketypes.h> #include <pseh/pseh2.h> #include <ntstrsafe.h> Modified: trunk/reactos/drivers/crypto/ksecdd/random.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/rand… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] Sat May 16 11:30:28 2015 @@ -77,8 +77,6 @@ } #endif #elif defined(_M_ARM) -/* FIXME: this should go into a public header (from ksarm.h) */ -#define CP15_PMCCNTR 15, 0, 9, 13, 0 /* Read the Cycle Counter Register */ MachineSpecificCounters->Ccr = _MoveFromCoprocessor(CP15_PMCCNTR); #else Modified: trunk/reactos/include/asm/ksarm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ksarm.template… ============================================================================== --- trunk/reactos/include/asm/ksarm.template.h [iso-8859-1] (original) +++ trunk/reactos/include/asm/ksarm.template.h [iso-8859-1] Sat May 16 11:30:28 2015 @@ -561,144 +561,5 @@ -#define CP15_MIDR 15, 0, 0, 0, 0 -#define CP15_CTR 15, 0, 0, 0, 1 -#define CP15_TCMTR 15, 0, 0, 0, 2 -#define CP15_TLBTR 15, 0, 0, 0, 3 -#define CP15_MPIDR 15, 0, 0, 0, 5 -#define CP15_PFR0 15, 0, 0, 1, 0 -#define CP15_PFR1 15, 0, 0, 1, 1 -#define CP15_DFR0 15, 0, 0, 1, 2 -#define CP15_AFR0 15, 0, 0, 1, 3 -#define CP15_MMFR0 15, 0, 0, 1, 4 -#define CP15_MMFR1 15, 0, 0, 1, 5 -#define CP15_MMFR2 15, 0, 0, 1, 6 -#define CP15_MMFR3 15, 0, 0, 1, 7 -#define CP15_ISAR0 15, 0, 0, 2, 0 -#define CP15_ISAR1 15, 0, 0, 2, 1 -#define CP15_ISAR2 15, 0, 0, 2, 2 -#define CP15_ISAR3 15, 0, 0, 2, 3 -#define CP15_ISAR4 15, 0, 0, 2, 4 -#define CP15_ISAR5 15, 0, 0, 2, 5 -#define CP15_ISAR6 15, 0, 0, 2, 6 -#define CP15_ISAR7 15, 0, 0, 2, 7 -#define CP15_SCTLR 15, 0, 1, 0, 0 -#define CP15_ACTLR 15, 0, 1, 0, 1 -#define CP15_CPACR 15, 0, 1, 0, 2 -#define CP15_SCR 15, 0, 1, 1, 0 -#define CP15_SDER 15, 0, 1, 1, 1 -#define CP15_NSACR 15, 0, 1, 1, 2 -#define CP15_TTBR0 15, 0, 2, 0, 0 -#define CP15_TTBR1 15, 0, 2, 0, 1 -#define CP15_TTBCR 15, 0, 2, 0, 2 -#define CP15_DACR 15, 0, 3, 0, 0 -#define CP15_DFSR 15, 0, 5, 0, 0 -#define CP15_IFSR 15, 0, 5, 0, 1 -#define CP15_DFAR 15, 0, 6, 0, 0 -#define CP15_IFAR 15, 0, 6, 0, 2 -#define CP15_ICIALLUIS 15, 0, 7, 1, 0 -#define CP15_BPIALLIS 15, 0, 7, 1, 6 -#define CP15_ICIALLU 15, 0, 7, 5, 0 -#define CP15_ICIMVAU 15, 0, 7, 5, 1 -#define CP15_BPIALL 15, 0, 7, 5, 6 -#define CP15_BPIMVA 15, 0, 7, 5, 7 -#define CP15_DCIMVAC 15, 0, 7, 6, 1 -#define CP15_DCISW 15, 0, 7, 6, 2 -#define CP15_DCCMVAC 15, 0, 7, 10, 1 -#define CP15_DCCSW 15, 0, 7, 10, 2 -#define CP15_DCCMVAU 15, 0, 7, 11, 1 -#define CP15_DCCIMVAC 15, 0, 7, 14, 1 -#define CP15_DCCISW 15, 0, 7, 14, 2 -#define CP15_PAR 15, 0, 7, 4, 0 -#define CP15_ATS1CPR 15, 0, 7, 8, 0 -#define CP15_ATS1CPW 15, 0, 7, 8, 1 -#define CP15_ATS1CUR 15, 0, 7, 8, 2 -#define CP15_ATS1CUW 15, 0, 7, 8, 3 -#define CP15_ISB 15, 0, 7, 5, 4 -#define CP15_DSB 15, 0, 7, 10, 4 -#define CP15_DMB 15, 0, 7, 10, 5 -#define CP15_TLBIALLIS 15, 0, 8, 3, 0 -#define CP15_TLBIMVAIS 15, 0, 8, 3, 1 -#define CP15_TLBIASIDIS 15, 0, 8, 3, 2 -#define CP15_TLBIMVAAIS 15, 0, 8, 3, 3 -#define CP15_ITLBIALL 15, 0, 8, 5, 0 -#define CP15_ITLBIMVA 15, 0, 8, 5, 1 -#define CP15_ITLBIASID 15, 0, 8, 5, 2 -#define CP15_DTLBIALL 15, 0, 8, 6, 0 -#define CP15_DTLBIMVA 15, 0, 8, 6, 1 -#define CP15_DTLBIASID 15, 0, 8, 6, 2 -#define CP15_TLBIALL 15, 0, 8, 7, 0 -#define CP15_TLBIMVA 15, 0, 8, 7, 1 -#define CP15_TLBIASID 15, 0, 8, 7, 2 -#define CP15_TLBIMVAA 15, 0, 8, 7, 3 -#define CP15_PMCR 15, 0, 9, 12, 0 -#define CP15_PMCNTENSET 15, 0, 9, 12, 1 -#define CP15_PMCNTENCLR 15, 0, 9, 12, 2 -#define CP15_PMOVSR 15, 0, 9, 12, 3 -#define CP15_PSWINC 15, 0, 9, 12, 4 -#define CP15_PMSELR 15, 0, 9, 12, 5 -#define CP15_PMCCNTR 15, 0, 9, 13, 0 -#define CP15_PMXEVTYPER 15, 0, 9, 13, 1 -#define CP15_PMXEVCNTR 15, 0, 9, 13, 2 -#define CP15_PMUSERENR 15, 0, 9, 14, 0 -#define CP15_PMINTENSET 15, 0, 9, 14, 1 -#define CP15_PMINTENCLR 15, 0, 9, 14, 2 -#define CP15_PRRR 15, 0, 10, 2, 0 -#define CP15_NMRR 15, 0, 10, 2, 1 -#define CP15_VBAR 15, 0, 12, 0, 0 -#define CP15_MVBAR 15, 0, 12, 0, 1 -#define CP15_ISR 15, 0, 12, 1, 0 -#define CP15_CONTEXTIDR 15, 0, 13, 0, 1 -#define CP15_TPIDRURW 15, 0, 13, 0, 2 -#define CP15_TPIDRURO 15, 0, 13, 0, 3 -#define CP15_TPIDRPRW 15, 0, 13, 0, 4 -#define CP15_CCSIDR 15, 1, 0, 0, 0 -#define CP15_CLIDR 15, 1, 0, 0, 1 -#define CP15_AIDR 15, 1, 0, 0, 7 -#define CP15_CSSELR 15, 2, 0, 0, 0 -#define CP14_DBGDIDR 14, 0, 0, 0, 0 -#define CP14_DBGWFAR 14, 0, 0, 6, 0 -#define CP14_DBGVCR 14, 0, 0, 7, 0 -#define CP14_DBGECR 14, 0, 0, 9, 0 -#define CP14_DBGDSCCR 14, 0, 0, 10, 0 -#define CP14_DBGDSMCR 14, 0, 0, 11, 0 -#define CP14_DBGDTRRX 14, 0, 0, 0, 2 -#define CP14_DBGPCSR 14, 0, 0, 1, 2 -#define CP14_DBGITR 14, 0, 0, 1, 2 -#define CP14_DBGDSCR 14, 0, 0, 2, 2 -#define CP14_DBGDTRTX 14, 0, 0, 3, 2 -#define CP14_DBGDRCR 14, 0, 0, 4, 2 -#define CP14_DBGCIDSR 14, 0, 0, 9, 2 -#define CP14_DBGBVR0 14, 0, 0, 0, 4 -#define CP14_DBGBVR1 14, 0, 0, 1, 4 -#define CP14_DBGBVR2 14, 0, 0, 2, 4 -#define CP14_DBGBVR3 14, 0, 0, 3, 4 -#define CP14_DBGBVR4 14, 0, 0, 4, 4 -#define CP14_DBGBVR5 14, 0, 0, 5, 4 -#define CP14_DBGBVR6 14, 0, 0, 6, 4 -#define CP14_DBGBVR7 14, 0, 0, 7, 4 -#define CP14_DBGBCR0 14, 0, 0, 0, 5 -#define CP14_DBGBCR1 14, 0, 0, 1, 5 -#define CP14_DBGBCR2 14, 0, 0, 2, 5 -#define CP14_DBGBCR3 14, 0, 0, 3, 5 -#define CP14_DBGBCR4 14, 0, 0, 4, 5 -#define CP14_DBGBCR5 14, 0, 0, 5, 5 -#define CP14_DBGBCR6 14, 0, 0, 6, 5 -#define CP14_DBGBCR7 14, 0, 0, 7, 5 -#define CP14_DBGWVR0 14, 0, 0, 0, 6 -#define CP14_DBGWVR1 14, 0, 0, 1, 6 -#define CP14_DBGWVR2 14, 0, 0, 2, 6 -#define CP14_DBGWVR3 14, 0, 0, 3, 6 -#define CP14_DBGWCR0 14, 0, 0, 0, 7 -#define CP14_DBGWCR1 14, 0, 0, 1, 7 -#define CP14_DBGWCR2 14, 0, 0, 2, 7 -#define CP14_DBGWCR3 14, 0, 0, 3, 7 -#define CPVFP_FPSID 10, 7, 0, 0, 0 -#define CPVFP_FPSCR 10, 7, 1, 0, 0 -#define CPVFP_MVFR1 10, 7, 6, 0, 0 -#define CPVFP_MVFR0 10, 7, 7, 0, 0 -#define CPVFP_FPEXC 10, 7, 8, 0, 0 -#define CP15_TTBRx_PD_MASK 0xffffc000 - - - + + Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Sat May 16 11:30:28 2015 @@ -30,6 +30,149 @@ #define SYNCH_LEVEL DISPATCH_LEVEL + +// +// Co-Processor register definitions +// +#define CP15_MIDR 15, 0, 0, 0, 0 +#define CP15_CTR 15, 0, 0, 0, 1 +#define CP15_TCMTR 15, 0, 0, 0, 2 +#define CP15_TLBTR 15, 0, 0, 0, 3 +#define CP15_MPIDR 15, 0, 0, 0, 5 +#define CP15_PFR0 15, 0, 0, 1, 0 +#define CP15_PFR1 15, 0, 0, 1, 1 +#define CP15_DFR0 15, 0, 0, 1, 2 +#define CP15_AFR0 15, 0, 0, 1, 3 +#define CP15_MMFR0 15, 0, 0, 1, 4 +#define CP15_MMFR1 15, 0, 0, 1, 5 +#define CP15_MMFR2 15, 0, 0, 1, 6 +#define CP15_MMFR3 15, 0, 0, 1, 7 +#define CP15_ISAR0 15, 0, 0, 2, 0 +#define CP15_ISAR1 15, 0, 0, 2, 1 +#define CP15_ISAR2 15, 0, 0, 2, 2 +#define CP15_ISAR3 15, 0, 0, 2, 3 +#define CP15_ISAR4 15, 0, 0, 2, 4 +#define CP15_ISAR5 15, 0, 0, 2, 5 +#define CP15_ISAR6 15, 0, 0, 2, 6 +#define CP15_ISAR7 15, 0, 0, 2, 7 +#define CP15_SCTLR 15, 0, 1, 0, 0 +#define CP15_ACTLR 15, 0, 1, 0, 1 +#define CP15_CPACR 15, 0, 1, 0, 2 +#define CP15_SCR 15, 0, 1, 1, 0 +#define CP15_SDER 15, 0, 1, 1, 1 +#define CP15_NSACR 15, 0, 1, 1, 2 +#define CP15_TTBR0 15, 0, 2, 0, 0 +#define CP15_TTBR1 15, 0, 2, 0, 1 +#define CP15_TTBCR 15, 0, 2, 0, 2 +#define CP15_DACR 15, 0, 3, 0, 0 +#define CP15_DFSR 15, 0, 5, 0, 0 +#define CP15_IFSR 15, 0, 5, 0, 1 +#define CP15_DFAR 15, 0, 6, 0, 0 +#define CP15_IFAR 15, 0, 6, 0, 2 +#define CP15_ICIALLUIS 15, 0, 7, 1, 0 +#define CP15_BPIALLIS 15, 0, 7, 1, 6 +#define CP15_ICIALLU 15, 0, 7, 5, 0 +#define CP15_ICIMVAU 15, 0, 7, 5, 1 +#define CP15_BPIALL 15, 0, 7, 5, 6 +#define CP15_BPIMVA 15, 0, 7, 5, 7 +#define CP15_DCIMVAC 15, 0, 7, 6, 1 +#define CP15_DCISW 15, 0, 7, 6, 2 +#define CP15_DCCMVAC 15, 0, 7, 10, 1 +#define CP15_DCCSW 15, 0, 7, 10, 2 +#define CP15_DCCMVAU 15, 0, 7, 11, 1 +#define CP15_DCCIMVAC 15, 0, 7, 14, 1 +#define CP15_DCCISW 15, 0, 7, 14, 2 +#define CP15_PAR 15, 0, 7, 4, 0 +#define CP15_ATS1CPR 15, 0, 7, 8, 0 +#define CP15_ATS1CPW 15, 0, 7, 8, 1 +#define CP15_ATS1CUR 15, 0, 7, 8, 2 +#define CP15_ATS1CUW 15, 0, 7, 8, 3 +#define CP15_ISB 15, 0, 7, 5, 4 +#define CP15_DSB 15, 0, 7, 10, 4 +#define CP15_DMB 15, 0, 7, 10, 5 +#define CP15_TLBIALLIS 15, 0, 8, 3, 0 +#define CP15_TLBIMVAIS 15, 0, 8, 3, 1 +#define CP15_TLBIASIDIS 15, 0, 8, 3, 2 +#define CP15_TLBIMVAAIS 15, 0, 8, 3, 3 +#define CP15_ITLBIALL 15, 0, 8, 5, 0 +#define CP15_ITLBIMVA 15, 0, 8, 5, 1 +#define CP15_ITLBIASID 15, 0, 8, 5, 2 +#define CP15_DTLBIALL 15, 0, 8, 6, 0 +#define CP15_DTLBIMVA 15, 0, 8, 6, 1 +#define CP15_DTLBIASID 15, 0, 8, 6, 2 +#define CP15_TLBIALL 15, 0, 8, 7, 0 +#define CP15_TLBIMVA 15, 0, 8, 7, 1 +#define CP15_TLBIASID 15, 0, 8, 7, 2 +#define CP15_TLBIMVAA 15, 0, 8, 7, 3 +#define CP15_PMCR 15, 0, 9, 12, 0 +#define CP15_PMCNTENSET 15, 0, 9, 12, 1 +#define CP15_PMCNTENCLR 15, 0, 9, 12, 2 +#define CP15_PMOVSR 15, 0, 9, 12, 3 +#define CP15_PSWINC 15, 0, 9, 12, 4 +#define CP15_PMSELR 15, 0, 9, 12, 5 +#define CP15_PMCCNTR 15, 0, 9, 13, 0 +#define CP15_PMXEVTYPER 15, 0, 9, 13, 1 +#define CP15_PMXEVCNTR 15, 0, 9, 13, 2 +#define CP15_PMUSERENR 15, 0, 9, 14, 0 +#define CP15_PMINTENSET 15, 0, 9, 14, 1 +#define CP15_PMINTENCLR 15, 0, 9, 14, 2 +#define CP15_PRRR 15, 0, 10, 2, 0 +#define CP15_NMRR 15, 0, 10, 2, 1 +#define CP15_VBAR 15, 0, 12, 0, 0 +#define CP15_MVBAR 15, 0, 12, 0, 1 +#define CP15_ISR 15, 0, 12, 1, 0 +#define CP15_CONTEXTIDR 15, 0, 13, 0, 1 +#define CP15_TPIDRURW 15, 0, 13, 0, 2 +#define CP15_TPIDRURO 15, 0, 13, 0, 3 +#define CP15_TPIDRPRW 15, 0, 13, 0, 4 +#define CP15_CCSIDR 15, 1, 0, 0, 0 +#define CP15_CLIDR 15, 1, 0, 0, 1 +#define CP15_AIDR 15, 1, 0, 0, 7 +#define CP15_CSSELR 15, 2, 0, 0, 0 +#define CP14_DBGDIDR 14, 0, 0, 0, 0 +#define CP14_DBGWFAR 14, 0, 0, 6, 0 +#define CP14_DBGVCR 14, 0, 0, 7, 0 +#define CP14_DBGECR 14, 0, 0, 9, 0 +#define CP14_DBGDSCCR 14, 0, 0, 10, 0 +#define CP14_DBGDSMCR 14, 0, 0, 11, 0 +#define CP14_DBGDTRRX 14, 0, 0, 0, 2 +#define CP14_DBGPCSR 14, 0, 0, 1, 2 +#define CP14_DBGITR 14, 0, 0, 1, 2 +#define CP14_DBGDSCR 14, 0, 0, 2, 2 +#define CP14_DBGDTRTX 14, 0, 0, 3, 2 +#define CP14_DBGDRCR 14, 0, 0, 4, 2 +#define CP14_DBGCIDSR 14, 0, 0, 9, 2 +#define CP14_DBGBVR0 14, 0, 0, 0, 4 +#define CP14_DBGBVR1 14, 0, 0, 1, 4 +#define CP14_DBGBVR2 14, 0, 0, 2, 4 +#define CP14_DBGBVR3 14, 0, 0, 3, 4 +#define CP14_DBGBVR4 14, 0, 0, 4, 4 +#define CP14_DBGBVR5 14, 0, 0, 5, 4 +#define CP14_DBGBVR6 14, 0, 0, 6, 4 +#define CP14_DBGBVR7 14, 0, 0, 7, 4 +#define CP14_DBGBCR0 14, 0, 0, 0, 5 +#define CP14_DBGBCR1 14, 0, 0, 1, 5 +#define CP14_DBGBCR2 14, 0, 0, 2, 5 +#define CP14_DBGBCR3 14, 0, 0, 3, 5 +#define CP14_DBGBCR4 14, 0, 0, 4, 5 +#define CP14_DBGBCR5 14, 0, 0, 5, 5 +#define CP14_DBGBCR6 14, 0, 0, 6, 5 +#define CP14_DBGBCR7 14, 0, 0, 7, 5 +#define CP14_DBGWVR0 14, 0, 0, 0, 6 +#define CP14_DBGWVR1 14, 0, 0, 1, 6 +#define CP14_DBGWVR2 14, 0, 0, 2, 6 +#define CP14_DBGWVR3 14, 0, 0, 3, 6 +#define CP14_DBGWCR0 14, 0, 0, 0, 7 +#define CP14_DBGWCR1 14, 0, 0, 1, 7 +#define CP14_DBGWCR2 14, 0, 0, 2, 7 +#define CP14_DBGWCR3 14, 0, 0, 3, 7 +#define CPVFP_FPSID 10, 7, 0, 0, 0 +#define CPVFP_FPSCR 10, 7, 1, 0, 0 +#define CPVFP_MVFR1 10, 7, 6, 0, 0 +#define CPVFP_MVFR0 10, 7, 7, 0, 0 +#define CPVFP_FPEXC 10, 7, 8, 0, 0 +#define CP15_TTBRx_PD_MASK 0xffffc000 + // // CPSR Values 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat May 16 11:30:28 2015 @@ -2341,24 +2341,78 @@ NTSTATUS NTAPI -NtFlushInstructionCache(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN ULONG NumberOfBytesToFlush) -{ +NtFlushInstructionCache( + _In_ HANDLE ProcessHandle, + _In_opt_ PVOID BaseAddress, + _In_ ULONG FlushSize) +{ + KAPC_STATE ApcState; + PKPROCESS Process; + NTSTATUS Status; PAGED_CODE(); + /* Is a base address given? */ + if (BaseAddress != NULL) + { + /* If the requested size is 0, there is nothing to do */ + if (FlushSize == 0) + { + return STATUS_SUCCESS; + } + + /* Is this a user mode call? */ + if (KeGetPreviousMode() != KernelMode) + { + /* Make sure the base address is in user space */ + if (BaseAddress > MmHighestUserAddress) + { + DPRINT1("Invalid BaseAddress 0x%p\n", BaseAddress); + return STATUS_ACCESS_VIOLATION; + } + } + } + + /* Is another process requested? */ + if (ProcessHandle != NtCurrentProcess()) + { + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_WRITE, + PsProcessType, + KeGetPreviousMode(), + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference the process %p\n", ProcessHandle); + return Status; + } + + /* Attach to the process */ + KeStackAttachProcess(Process, &ApcState); + } + + /* FIXME: don't flush everything if a range is requested */ #if defined(_M_IX86) || defined(_M_AMD64) __wbinvd(); #elif defined(_M_PPC) __asm__ __volatile__("tlbsync"); #elif defined(_M_MIPS) DPRINT1("NtFlushInstructionCache() is not implemented\n"); - for (;;); + DbgBreakPoint(); #elif defined(_M_ARM) - //__asm__ __volatile__("mov r1, #0; mcr p15, 0, r1, c7, c5, 0"); + _MoveToCoprocessor(0, CP15_ICIALLU); #else #error Unknown architecture #endif + + /* Check if we attached */ + if (ProcessHandle != NtCurrentProcess()) + { + /* Detach from the process */ + KeUnstackDetachProcess(&ApcState); + } + return STATUS_SUCCESS; }

1 0

[dreimer] 67769: [SHELL32] German translation update
by dreimer＠svn.reactos.org 16 May '15

16 May '15

Author: dreimer Date: Sat May 16 11:28:38 2015 New Revision: 67769 URL: http://svn.reactos.org/svn/reactos?rev=67769&view=rev Log: [SHELL32] German translation update Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sat May 16 11:28:38 2015 @@ -755,8 +755,8 @@ IDS_DRIVE_CDROM "CD-Laufwerk" IDS_DRIVE_NETWORK "Netzlaufwerk" IDS_DRIVE_FLOPPY "3.5 Floppy" - IDS_DRIVE_REMOVABLE "Removable Disk" - IDS_FS_UNKNOWN "Unknown" + IDS_DRIVE_REMOVABLE "WechseldatentrÃ¤ger" + IDS_FS_UNKNOWN "Unbekannt" /* Open With */ IDS_OPEN_WITH "Ãffnen mit..."

1 0

[dreimer] 67768: [MSPORTS] German Translation update, made moar space for translators, one alignment fix
by dreimer＠svn.reactos.org 16 May '15

16 May '15

Author: dreimer Date: Sat May 16 11:27:59 2015 New Revision: 67768 URL: http://svn.reactos.org/svn/reactos?rev=67768&view=rev Log: [MSPORTS] German Translation update, made moar space for translators, one alignment fix Modified: trunk/reactos/dll/win32/msports/lang/bg-BG.rc trunk/reactos/dll/win32/msports/lang/de-DE.rc trunk/reactos/dll/win32/msports/lang/en-US.rc trunk/reactos/dll/win32/msports/lang/he-IL.rc trunk/reactos/dll/win32/msports/lang/pl-PL.rc trunk/reactos/dll/win32/msports/lang/ro-RO.rc trunk/reactos/dll/win32/msports/lang/ru-RU.rc trunk/reactos/dll/win32/msports/lang/sq-AL.rc trunk/reactos/dll/win32/msports/lang/tr-TR.rc trunk/reactos/dll/win32/msports/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/msports/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/bg-BG.rc [iso-8859-1] Sat May 16 11:27:59 2015 @@ -5,18 +5,18 @@ CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° Ð¸Ð·Ð»Ð°Ð·Ð° (Ð¿Ð¾ÑÑÐ°)" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "&Ð Ð°Ð·ÑÑÐ´Ð° Ð² ÑÐµÐºÑÐ½Ð´Ð°", -1, 74, 19, 62, 8, WS_GROUP + RTEXT "&Ð Ð°Ð·ÑÑÐ´Ð° Ð² ÑÐµÐºÑÐ½Ð´Ð°:", -1, 6, 19, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "ÐÐ°Ð¹ÑÐ° &Ð´Ð°Ð½Ð½Ð¸:", -1, 74, 40, 62, 8 + RTEXT "ÐÐ°Ð¹ÑÐ° &Ð´Ð°Ð½Ð½Ð¸:", -1, 6, 40, 130, 8 COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Ð§ÐµÑÐ½Ð¾ÑÑ:", -1, 74, 61, 62, 8 + RTEXT "&Ð§ÐµÑÐ½Ð¾ÑÑ:", -1, 6, 61, 130, 8 COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Ð¡Ð¿Ð¸ÑÐ°ÑÐ¸ ÑÐ°Ð·ÑÑÐ´Ð¸:", -1, 74, 82, 62, 8 + RTEXT "&Ð¡Ð¿Ð¸ÑÐ°ÑÐ¸ ÑÐ°Ð·ÑÑÐ´Ð¸:", -1, 6, 82, 130, 8 COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° &Ð¿Ð¾ÑÐ¾ÐºÐ°:", -1, 74, 102, 62, 8 + RTEXT "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° &Ð¿Ð¾ÑÐ¾ÐºÐ°:", -1, 6, 102, 130, 8 COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "Ð Ð°Ð·&ÑÐ¸ÑÐµÐ½Ð¸...", IDC_SERIAL_ADVANCED, 111, 130, 65, 14, WS_GROUP - PUSHBUTTON "&ÐÑÑÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ð´&ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ð¸ÑÐµ", IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP + PUSHBUTTON "Ð Ð°Ð·&ÑÐ¸ÑÐµÐ½Ð¸...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP + PUSHBUTTON "&ÐÑÑÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ð´&ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ð¸ÑÐµ", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -25,11 +25,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 98, 10 - AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 98, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 98, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 135, 10 - LTEXT "LPT Port Number:", -1, 6, 105, 140, 10, WS_GROUP + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP + AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST END Modified: trunk/reactos/dll/win32/msports/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/de-DE.rc [iso-8859-1] Sat May 16 11:27:59 2015 @@ -5,18 +5,18 @@ CAPTION "Porteinstellungen" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "B&its pro Sekunde:", -1, 74, 19, 62, 8, WS_GROUP + RTEXT "B&its pro Sekunde:", -1, 6, 19, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Datenbits:", -1, 74, 40, 62, 8 + RTEXT "&Datenbits:", -1, 6, 40, 130, 8 COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&ParitÃ¤t:", -1, 74, 61, 62, 8 + RTEXT "&ParitÃ¤t:", -1, 6, 61, 130, 8 COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Stoppbits:", -1, 74, 82, 62, 8 + RTEXT "&Stoppbits:", -1, 6, 82, 130, 8 COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Flusssteuerung:", -1, 74, 102, 62, 8 + RTEXT "&Flusssteuerung:", -1, 6, 102, 130, 8 COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&Erweitert...", IDC_SERIAL_ADVANCED, 111, 130, 65, 14, WS_GROUP - PUSHBUTTON "Wieder&herstellen", IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP + PUSHBUTTON "&Erweitert...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP + PUSHBUTTON "Wieder&herstellen", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -24,12 +24,12 @@ CAPTION "Porteinstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 98, 10 - AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 98, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 98, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 135, 10 - LTEXT "LPT Port Number:", -1, 6, 105, 140, 10, WS_GROUP + GROUPBOX "Ressourcenmethode", -1, 6, 6, 237, 75, WS_GROUP + AUTORADIOBUTTON "Interrupt mÃ¶glichst nicht verwenden", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + AUTORADIOBUTTON "Interrupt nie verwenden", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 + AUTORADIOBUTTON "Jeden dem Port zugeweisenen Interrupt verwenden", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP + AUTOCHECKBOX "Legacyerkennung fÃ¼r Plug & Play aktivieren", -1, 6, 90, 237, 10 + LTEXT "LPT-Portnummer:", -1, 6, 107, 140, 10, WS_GROUP COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST END Modified: trunk/reactos/dll/win32/msports/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/en-US.rc [iso-8859-1] Sat May 16 11:27:59 2015 @@ -5,18 +5,18 @@ CAPTION "Port Settings" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "B&its per second:", -1, 74, 19, 62, 8, WS_GROUP + RTEXT "B&its per second:", -1, 6, 19, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Data bits:", -1, 74, 40, 62, 8 + RTEXT "&Data bits:", -1, 6, 40, 130, 8 COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Parity:", -1, 74, 61, 62, 8 + RTEXT "&Parity:", -1, 6, 61, 130, 8 COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Stop bits:", -1, 74, 82, 62, 8 + RTEXT "&Stop bits:", -1, 6, 82, 130, 8 COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Flow control:", -1, 74, 102, 62, 8 + RTEXT "&Flow control:", -1, 6, 102, 130, 8 COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&Advanced...", IDC_SERIAL_ADVANCED, 111, 130, 65, 14, WS_GROUP - PUSHBUTTON "&Restore Defaults", IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP + PUSHBUTTON "&Advanced...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP + PUSHBUTTON "&Restore Defaults", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -25,11 +25,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 98, 10 - AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 98, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 98, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 135, 10 - LTEXT "LPT Port Number:", -1, 6, 105, 140, 10, WS_GROUP + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP + AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST END Modified: trunk/reactos/dll/win32/msports/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/he-IL.rc [iso-8859-1] Sat May 16 11:27:59 2015 @@ -5,18 +5,18 @@ CAPTION "××××¨××ª ××¦×××" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "×¡×××××ª ××©× ××:", -1, 74, 19, 62, 8, WS_GROUP + RTEXT "×¡×××××ª ××©× ××:", -1, 6, 19, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "×¡×××××ª ××××¢:", -1, 74, 40, 62, 8 + RTEXT "×¡×××××ª ××××¢:", -1, 6, 40, 130, 8 COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Parity:", -1, 74, 61, 62, 8 + RTEXT "&Parity:", -1, 6, 61, 130, 8 COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "×¡×××××ª ×¢×¦××¨×:", -1, 74, 82, 62, 8 + RTEXT "×¡×××××ª ×¢×¦××¨×:", -1, 6, 82, 130, 8 COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "××§×¨×ª ××¨×××:", -1, 74, 102, 62, 8 + RTEXT "××§×¨×ª ××¨×××:", -1, 6, 102, 130, 8 COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "××ª×§××...", IDC_SERIAL_ADVANCED, 111, 130, 65, 14, WS_GROUP - PUSHBUTTON "×©×××¨ ××¨××¨×ª ××××", IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP + PUSHBUTTON "××ª×§××...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP + PUSHBUTTON "×©×××¨ ××¨××¨×ª ××××", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -25,11 +25,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 98, 10 - AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 98, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 98, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 135, 10 - LTEXT "LPT Port Number:", -1, 6, 105, 140, 10, WS_GROUP + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP + AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST END Modified: trunk/reactos/dll/win32/msports/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/pl-PL.rc [iso-8859-1] Sat May 16 11:27:59 2015 @@ -13,18 +13,18 @@ CAPTION "Ustawienia portu" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "B&itÃ³w na sekundÄ:", -1, 74, 19, 62, 8, WS_GROUP + RTEXT "B&itÃ³w na sekundÄ:", -1, 6, 19, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Bity danych:", -1, 74, 40, 62, 8 + RTEXT "&Bity danych:", -1, 6, 40, 130, 8 COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&ParzystoÅÄ:", -1, 74, 61, 62, 8 + RTEXT "&ParzystoÅÄ:", -1, 6, 61, 130, 8 COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Bi&ty stopu:", -1, 74, 82, 62, 8 + RTEXT "Bi&ty stopu:", -1, 6, 82, 130, 8 COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Kontrola przepÅywu:", -1, 74, 102, 62, 8 + RTEXT "&Kontrola przepÅywu:", -1, 6, 102, 130, 8 COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&Zaawansowane...", IDC_SERIAL_ADVANCED, 111, 130, 65, 14, WS_GROUP - PUSHBUTTON "P&rzywrÃ³Ä domyÅlne", IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP + PUSHBUTTON "&Zaawansowane...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP + PUSHBUTTON "P&rzywrÃ³Ä domyÅlne", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -33,11 +33,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 98, 10 - AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 98, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 98, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 135, 10 - LTEXT "LPT Port Number:", -1, 6, 105, 140, 10, WS_GROUP + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP + AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST END Modified: trunk/reactos/dll/win32/msports/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/ro-RO.rc [iso-8859-1] Sat May 16 11:27:59 2015 @@ -12,18 +12,18 @@ CAPTION "ConfiguraÈia portului" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "&BiÈi pe secundÄ:", -1, 74, 19, 62, 8, WS_GROUP + RTEXT "&BiÈi pe secundÄ:", -1, 6, 19, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "BiÈi de &date:", -1, 74, 40, 62, 8 + RTEXT "BiÈi de &date:", -1, 6, 40, 130, 8 COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Paritate:", -1, 74, 61, 62, 8 + RTEXT "&Paritate:", -1, 6, 61, 130, 8 COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "BiÈi de st&op:", -1, 74, 82, 62, 8 + RTEXT "BiÈi de st&op:", -1, 6, 82, 130, 8 COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Controlul fluxului:", -1, 74, 102, 62, 8 + RTEXT "&Controlul fluxului:", -1, 6, 102, 130, 8 COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "A&vansateâ¦", IDC_SERIAL_ADVANCED, 111, 130, 65, 14, WS_GROUP - PUSHBUTTON "Valori i&mplicite", IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP + PUSHBUTTON "A&vansateâ¦", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP + PUSHBUTTON "Valori i&mplicite", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -32,11 +32,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 98, 10 - AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 98, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 98, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 135, 10 - LTEXT "LPT Port Number:", -1, 6, 105, 140, 10, WS_GROUP + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP + AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST END Modified: trunk/reactos/dll/win32/msports/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/ru-RU.rc [iso-8859-1] Sat May 16 11:27:59 2015 @@ -7,18 +7,18 @@ CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð¿Ð¾ÑÑÐ°" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "&ÐÐ¸Ñ Ð² ÑÐµÐºÑÐ½Ð´Ñ:", -1, 74, 19, 62, 8, WS_GROUP + RTEXT "&ÐÐ¸Ñ Ð² ÑÐµÐºÑÐ½Ð´Ñ:", -1, 6, 19, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Ð&Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÑ:", -1, 74, 40, 62, 8 + RTEXT "Ð&Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÑ:", -1, 6, 40, 130, 8 COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Ð§ÐµÑÐ½Ð¾ÑÑÑ:", -1, 74, 61, 62, 8 + RTEXT "&Ð§ÐµÑÐ½Ð¾ÑÑÑ:", -1, 6, 61, 130, 8 COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "Ð¡&ÑÐ¾Ð¿Ð¾Ð²ÑÐµ Ð±Ð¸ÑÑ:", -1, 74, 82, 62, 8 + RTEXT "Ð¡&ÑÐ¾Ð¿Ð¾Ð²ÑÐµ Ð±Ð¸ÑÑ:", -1, 6, 82, 130, 8 COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST RTEXT "&Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð¾ÑÐ¾ÐºÐ¾Ð¼:", -1, 63, 102, 73, 8 COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "ÐÐ¾&Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾...", IDC_SERIAL_ADVANCED, 101, 130, 70, 14, WS_GROUP - PUSHBUTTON "&ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", IDC_SERIAL_RESTORE, 175, 130, 70, 14, WS_GROUP + PUSHBUTTON "ÐÐ¾&Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP + PUSHBUTTON "&ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -27,11 +27,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 98, 10 - AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 98, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 98, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 135, 10 - LTEXT "LPT Port Number:", -1, 6, 105, 140, 10, WS_GROUP + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP + AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST END Modified: trunk/reactos/dll/win32/msports/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/sq-AL.rc [iso-8859-1] Sat May 16 11:27:59 2015 @@ -9,18 +9,18 @@ CAPTION "CilÃ«simet Portit" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "B&its per sekonda:", -1, 74, 19, 62, 8, WS_GROUP + RTEXT "B&its per sekonda:", -1, 6, 19, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Data bits:", -1, 74, 40, 62, 8 + RTEXT "&Data bits:", -1, 6, 40, 130, 8 COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Barayi:", -1, 74, 61, 62, 8 + RTEXT "&Barayi:", -1, 6, 61, 130, 8 COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Ndalo bits:", -1, 74, 82, 62, 8 + RTEXT "&Ndalo bits:", -1, 6, 82, 130, 8 COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Kontrolli i rrjedhjes:", -1, 74, 102, 62, 8 + RTEXT "&Kontrolli i rrjedhjes:", -1, 6, 102, 130, 8 COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&PÃ«rparuar...", IDC_SERIAL_ADVANCED, 111, 130, 65, 14, WS_GROUP - PUSHBUTTON "&Rikthe Parazgjedhjet", IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP + PUSHBUTTON "&PÃ«rparuar...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP + PUSHBUTTON "&Rikthe Parazgjedhjet", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -29,11 +29,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 98, 10 - AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 98, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 98, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 135, 10 - LTEXT "LPT Port Number:", -1, 6, 105, 140, 10, WS_GROUP + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP + AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST END Modified: trunk/reactos/dll/win32/msports/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/tr-TR.rc [iso-8859-1] Sat May 16 11:27:59 2015 @@ -7,18 +7,18 @@ CAPTION "GiriÅ AyarlarÄ±" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "&SÃ¢niyedeki Bit SayÄ±sÄ±:", -1, 74, 19, 62, 8, WS_GROUP + RTEXT "&SÃ¢niyedeki Bit SayÄ±sÄ±:", -1, 6, 19, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Veri Bitleri:", -1, 74, 40, 62, 8 + RTEXT "&Veri Bitleri:", -1, 6, 40, 130, 8 COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&EÅlik:", -1, 74, 61, 62, 8 + RTEXT "&EÅlik:", -1, 6, 61, 130, 8 COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Dur Bitleri:", -1, 74, 82, 62, 8 + RTEXT "&Dur Bitleri:", -1, 6, 82, 130, 8 COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&AkÄ±Å Denetimi:", -1, 74, 102, 62, 8 + RTEXT "&AkÄ±Å Denetimi:", -1, 6, 102, 130, 8 COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&GeliÅmiÅ...", IDC_SERIAL_ADVANCED, 111, 130, 65, 14, WS_GROUP - PUSHBUTTON "&Ãn TanÄ±mlÄ±larÄ± Geri Getir", IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP + PUSHBUTTON "&GeliÅmiÅ...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP + PUSHBUTTON "&Ãn TanÄ±mlÄ±larÄ± Geri Getir", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -27,11 +27,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 98, 10 - AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 98, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 98, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 135, 10 - LTEXT "LPT Port Number:", -1, 6, 105, 140, 10, WS_GROUP + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP + AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST END Modified: trunk/reactos/dll/win32/msports/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/uk-UA.rc [iso-8859-1] Sat May 16 11:27:59 2015 @@ -13,18 +13,18 @@ CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð¿Ð¾ÑÑÑ" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "ÐÑ&ÑÑÐ² Ð½Ð° ÑÐµÐºÑÐ½Ð´Ñ:", -1, 74, 19, 62, 8, WS_GROUP + RTEXT "ÐÑ&ÑÑÐ² Ð½Ð° ÑÐµÐºÑÐ½Ð´Ñ:", -1, 6, 19, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&ÐÑÑÐ¸ Ð´Ð°Ð½Ð¸Ñ:", -1, 74, 40, 62, 8 + RTEXT "&ÐÑÑÐ¸ Ð´Ð°Ð½Ð¸Ñ:", -1, 6, 40, 130, 8 COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&ÐÐ°ÑÐ¸ÑÐµÑ:", -1, 74, 61, 62, 8 + RTEXT "&ÐÐ°ÑÐ¸ÑÐµÑ:", -1, 6, 61, 130, 8 COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&Ð¡ÑÐ¾Ð¿Ð¾Ð²Ñ Ð±ÑÑÐ¸:", -1, 74, 82, 62, 8 + RTEXT "&Ð¡ÑÐ¾Ð¿Ð¾Ð²Ñ Ð±ÑÑÐ¸:", -1, 6, 82, 130, 8 COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - RTEXT "&ÐÐµÑÑÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ÑÐ¾ÐºÐ¾Ð¼:", -1, 74, 102, 62, 8 + RTEXT "&ÐÐµÑÑÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ÑÐ¾ÐºÐ¾Ð¼:", -1, 6, 102, 130, 8 COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "&Ð Ð¾Ð·ÑÐ¸ÑÐµÐ½Ñ...", IDC_SERIAL_ADVANCED, 111, 130, 65, 14, WS_GROUP - PUSHBUTTON "&ÐÐ° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼", IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP + PUSHBUTTON "&Ð Ð¾Ð·ÑÐ¸ÑÐµÐ½Ñ...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP + PUSHBUTTON "&ÐÐ° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP END IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 @@ -33,11 +33,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Filter Resource Method", -1, 6, 6, 237, 75, WS_GROUP - AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 98, 10 - AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 98, 10 - AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 98, 10, WS_GROUP - AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 135, 10 - LTEXT "LPT Port Number:", -1, 6, 105, 140, 10, WS_GROUP + AUTORADIOBUTTON "Try not to use an interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + AUTORADIOBUTTON "Never use an interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 + AUTORADIOBUTTON "Use any interrupt assigned to the port", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP + AUTOCHECKBOX "Enable legacy Plug and Play detection", -1, 6, 90, 237, 10 + LTEXT "LPT Port Number:", -1, 6, 107, 140, 10, WS_GROUP COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST END

1 0

[akhaldi] 67767: [IMAGEHLP_WINETEST] Add tests for ImageLoad, ImageUnload and GetImageUnusedHeaderBytes. By Mark Jansen.
by akhaldi＠svn.reactos.org 16 May '15

16 May '15

Author: akhaldi Date: Sat May 16 11:18:30 2015 New Revision: 67767 URL: http://svn.reactos.org/svn/reactos?rev=67767&view=rev Log: [IMAGEHLP_WINETEST] Add tests for ImageLoad, ImageUnload and GetImageUnusedHeaderBytes. By Mark Jansen. Modified: trunk/rostests/winetests/imagehlp/image.c Modified: trunk/rostests/winetests/imagehlp/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/image.… ============================================================================== --- trunk/rostests/winetests/imagehlp/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imagehlp/image.c [iso-8859-1] Sat May 16 11:18:30 2015 @@ -33,6 +33,10 @@ static BOOL (WINAPI *pImageGetDigestStream)(HANDLE, DWORD, DIGEST_FUNCTION, DIGEST_HANDLE); static BOOL (WINAPI *pBindImageEx)(DWORD Flags, const char *ImageName, const char *DllPath, const char *SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine); +static DWORD (WINAPI* pGetImageUnusedHeaderBytes)(PLOADED_IMAGE, LPDWORD); +static PLOADED_IMAGE (WINAPI* pImageLoad)(PCSTR, PCSTR); +static BOOL (WINAPI* pImageUnload)(PLOADED_IMAGE); + /* minimal PE file image */ #define VA_START 0x400000 @@ -428,6 +432,101 @@ DeleteFileA(temp_file); } +static void test_image_load(void) +{ + char temp_file[MAX_PATH]; + PLOADED_IMAGE img; + DWORD ret, count; + HANDLE file; + + if (!pImageLoad || !pImageUnload) + { + win_skip("ImageLoad or ImageUnload function is not available\n"); + return; + } + if (!pGetImageUnusedHeaderBytes) + { + win_skip("GetImageUnusedHeaderBytes function is not available\n"); + return; + } + + file = create_temp_file(temp_file); + if (file == INVALID_HANDLE_VALUE) + { + skip("couldn't create temp file\n"); + return; + } + + WriteFile(file, &bin, sizeof(bin), &count, NULL); + CloseHandle(file); + + img = pImageLoad(temp_file, NULL); + ok(img != NULL, "ImageLoad unexpectedly failed\n"); + + if (img) + { + todo_wine + ok(!strcmp(img->ModuleName, temp_file), + "unexpected ModuleName, got %s instead of %s\n", img->ModuleName, temp_file); + todo_wine + ok(img->MappedAddress != NULL, "MappedAddress != NULL\n"); + if (img->MappedAddress) + { + ok(!memcmp(img->MappedAddress, &bin.dos_header, sizeof(bin.dos_header)), + "MappedAddress doesn't point to IMAGE_DOS_HEADER\n"); + } + ok(img->FileHeader != NULL, "FileHeader != NULL\n"); + if (img->FileHeader) + { + todo_wine + ok(!memcmp(img->FileHeader, &bin.nt_headers, sizeof(bin.nt_headers)), + "FileHeader doesn't point to IMAGE_NT_HEADERS32\n"); + } + todo_wine + ok(img->NumberOfSections == 3, + "unexpected NumberOfSections, got %d instead of 3\n", img->NumberOfSections); + if (img->NumberOfSections >= 3) + { + ok(!strcmp((const char *)img->Sections[0].Name, ".text"), + "unexpected name for section 0, expected .text, got %s\n", + (const char *)img->Sections[0].Name); + ok(!strcmp((const char *)img->Sections[1].Name, ".bss"), + "unexpected name for section 1, expected .bss, got %s\n", + (const char *)img->Sections[1].Name); + ok(!strcmp((const char *)img->Sections[2].Name, ".idata"), + "unexpected name for section 2, expected .idata, got %s\n", + (const char *)img->Sections[2].Name); + } + todo_wine + ok(img->Characteristics == 0x102, + "unexpected Characteristics, got 0x%x instead of 0x102\n", img->Characteristics); + ok(img->fSystemImage == 0, + "unexpected fSystemImage, got %d instead of 0\n", img->fSystemImage); + ok(img->fDOSImage == 0, + "unexpected fDOSImage, got %d instead of 0\n", img->fDOSImage); + todo_wine + ok(img->fReadOnly == 1 || broken(!img->fReadOnly) /* <= WinXP */, + "unexpected fReadOnly, got %d instead of 1\n", img->fReadOnly); + todo_wine + ok(img->Version == 1 || broken(!img->Version) /* <= WinXP */, + "unexpected Version, got %d instead of 1\n", img->Version); + todo_wine + ok(img->SizeOfImage == 0x600, + "unexpected SizeOfImage, got 0x%x instead of 0x600\n", img->SizeOfImage); + + count = 0xdeadbeef; + ret = pGetImageUnusedHeaderBytes(img, &count); + todo_wine + ok(ret == 448, "GetImageUnusedHeaderBytes returned %u instead of 448\n", ret); + todo_wine + ok(count == 64, "unexpected size for unused header bytes, got %u instead of 64\n", count); + + pImageUnload(img); + } + + DeleteFileA(temp_file); +} + START_TEST(image) { hImageHlp = LoadLibraryA("imagehlp.dll"); @@ -440,9 +539,13 @@ pImageGetDigestStream = (void *) GetProcAddress(hImageHlp, "ImageGetDigestStream"); pBindImageEx = (void *) GetProcAddress(hImageHlp, "BindImageEx"); + pGetImageUnusedHeaderBytes = (void *) GetProcAddress(hImageHlp, "GetImageUnusedHeaderBytes"); + pImageLoad = (void *) GetProcAddress(hImageHlp, "ImageLoad"); + pImageUnload = (void *) GetProcAddress(hImageHlp, "ImageUnload"); test_get_digest_stream(); test_bind_image_ex(); + test_image_load(); FreeLibrary(hImageHlp); }

1 0

[akhaldi] 67766: [SHELL32] Italian translation update by Carlo Bramini. CORE-9704
by akhaldi＠svn.reactos.org 16 May '15

16 May '15

Author: akhaldi Date: Sat May 16 11:16:17 2015 New Revision: 67766 URL: http://svn.reactos.org/svn/reactos?rev=67766&view=rev Log: [SHELL32] Italian translation update by Carlo Bramini. CORE-9704 Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Sat May 16 11:16:17 2015 @@ -44,18 +44,18 @@ /* menubar EDIT menu */ MENU_003 MENU BEGIN - MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM "&Annulla\tCtrl+Z", FCIDM_SHVIEW_UNDO MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT - MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY - MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT - MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM "&Taglia\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copia\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Incolla\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "I&ncolla collegamento", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO - MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM "Co&pia nella cartella...", FCIDM_SHVIEW_COPYTO + MENUITEM "Spo&sta nella cartella...", FCIDM_SHVIEW_MOVETO MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL - MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION + MENUITEM "Sele&ziona tutto\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "In&verti selezione", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -221,12 +221,12 @@ EDITTEXT 14009, 68, 56, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "Dimensione:", 14010, 8, 72, 55, 10 EDITTEXT 14011, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Size on disk:", 140101, 8, 88, 55, 10 + LTEXT "Dimensione sul disco:", 140101, 8, 88, 55, 10 EDITTEXT 14012, 68, 88, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "Contenente:", 14026, 8, 104, 55, 10 EDITTEXT 14027, 68, 104, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Created:", 14014, 8, 128, 55, 10 + LTEXT "Creato:", 14014, 8, 128, 55, 10 EDITTEXT 14015, 68, 128, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Attributi:", 14020, 8, 152, 46, 10 @@ -591,7 +591,7 @@ IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Check Disk" +CAPTION "Verifica disco" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Inizia", IDOK, 63, 95, 60, 14 @@ -619,14 +619,14 @@ IDD_NOOPEN DIALOGEX 0, 0, 240, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Caution" +CAPTION "Attenzione" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20 - LTEXT "This file could either be used by the operating system or by\n\ -another application. Modifying this file might damage your\n\ -system or make it less functional.\n\n\ -Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 + LTEXT "Questo file potrebbe essere utilizzato dal sistema operativo o da \n\ +un'altra applicazione. Modificare questo file potrebbe danneggiare il \n\ +sistema o renderlo meno funzionale.\n\n\ +Si desidera comunque aprire questo file?", IDC_STATIC, 35, 5, 230, 60 DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 PUSHBUTTON "No", IDNO, 180, 55, 50, 14 END @@ -689,20 +689,20 @@ IDS_DELETEITEM_TEXT "Sei sicuro di voler cancellare '%1'?" IDS_DELETEMULTIPLE_TEXT "Sei sicuro di voler cancellare questi %1 elementi?" IDS_DELETESELECTED_TEXT "Sei sicuro di voler cancellare gli elementi selezionati?" - IDS_TRASHITEM_TEXT "Sei sicuro di voler spostare '%1' Nel cestino?" + IDS_TRASHITEM_TEXT "Sei sicuro di voler spostare '%1' nel cestino?" IDS_TRASHFOLDER_TEXT "Sei sicuro di voler spostare '%1' e tutto il suo contenuto nel cestino?" IDS_TRASHMULTIPLE_TEXT "Sei sicuro di voler spostare %1 elementi nel cestino?" IDS_CANTTRASH_TEXT "L'elemento '%1' non puÃ² essere spostato nel cestino. Volete cancellarlo?" IDS_OVERWRITEFILE_TEXT "Questa cartella contiene giÃ un file con nome '%1'.\n\nVolete sostituirlo?" - IDS_OVERWRITEFILE_CAPTION "Confermare la sovrascrittura del File" + IDS_OVERWRITEFILE_CAPTION "Confermare la sovrascrittura del file" IDS_OVERWRITEFOLDER_TEXT "Questa cartella contiene giÃ una cartella con nome '%1'.\n\nSe i file nella cartella di destinazione hanno gli stessi nomi di quelli della \ncartella selezionata saranno sovrascritti. Volete procedere comunque?\n" - IDS_FILEOOP_COPYING "Copying..." - IDS_FILEOOP_MOVING "Moving..." - IDS_FILEOOP_DELETING "Deleting..." - IDS_FILEOOP_FROM_TO "From %1 to %2" - IDS_FILEOOP_FROM "From %1" - IDS_FILEOOP_PREFLIGHT "Preflight" + IDS_FILEOOP_COPYING "Copia in corso..." + IDS_FILEOOP_MOVING "Spostamento in corso..." + IDS_FILEOOP_DELETING "Cancellazione in corso..." + IDS_FILEOOP_FROM_TO "Da %1 a %2" + IDS_FILEOOP_FROM "Da %1" + IDS_FILEOOP_PREFLIGHT "Verifia preliminare" /* message box strings */ IDS_RESTART_TITLE "Riavvia" @@ -755,7 +755,7 @@ IDS_DRIVE_NETWORK "Disco di Rete" IDS_DRIVE_FLOPPY "3.5 Floppy" IDS_DRIVE_REMOVABLE "Removable Disk" - IDS_FS_UNKNOWN "Unknown" + IDS_FS_UNKNOWN "Sconosciuto" /* Open With */ IDS_OPEN_WITH "Apri con" @@ -793,8 +793,8 @@ IDS_SYS_FILE "File di sistema" IDS_OPEN_VERB "Apri" - IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Eseguire come " + IDS_EXPLORE_VERB "Esplora" + IDS_RUNAS_VERB "Esegui come " IDS_EDIT_VERB "Modifica" IDS_FIND_VERB "Cerca" IDS_PRINT_VERB "Stampa" @@ -817,5 +817,5 @@ IDS_UNKNOWN_APP "Applicazione sconosciuta" IDS_EXE_DESCRIPTION "Descrizione:" - IDS_MENU_EMPTY "(Empty)" -END + IDS_MENU_EMPTY "(Vuoto)" +END

1 0

[akhaldi] 67765: [IMAGEHLP_WINETEST] Add to and fix MSVC build. By Mark Jansen.
by akhaldi＠svn.reactos.org 16 May '15

16 May '15

Author: akhaldi Date: Sat May 16 10:24:11 2015 New Revision: 67765 URL: http://svn.reactos.org/svn/reactos?rev=67765&view=rev Log: [IMAGEHLP_WINETEST] Add to and fix MSVC build. By Mark Jansen. Modified: trunk/rostests/winetests/CMakeLists.txt trunk/rostests/winetests/imagehlp/image.c Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Sat May 16 10:24:11 2015 @@ -32,9 +32,7 @@ add_subdirectory(gdiplus) add_subdirectory(hlink) add_subdirectory(icmp) -if(NOT MSVC) - add_subdirectory(imagehlp) # FIXME: msvc build. -endif() +add_subdirectory(imagehlp) add_subdirectory(imm32) add_subdirectory(inetcomm) add_subdirectory(inetmib1) Modified: trunk/rostests/winetests/imagehlp/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/image.… ============================================================================== --- trunk/rostests/winetests/imagehlp/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imagehlp/image.c [iso-8859-1] Sat May 16 10:24:11 2015 @@ -56,7 +56,7 @@ } ibn; char dllname[0x10]; }; -#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks[0])) +#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks)) static struct _PeImage { IMAGE_DOS_HEADER dos_header; @@ -70,9 +70,9 @@ char __alignment3[FILE_TOTAL-FILE_IDATA-sizeof(struct Imports)]; } bin = { /* dos header */ - {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, 0, 0, {}, FILE_PE_START}, + {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0}, 0, 0, {0}, FILE_PE_START}, /* alignment before PE header */ - {}, + {0}, /* nt headers */ {IMAGE_NT_SIGNATURE, /* basic headers - 3 sections, no symbols, EXE file */ @@ -99,7 +99,7 @@ 0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE} }, /* alignment before first section */ - {}, + {0}, /* .text section */ { 0x31, 0xC0, /* xor eax, eax */ @@ -122,7 +122,7 @@ "KERNEL32.DLL" }, /* final alignment */ - {} + {0} }; #include <poppack.h> @@ -222,7 +222,8 @@ {FILE_IDATA-FILE_TEXT, &bin.text_section}, {sizeof(bin.idata_section.descriptors[0].u.OriginalFirstThunk), &bin.idata_section.descriptors[0].u.OriginalFirstThunk}, - {FIELD_OFFSET(struct Imports, thunks)-FIELD_OFFSET(struct Imports, descriptors[0].Name), + {FIELD_OFFSET(struct Imports, thunks)- + (FIELD_OFFSET(struct Imports, descriptors)+FIELD_OFFSET(IMAGE_IMPORT_DESCRIPTOR, Name)), &bin.idata_section.descriptors[0].Name}, {FILE_TOTAL-FILE_IDATA-FIELD_OFFSET(struct Imports, ibn), &bin.idata_section.ibn}

1 0

[pschweitzer] 67764: [NTFS] Fix memory leaks
by pschweitzer＠svn.reactos.org 16 May '15

16 May '15

Author: pschweitzer Date: Sat May 16 10:23:55 2015 New Revision: 67764 URL: http://svn.reactos.org/svn/reactos?rev=67764&view=rev Log: [NTFS] Fix memory leaks Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sat May 16 10:23:55 2015 @@ -101,6 +101,10 @@ if (FileRecord == NULL) { DPRINT1("Not enough memory!\n"); + if (AllocatedBuffer) + { + ExFreePoolWithTag(ReadBuffer, TAG_NTFS); + } return STATUS_INSUFFICIENT_RESOURCES; } @@ -109,6 +113,10 @@ { DPRINT1("Can't find record!\n"); ExFreePoolWithTag(FileRecord, TAG_NTFS); + if (AllocatedBuffer) + { + ExFreePoolWithTag(ReadBuffer, TAG_NTFS); + } return Status; } @@ -117,6 +125,10 @@ { DPRINT1("No data associated with file!\n"); ExFreePoolWithTag(FileRecord, TAG_NTFS); + if (AllocatedBuffer) + { + ExFreePoolWithTag(ReadBuffer, TAG_NTFS); + } return Status; }

1 0

[pschweitzer] 67763: [PCIX] Don't mess up with the stack nor leak resources
by pschweitzer＠svn.reactos.org 16 May '15

16 May '15

Author: pschweitzer Date: Sat May 16 10:17:19 2015 New Revision: 67763 URL: http://svn.reactos.org/svn/reactos?rev=67763&view=rev Log: [PCIX] Don't mess up with the stack nor leak resources Modified: trunk/reactos/drivers/bus/pcix/pci/id.c Modified: trunk/reactos/drivers/bus/pcix/pci/id.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/id.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] Sat May 16 10:17:19 2015 @@ -126,11 +126,13 @@ ULONG Size, Length; PANSI_STRING AnsiString; va_list va; - va_start(va, Format); + ASSERT(IdBuffer->Count < MAX_ANSI_STRINGS); /* Do the actual string formatting into the character buffer */ + va_start(va, Format); vsprintf(IdBuffer->CharBuffer, Format, va); + va_end(va); /* Initialize the ANSI_STRING that will hold this string buffer */ AnsiString = &IdBuffer->Strings[IdBuffer->Count]; @@ -161,7 +163,7 @@ ULONG NextId, Size, Length, MaxLength; PANSI_STRING AnsiString; va_list va; - va_start(va, Format); + ASSERT(IdBuffer->Count); /* Choose the next static ANSI_STRING to use */ @@ -171,7 +173,9 @@ MaxLength = (PCHAR)(IdBuffer + 1) - IdBuffer->CharBuffer; /* Do the actual append, and return the length this string took */ + va_start(va, Format); Length = vsprintf(IdBuffer->CharBuffer - 1, Format, va); + va_end(va); ASSERT(Length < MaxLength); /* Select the static ANSI_STRING, and update its length information */

1 0

[akhaldi] 67762: [MPLAY32] Don't use the timer proc to check if playback should stop. Fixes an issue where the playback does not stop/repeat with some devices if it has reached its end. By Ricardo ...
by akhaldi＠svn.reactos.org 16 May '15

16 May '15

Author: akhaldi Date: Sat May 16 10:10:36 2015 New Revision: 67762 URL: http://svn.reactos.org/svn/reactos?rev=67762&view=rev Log: [MPLAY32] Don't use the timer proc to check if playback should stop. Fixes an issue where the playback does not stop/repeat with some devices if it has reached its end. By Ricardo Hanke. CORE-9414 Modified: trunk/reactos/base/applications/mplay32/mplay32.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sat May 16 10:10:36 2015 @@ -648,7 +648,7 @@ SendMessage(hTrackBar, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)1); mciGeneric.dwCallback = (DWORD_PTR)hwnd; - mciError = mciSendCommand(wDeviceId, MCI_STOP, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); + mciError = mciSendCommand(wDeviceId, MCI_STOP, MCI_WAIT, (DWORD_PTR)&mciGeneric); if (mciError != 0) { ShowMCIError(hwnd, mciError); @@ -744,7 +744,6 @@ PlayTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { MCI_STATUS_PARMS mciStatus; - MCI_PLAY_PARMS mciPlay; DWORD dwPos; if (wDeviceId == 0) KillTimer(hwnd, IDT_PLAYTIMER); @@ -753,24 +752,8 @@ mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); dwPos = mciStatus.dwReturn; - if ((UINT)dwPos >= MaxFilePos) - { - if (!bRepeat) - { - StopPlayback(hwnd); - } - else - { - mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); - mciPlay.dwCallback = (DWORD_PTR)hwnd; - mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD_PTR)&mciPlay); - } - } - else - { - SendMessage(hTrackBar, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)dwPos); - UpdateTimeDisplay(hTimeDisplay); - } + SendMessage(hTrackBar, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)dwPos); + UpdateTimeDisplay(hTimeDisplay); } static VOID @@ -829,7 +812,7 @@ case MCI_MODE_PLAY: { mciGeneric.dwCallback = (DWORD_PTR)hwnd; - mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_NOTIFY | MCI_WAIT, (DWORD_PTR)&mciGeneric); + mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); idBmp = IDB_PLAYICON; idCmd = IDC_PLAY; break; @@ -838,7 +821,7 @@ case MCI_MODE_PAUSE: { mciGeneric.dwCallback = (DWORD_PTR)hwnd; - mciError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); + mciError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_WAIT, (DWORD_PTR)&mciGeneric); idBmp = IDB_PAUSEICON; idCmd = IDC_PAUSE; break; @@ -1234,6 +1217,19 @@ DragQueryFile(drophandle, 0, droppedfile, ARRAYSIZE(droppedfile)); DragFinish(drophandle); OpenMediaFile(hwnd, droppedfile, NULL); + break; + } + + case MM_MCINOTIFY: + { + if (wParam == MCI_NOTIFY_SUCCESSFUL) + { + StopPlayback(hwnd); + if (bRepeat) + { + StartPlayback(hwnd); + } + } break; }

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