Ros-diffs July 2023

ros-diffs@reactos.org

26 participants
189 discussions

[reactos] 03/03: [NTOS:KE] Add x86 CPU features reporting to AMD64

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ae65ab7a70aa6e627c24… commit 5ae65ab7a70aa6e627c2462042584861258352b5 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jun 30 18:06:38 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 2 21:00:32 2023 +0300 [NTOS:KE] Add x86 CPU features reporting to AMD64 CORE-18023 CORE-14922 --- ntoskrnl/include/internal/amd64/ke.h | 3 ++ ntoskrnl/ke/amd64/cpu.c | 54 ++++++++++++++++++++++++++++++++++++ ntoskrnl/ke/amd64/kiinit.c | 5 ++++ 3 files changed, 62 insertions(+) diff --git a/ntoskrnl/include/internal/amd64/ke.h b/ntoskrnl/include/internal/amd64/ke.h index 318b119d513..3287e7567c2 100644 --- a/ntoskrnl/include/internal/amd64/ke.h +++ b/ntoskrnl/include/internal/amd64/ke.h @@ -420,6 +420,9 @@ VOID KiGetCacheInformation(VOID); VOID KiSetProcessorType(VOID); ULONG KiGetFeatureBits(VOID); VOID KiInitializeCpuFeatures(VOID); +#if DBG +VOID KiReportCpuFeatures(IN PKPRCB Prcb); +#endif ULONG KeAllocateGdtSelector(ULONG Desc[2]); VOID KeFreeGdtSelector(ULONG Entry); diff --git a/ntoskrnl/ke/amd64/cpu.c b/ntoskrnl/ke/amd64/cpu.c index 0967411e644..274320c1b12 100644 --- a/ntoskrnl/ke/amd64/cpu.c +++ b/ntoskrnl/ke/amd64/cpu.c @@ -234,6 +234,60 @@ KiGetFeatureBits(VOID) return FeatureBits; } +#if DBG +VOID +KiReportCpuFeatures(IN PKPRCB Prcb) +{ + ULONG CpuFeatures = 0; + CPU_INFO CpuInfo; + + if (Prcb->CpuVendor) + { + KiCpuId(&CpuInfo, 1); + CpuFeatures = CpuInfo.Edx; + } + + DPRINT1("Supported CPU features: "); + +#define print_kf_bit(kf_value) if (Prcb->FeatureBits & kf_value) DbgPrint(#kf_value " ") + print_kf_bit(KF_V86_VIS); + print_kf_bit(KF_RDTSC); + print_kf_bit(KF_CR4); + print_kf_bit(KF_CMOV); + print_kf_bit(KF_GLOBAL_PAGE); + print_kf_bit(KF_LARGE_PAGE); + print_kf_bit(KF_MTRR); + print_kf_bit(KF_CMPXCHG8B); + print_kf_bit(KF_CMPXCHG16B); + print_kf_bit(KF_MMX); + print_kf_bit(KF_WORKING_PTE); + print_kf_bit(KF_PAT); + print_kf_bit(KF_FXSR); + print_kf_bit(KF_FAST_SYSCALL); + print_kf_bit(KF_XMMI); + print_kf_bit(KF_3DNOW); + print_kf_bit(KF_XMMI64); + print_kf_bit(KF_DTS); + print_kf_bit(KF_NX_BIT); + print_kf_bit(KF_NX_DISABLED); + print_kf_bit(KF_NX_ENABLED); + print_kf_bit(KF_SSE3); + //print_kf_bit(KF_SSE3SUP); + //print_kf_bit(KF_SSE41); + //print_kf_bit(KF_MONITOR); + //print_kf_bit(KF_POPCNT); + print_kf_bit(KF_XSTATE); +#undef print_kf_bit + +#define print_cf(cpu_flag) if (CpuFeatures & cpu_flag) DbgPrint(#cpu_flag " ") + print_cf(X86_FEATURE_PAE); + print_cf(X86_FEATURE_HT); +#undef print_cf + + DbgPrint("\n"); +} +#endif // DBG + VOID NTAPI KiGetCacheInformation(VOID) diff --git a/ntoskrnl/ke/amd64/kiinit.c b/ntoskrnl/ke/amd64/kiinit.c index 65819290f46..a0dc2c5c5b8 100644 --- a/ntoskrnl/ke/amd64/kiinit.c +++ b/ntoskrnl/ke/amd64/kiinit.c @@ -341,6 +341,11 @@ KiInitializeKernelMachineDependent( SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSOFF; Prcb->FeatureBits |= KF_NX_DISABLED; } + +#if DBG + /* Print applied kernel features/policies and boot CPU features */ + KiReportCpuFeatures(Prcb); +#endif } static LDR_DATA_TABLE_ENTRY LdrCoreEntries[3];

1 year, 5 months

[reactos] 02/03: [NTOS:KE] Report x86 CPU features in a separate function

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a6b383abd2ac86746fda… commit 6a6b383abd2ac86746fdadb0522aadef37328caf Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jun 30 17:16:54 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 2 21:00:31 2023 +0300 [NTOS:KE] Report x86 CPU features in a separate function KiGetFeatureBits() is now being called in the early boot phase 0 when the Kernel Debugger is not yet initialized, so debug prints are not available here. Move the debug prints into a new function and call it at the right time. CORE-18023 --- ntoskrnl/include/internal/i386/ke.h | 6 +++ ntoskrnl/ke/i386/cpu.c | 80 +++++++++++++++++++++++-------------- ntoskrnl/ke/i386/kiinit.c | 6 +++ 3 files changed, 62 insertions(+), 30 deletions(-) diff --git a/ntoskrnl/include/internal/i386/ke.h b/ntoskrnl/include/internal/i386/ke.h index cc8bca420bf..30509248a2b 100644 --- a/ntoskrnl/include/internal/i386/ke.h +++ b/ntoskrnl/include/internal/i386/ke.h @@ -459,6 +459,12 @@ ULONG NTAPI KiGetFeatureBits(VOID); +#if DBG +CODE_SEG("INIT") +VOID +KiReportCpuFeatures(VOID); +#endif + VOID NTAPI KiThreadStartup(VOID); diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index d4634cbe33b..a39d27a2139 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -380,11 +380,6 @@ KiGetFeatureBits(VOID) if (CpuFeatures & X86_FEATURE_SSE) FeatureBits |= KF_XMMI; if (CpuFeatures & X86_FEATURE_SSE2) FeatureBits |= KF_XMMI64; - if (CpuFeatures & X86_FEATURE_PAE) - { - DPRINT1("Support PAE\n"); - } - /* Check if the CPU has hyper-threading */ if (CpuFeatures & X86_FEATURE_HT) { @@ -430,35 +425,60 @@ KiGetFeatureBits(VOID) } } -#define print_supported(kf_value) ((FeatureBits & kf_value) ? #kf_value : "") - DPRINT1("Supported CPU features : %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n", - print_supported(KF_V86_VIS), - print_supported(KF_RDTSC), - print_supported(KF_CR4), - print_supported(KF_CMOV), - print_supported(KF_GLOBAL_PAGE), - print_supported(KF_LARGE_PAGE), - print_supported(KF_MTRR), - print_supported(KF_CMPXCHG8B), - print_supported(KF_MMX), - print_supported(KF_WORKING_PTE), - print_supported(KF_PAT), - print_supported(KF_FXSR), - print_supported(KF_FAST_SYSCALL), - print_supported(KF_XMMI), - print_supported(KF_3DNOW), - print_supported(KF_AMDK6MTRR), - print_supported(KF_XMMI64), - print_supported(KF_DTS), - print_supported(KF_NX_BIT), - print_supported(KF_NX_DISABLED), - print_supported(KF_NX_ENABLED)); -#undef print_supported - /* Return the Feature Bits */ return FeatureBits; } +#if DBG +CODE_SEG("INIT") +VOID +KiReportCpuFeatures(VOID) +{ + ULONG CpuFeatures = 0; + CPU_INFO CpuInfo; + + if (KiGetCpuVendor()) + { + KiCpuId(&CpuInfo, 1); + CpuFeatures = CpuInfo.Edx; + } + + DPRINT1("Supported CPU features: "); + +#define print_kf_bit(kf_value) if (KeFeatureBits & kf_value) DbgPrint(#kf_value " ") + print_kf_bit(KF_V86_VIS); + print_kf_bit(KF_RDTSC); + print_kf_bit(KF_CR4); + print_kf_bit(KF_CMOV); + print_kf_bit(KF_GLOBAL_PAGE); + print_kf_bit(KF_LARGE_PAGE); + print_kf_bit(KF_MTRR); + print_kf_bit(KF_CMPXCHG8B); + print_kf_bit(KF_MMX); + print_kf_bit(KF_WORKING_PTE); + print_kf_bit(KF_PAT); + print_kf_bit(KF_FXSR); + print_kf_bit(KF_FAST_SYSCALL); + print_kf_bit(KF_XMMI); + print_kf_bit(KF_3DNOW); + print_kf_bit(KF_AMDK6MTRR); + print_kf_bit(KF_XMMI64); + print_kf_bit(KF_DTS); + print_kf_bit(KF_NX_BIT); + print_kf_bit(KF_NX_DISABLED); + print_kf_bit(KF_NX_ENABLED); +#undef print_kf_bit + +#define print_cf(cpu_flag) if (CpuFeatures & cpu_flag) DbgPrint(#cpu_flag " ") + print_cf(X86_FEATURE_PAE); + print_cf(X86_FEATURE_APIC); + print_cf(X86_FEATURE_HT); +#undef print_cf + + DbgPrint("\n"); +} +#endif // DBG + CODE_SEG("INIT") VOID NTAPI diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index a83afe72c70..9699d11b03c 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -480,6 +480,12 @@ KiInitializeKernel(IN PKPROCESS InitProcess, /* Save CPU state */ KiSaveProcessorControlState(&Prcb->ProcessorState); +#if DBG + /* Print applied kernel features/policies and boot CPU features */ + if (Number == 0) + KiReportCpuFeatures(); +#endif + /* Get cache line information for this CPU */ KiGetCacheInformation();

1 year, 5 months

[reactos] 01/03: [NTOS:KE] Fix magic constants for x86 CPU features

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00715ccf8bde403dce65e… commit 00715ccf8bde403dce65e4e0cb63b63b133dfc5a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jun 30 17:06:19 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 2 21:00:31 2023 +0300 [NTOS:KE] Fix magic constants for x86 CPU features Do it the same way as in amd64 ke.h/cpu.c. CORE-18023 --- ntoskrnl/include/internal/i386/ke.h | 24 +++++++++++++++++++++++ ntoskrnl/ke/i386/cpu.c | 38 ++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/ntoskrnl/include/internal/i386/ke.h b/ntoskrnl/include/internal/i386/ke.h index cdeba9ab87d..cc8bca420bf 100644 --- a/ntoskrnl/include/internal/i386/ke.h +++ b/ntoskrnl/include/internal/i386/ke.h @@ -22,6 +22,30 @@ extern "C" #define KD_BREAKPOINT_SIZE sizeof(UCHAR) #define KD_BREAKPOINT_VALUE 0xCC +/* CPUID 1 - EDX flags */ +#define X86_FEATURE_FPU 0x00000001 /* x87 FPU is present */ +#define X86_FEATURE_VME 0x00000002 /* Virtual 8086 Extensions are present */ +#define X86_FEATURE_DBG 0x00000004 /* Debugging extensions are present */ +#define X86_FEATURE_PSE 0x00000008 /* Page Size Extension is present */ +#define X86_FEATURE_TSC 0x00000010 /* Time Stamp Counters are present */ +#define X86_FEATURE_PAE 0x00000040 /* Physical Address Extension is present */ +#define X86_FEATURE_CX8 0x00000100 /* CMPXCHG8B instruction present */ +#define X86_FEATURE_APIC 0x00000200 /* APIC is present */ +#define X86_FEATURE_SYSCALL 0x00000800 /* SYSCALL/SYSRET support present */ +#define X86_FEATURE_MTTR 0x00001000 /* Memory type range registers are present */ +#define X86_FEATURE_PGE 0x00002000 /* Page Global Enable */ +#define X86_FEATURE_CMOV 0x00008000 /* "Conditional move" instruction supported */ +#define X86_FEATURE_PAT 0x00010000 /* Page Attribute Table is supported */ +#define X86_FEATURE_DS 0x00200000 /* Debug Store is present */ +#define X86_FEATURE_MMX 0x00800000 /* MMX extension present */ +#define X86_FEATURE_FXSR 0x01000000 /* FXSAVE/FXRSTOR instructions present */ +#define X86_FEATURE_SSE 0x02000000 /* SSE extension present */ +#define X86_FEATURE_SSE2 0x04000000 /* SSE2 extension present */ +#define X86_FEATURE_HT 0x10000000 /* Hyper-Threading present */ + +/* CPUID 0x80000001 - EDX extended flags */ +#define X86_FEATURE_NX 0x00100000 /* NX support present */ + // // One-liners for getting and setting special purpose registers in portable code // diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index eac0bf42680..d4634cbe33b 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -365,28 +365,28 @@ KiGetFeatureBits(VOID) CpuFeatures = CpuInfo.Edx; /* Convert all CPUID Feature bits into our format */ - if (CpuFeatures & 0x00000002) FeatureBits |= KF_V86_VIS | KF_CR4; - if (CpuFeatures & 0x00000008) FeatureBits |= KF_LARGE_PAGE | KF_CR4; - if (CpuFeatures & 0x00000010) FeatureBits |= KF_RDTSC; - if (CpuFeatures & 0x00000100) FeatureBits |= KF_CMPXCHG8B; - if (CpuFeatures & 0x00000800) FeatureBits |= KF_FAST_SYSCALL; - if (CpuFeatures & 0x00001000) FeatureBits |= KF_MTRR; - if (CpuFeatures & 0x00002000) FeatureBits |= KF_GLOBAL_PAGE | KF_CR4; - if (CpuFeatures & 0x00008000) FeatureBits |= KF_CMOV; - if (CpuFeatures & 0x00010000) FeatureBits |= KF_PAT; - if (CpuFeatures & 0x00200000) FeatureBits |= KF_DTS; - if (CpuFeatures & 0x00800000) FeatureBits |= KF_MMX; - if (CpuFeatures & 0x01000000) FeatureBits |= KF_FXSR; - if (CpuFeatures & 0x02000000) FeatureBits |= KF_XMMI; - if (CpuFeatures & 0x04000000) FeatureBits |= KF_XMMI64; - - if (CpuFeatures & 0x00000040) + if (CpuFeatures & X86_FEATURE_VME) FeatureBits |= KF_V86_VIS | KF_CR4; + if (CpuFeatures & X86_FEATURE_PSE) FeatureBits |= KF_LARGE_PAGE | KF_CR4; + if (CpuFeatures & X86_FEATURE_TSC) FeatureBits |= KF_RDTSC; + if (CpuFeatures & X86_FEATURE_CX8) FeatureBits |= KF_CMPXCHG8B; + if (CpuFeatures & X86_FEATURE_SYSCALL) FeatureBits |= KF_FAST_SYSCALL; + if (CpuFeatures & X86_FEATURE_MTTR) FeatureBits |= KF_MTRR; + if (CpuFeatures & X86_FEATURE_PGE) FeatureBits |= KF_GLOBAL_PAGE | KF_CR4; + if (CpuFeatures & X86_FEATURE_CMOV) FeatureBits |= KF_CMOV; + if (CpuFeatures & X86_FEATURE_PAT) FeatureBits |= KF_PAT; + if (CpuFeatures & X86_FEATURE_DS) FeatureBits |= KF_DTS; + if (CpuFeatures & X86_FEATURE_MMX) FeatureBits |= KF_MMX; + if (CpuFeatures & X86_FEATURE_FXSR) FeatureBits |= KF_FXSR; + if (CpuFeatures & X86_FEATURE_SSE) FeatureBits |= KF_XMMI; + if (CpuFeatures & X86_FEATURE_SSE2) FeatureBits |= KF_XMMI64; + + if (CpuFeatures & X86_FEATURE_PAE) { DPRINT1("Support PAE\n"); } /* Check if the CPU has hyper-threading */ - if (CpuFeatures & 0x10000000) + if (CpuFeatures & X86_FEATURE_HT) { /* Set the number of logical CPUs */ Prcb->LogicalProcessorsPerPhysicalProcessor = (UCHAR)(CpuInfo.Ebx >> 16); @@ -416,7 +416,7 @@ KiGetFeatureBits(VOID) KiCpuId(&CpuInfo, 0x80000001); /* Check if NX-bit is supported */ - if (CpuInfo.Edx & 0x00100000) FeatureBits |= KF_NX_BIT; + if (CpuInfo.Edx & X86_FEATURE_NX) FeatureBits |= KF_NX_BIT; /* Now handle each features for each CPU Vendor */ switch (Vendor) @@ -481,7 +481,7 @@ KiGetCacheInformation(VOID) /* Handle Intel case */ case CPU_INTEL: - /*Check if we support CPUID 2 */ + /* Check if we support CPUID 2 */ KiCpuId(&CpuInfo, 0); if (CpuInfo.Eax >= 2) {

1 year, 5 months

[reactos] 01/01: [NTUSER] NtUserWaitForInputIdle: Fix unhandled exception BSOD 0x1E (#5391)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7e4c3a8e9d921233c173… commit c7e4c3a8e9d921233c1731ef64c388ed40b15fcb Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Mon Jul 3 00:30:30 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jul 2 20:30:30 2023 +0300 [NTUSER] NtUserWaitForInputIdle: Fix unhandled exception BSOD 0x1E (#5391) Fix CLIENTINFO usermode pointer access once again. Based on a patch by Michael Fritscher from CORE-10017. Addendum to 705228250741da (r68702). CORE-18728 CORE-19014 --- win32ss/user/ntuser/message.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/message.c b/win32ss/user/ntuser/message.c index 2d6164e7c7c..fbee45fec6b 100644 --- a/win32ss/user/ntuser/message.c +++ b/win32ss/user/ntuser/message.c @@ -3110,14 +3110,12 @@ NtUserWaitForInputIdle( IN HANDLE hProcess, Timeout.QuadPart = (LONGLONG) dwMilliseconds * (LONGLONG) -10000; KeStackAttachProcess(&Process->Pcb, &ApcState); - W32Process->W32PF_flags |= W32PF_WAITFORINPUTIDLE; for (pti = W32Process->ptiList; pti; pti = pti->ptiSibling) { pti->TIF_flags |= TIF_WAITFORINPUTIDLE; pti->pClientInfo->dwTIFlags = pti->TIF_flags; } - KeUnstackDetachProcess(&ApcState); TRACE("WFII: ppi %p\n", W32Process); @@ -3176,12 +3174,15 @@ NtUserWaitForInputIdle( IN HANDLE hProcess, while (TRUE); WaitExit: + KeStackAttachProcess(&Process->Pcb, &ApcState); for (pti = W32Process->ptiList; pti; pti = pti->ptiSibling) { pti->TIF_flags &= ~TIF_WAITFORINPUTIDLE; pti->pClientInfo->dwTIFlags = pti->TIF_flags; } W32Process->W32PF_flags &= ~W32PF_WAITFORINPUTIDLE; + KeUnstackDetachProcess(&ApcState); + IntDereferenceProcessInfo(W32Process); ObDereferenceObject(Process); UserLeave();

1 year, 5 months

[reactos] 01/01: [NTOS:EX] Fix swapped values in ExGetCurrentProcessorCounts() (#4565)

by Eugen Podrug

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e01dee25155b8edc256f… commit 8e01dee25155b8edc256f7d2239f8fb22496a543 Author: Eugen Podrug <eugen.podrug(a)gmail.com> AuthorDate: Tue Jan 24 05:42:03 2023 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 2 16:10:36 2023 +0300 [NTOS:EX] Fix swapped values in ExGetCurrentProcessorCounts() (#4565) The function should return the kernel time for the idle thread in the first argument, and kernel time + user time for the current thread in the second argument. Also retrieve the processor number from the cached PRCB instead of calling KeGetCurrentProcessorNumber() which retrieves the PRCB again since the processor could switch in-between those calls. NdisGetCurrentProcessorCounts() function follows the same prototype which is the correct one. --- drivers/network/ndis/include/ndissys.h | 4 ++-- ntoskrnl/ex/sysinfo.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/network/ndis/include/ndissys.h b/drivers/network/ndis/include/ndissys.h index b80a6a0bbfa..7d5dbb0740a 100644 --- a/drivers/network/ndis/include/ndissys.h +++ b/drivers/network/ndis/include/ndissys.h @@ -45,8 +45,8 @@ VOID NTAPI ExGetCurrentProcessorCounts( - PULONG ThreadKernelTime, - PULONG TotalCpuTime, + PULONG IdleTime, + PULONG KernelAndUserTime, PULONG ProcessorNumber); VOID diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index ecf6380dd8b..d6692bc83f6 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -342,17 +342,17 @@ ExGetCurrentProcessorCpuUsage(PULONG CpuUsage) */ VOID NTAPI -ExGetCurrentProcessorCounts(PULONG ThreadKernelTime, - PULONG TotalCpuTime, +ExGetCurrentProcessorCounts(PULONG IdleTime, + PULONG KernelAndUserTime, PULONG ProcessorNumber) { PKPRCB Prcb; Prcb = KeGetCurrentPrcb(); - *ThreadKernelTime = Prcb->KernelTime + Prcb->UserTime; - *TotalCpuTime = Prcb->CurrentThread->KernelTime; - *ProcessorNumber = KeGetCurrentProcessorNumber(); + *IdleTime = Prcb->IdleThread->KernelTime; + *KernelAndUserTime = Prcb->KernelTime + Prcb->UserTime; + *ProcessorNumber = (ULONG)Prcb->Number; } /*

1 year, 5 months

[reactos] 01/01: [IPCONFIG] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc85db7d8c326549d5873… commit bc85db7d8c326549d5873e59c35927d7976cd26a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jul 2 16:02:19 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 2 16:02:19 2023 +0300 [IPCONFIG] Update Russian (ru-RU) translation --- base/applications/network/ipconfig/lang/ru-RU.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/applications/network/ipconfig/lang/ru-RU.rc b/base/applications/network/ipconfig/lang/ru-RU.rc index 340b40921d6..c365b1d37f3 100644 --- a/base/applications/network/ipconfig/lang/ru-RU.rc +++ b/base/applications/network/ipconfig/lang/ru-RU.rc @@ -84,12 +84,12 @@ STRINGTABLE BEGIN IDS_DNSNORECORD "\tНет записей типа %ls\n\n" IDS_DNSNONAME "\tИмя не существует.\n\n" - IDS_DNSFLUSHERROR "Не удается очистить кэш распознавателя DNS: " + IDS_DNSFLUSHERROR "Не удаётся очистить кэш распознавателя DNS: " IDS_DNSFLUSHSUCCESS "Успешно сброшен кэш распознавателя DNS.\n" - IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" - IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" - IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" - IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPNOTCONNECTED "Операции не могут быть выполнены на ""%ls"", до тех пор, пока сеть отключена.\n" + IDS_DHCPNOTENABLED "Адаптер ""%ls"" не доступен для DHCP.\n" + IDS_DHCPNOADAPTER "Операция завершена с ошибкой, поскольку ни один адаптер\nне находился в состоянии, допустимом для её выполнения.\n" + IDS_DHCPRELEASED "IP-адрес для адаптера ""%ls"" уже освобождён.\n" END STRINGTABLE

1 year, 5 months

[reactos] 01/01: [IPCONFIG] Improvements to Release and Renew functions

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed80df29e0c135e2179cc… commit ed80df29e0c135e2179ccfe0e40da2731bc7b27c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 2 14:48:03 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 2 14:48:03 2023 +0200 [IPCONFIG] Improvements to Release and Renew functions - Reimplement the Release and Renew functions using GetAdaptersInfo(). - Check for enabled DHCP and connected medium - Check for already released Lease in the Release function - Add required messages --- base/applications/network/ipconfig/ipconfig.c | 195 +++++++++++++++++------ base/applications/network/ipconfig/lang/bg-BG.rc | 22 +-- base/applications/network/ipconfig/lang/de-DE.rc | 22 +-- base/applications/network/ipconfig/lang/el-GR.rc | 22 +-- base/applications/network/ipconfig/lang/en-US.rc | 22 +-- base/applications/network/ipconfig/lang/es-ES.rc | 22 +-- base/applications/network/ipconfig/lang/fr-FR.rc | 22 +-- base/applications/network/ipconfig/lang/id-ID.rc | 22 +-- base/applications/network/ipconfig/lang/it-IT.rc | 22 +-- base/applications/network/ipconfig/lang/no-NO.rc | 22 +-- base/applications/network/ipconfig/lang/pl-PL.rc | 22 +-- base/applications/network/ipconfig/lang/ro-RO.rc | 22 +-- base/applications/network/ipconfig/lang/ru-RU.rc | 22 +-- base/applications/network/ipconfig/lang/sk-SK.rc | 22 +-- base/applications/network/ipconfig/lang/sq-AL.rc | 22 +-- base/applications/network/ipconfig/lang/sv-SE.rc | 22 +-- base/applications/network/ipconfig/lang/tr-TR.rc | 22 +-- base/applications/network/ipconfig/lang/uk-UA.rc | 22 +-- base/applications/network/ipconfig/lang/zh-CN.rc | 22 +-- base/applications/network/ipconfig/lang/zh-TW.rc | 22 +-- base/applications/network/ipconfig/resource.h | 4 + 21 files changed, 398 insertions(+), 219 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index 43c7b89a531..014a87d120c 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -528,7 +528,10 @@ PrintAdapterTypeAndName( } } -VOID ShowInfo(BOOL bAll) +VOID +ShowInfo( + BOOL bShowHeader, + BOOL bAll) { MIB_IFROW mibEntry; PIP_ADAPTER_INFO pAdapterInfo = NULL; @@ -602,7 +605,8 @@ VOID ShowInfo(BOOL bAll) pAdapter = pAdapterInfo; - ConResPrintf(StdOut, IDS_HEADER); + if (bShowHeader) + ConResPrintf(StdOut, IDS_HEADER); if (bAll) { @@ -805,120 +809,215 @@ MatchWildcard( return TRUE; } +static +VOID +BuildAdapterMap( + PIP_ADAPTER_INDEX_MAP pAdapterMap, + PIP_ADAPTER_INFO pAdapterInfo) +{ + int i, l1, l2; + + pAdapterMap->Index = pAdapterInfo->Index; + + wcscpy(pAdapterMap->Name, L"\\DEVICE\\TCPIP_"); + l1 = wcslen(pAdapterMap->Name); + l2 = strlen(pAdapterInfo->AdapterName); + for (i = 0; i < l2; i++) + pAdapterMap->Name[i + l1] = (WCHAR)pAdapterInfo->AdapterName[i]; + pAdapterMap->Name[i + l1] = UNICODE_NULL; +} + VOID Release( LPWSTR pszAdapterName) { - IP_ADAPTER_INDEX_MAP AdapterInfo; - DWORD i, ret; - PIP_INTERFACE_INFO pInfo = NULL; - ULONG ulOutBufLen = 0; + PIP_ADAPTER_INFO pAdapterInfo = NULL; + PIP_ADAPTER_INFO pAdapter = NULL; + ULONG adaptOutBufLen = 0; + ULONG ret = 0; WCHAR szFriendlyName[MAX_PATH]; + MIB_IFROW mibEntry; + IP_ADAPTER_INDEX_MAP AdapterMap; + BOOL bFoundAdapter = FALSE; ConResPrintf(StdOut, IDS_HEADER); - if (GetInterfaceInfo(pInfo, &ulOutBufLen) != ERROR_INSUFFICIENT_BUFFER) + /* call GetAdaptersInfo to obtain the adapter info */ + ret = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen); + if (ret != ERROR_BUFFER_OVERFLOW) { - _tprintf(_T("\nGetInterfaceInfo failed : ")); - DoFormatMessage(0); + DoFormatMessage(ret); return; } - pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, ulOutBufLen); - if (pInfo == NULL) + pAdapterInfo = (IP_ADAPTER_INFO *)HeapAlloc(ProcessHeap, 0, adaptOutBufLen); + if (pAdapterInfo == NULL) { _tprintf(_T("memory allocation error")); return; } - if (GetInterfaceInfo(pInfo, &ulOutBufLen) != NO_ERROR) + ret = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen); + if (ret != NO_ERROR) { - _tprintf(_T("\nGetInterfaceInfo failed : ")); DoFormatMessage(0); goto done; } - for (i = 0; i < pInfo->NumAdapters; i++) + pAdapter = pAdapterInfo; + + while (pAdapter) { - GetInterfaceFriendlyName(pInfo->Adapter[i].Name, MAX_PATH, szFriendlyName); + GetAdapterFriendlyName(pAdapterInfo->AdapterName, MAX_PATH, szFriendlyName); if ((pszAdapterName == NULL) || MatchWildcard(pszAdapterName, szFriendlyName)) { - /* TODO: Check for enabled DHCP and connected medium */ + bFoundAdapter = TRUE; - CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); - _tprintf(_T("name - %ls\n"), pInfo->Adapter[i].Name); + mibEntry.dwIndex = pAdapter->Index; + GetIfEntry(&mibEntry); - /* Call IpReleaseAddress to release the IP address on the specified adapter. */ - ret = IpReleaseAddress(&AdapterInfo); - if (ret != NO_ERROR) + if (mibEntry.dwOperStatus == MIB_IF_OPER_STATUS_CONNECTED || + mibEntry.dwOperStatus == MIB_IF_OPER_STATUS_OPERATIONAL) + { + if (pAdapter->DhcpEnabled) + { + if (strcmp(pAdapter->IpAddressList.IpAddress.String, "0.0.0.0")) + { + BuildAdapterMap(&AdapterMap, pAdapter); + + /* Call IpReleaseAddress to release the IP address on the specified adapter. */ + ret = IpReleaseAddress(&AdapterMap); + if (ret != NO_ERROR) + { + _tprintf(_T("\nAn error occured while releasing interface %ls : \n"), szFriendlyName); + DoFormatMessage(ret); + } + } + else + { + ConResPrintf(StdOut, IDS_DHCPRELEASED); + } + } + else + { + ConResPrintf(StdOut, IDS_DHCPNOTENABLED, szFriendlyName); + } + } + else { - _tprintf(_T("\nAn error occured while releasing interface %ls : \n"), szFriendlyName); - DoFormatMessage(ret); + ConResPrintf(StdOut, IDS_DHCPNOTCONNECTED, szFriendlyName); } } + + pAdapter = pAdapter->Next; + } + + if (bFoundAdapter == FALSE) + { + ConResPrintf(StdOut, IDS_DHCPNOADAPTER); + } + else + { + ShowInfo(FALSE, FALSE); } done: - HeapFree(ProcessHeap, 0, pInfo); + if (pAdapterInfo) + HeapFree(ProcessHeap, 0, pAdapterInfo); } VOID Renew( LPWSTR pszAdapterName) { - IP_ADAPTER_INDEX_MAP AdapterInfo; - DWORD i, ret; - PIP_INTERFACE_INFO pInfo = NULL; - ULONG ulOutBufLen = 0; + PIP_ADAPTER_INFO pAdapterInfo = NULL; + PIP_ADAPTER_INFO pAdapter = NULL; + ULONG adaptOutBufLen = 0; + ULONG ret = 0; WCHAR szFriendlyName[MAX_PATH]; + MIB_IFROW mibEntry; + IP_ADAPTER_INDEX_MAP AdapterMap; + BOOL bFoundAdapter = FALSE; ConResPrintf(StdOut, IDS_HEADER); - if (GetInterfaceInfo(pInfo, &ulOutBufLen) != ERROR_INSUFFICIENT_BUFFER) + /* call GetAdaptersInfo to obtain the adapter info */ + ret = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen); + if (ret != ERROR_BUFFER_OVERFLOW) { - _tprintf(_T("\nGetInterfaceInfo failed : ")); - DoFormatMessage(0); + DoFormatMessage(ret); return; } - pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, ulOutBufLen); - if (pInfo == NULL) + pAdapterInfo = (IP_ADAPTER_INFO *)HeapAlloc(ProcessHeap, 0, adaptOutBufLen); + if (pAdapterInfo == NULL) { _tprintf(_T("memory allocation error")); return; } - /* Make a second call to GetInterfaceInfo to get the actual data we want */ - if (GetInterfaceInfo(pInfo, &ulOutBufLen) != NO_ERROR) + ret = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen); + if (ret != NO_ERROR) { - _tprintf(_T("\nGetInterfaceInfo failed : ")); DoFormatMessage(0); goto done; } - for (i = 0; i < pInfo->NumAdapters; i++) + pAdapter = pAdapterInfo; + + while (pAdapter) { - GetInterfaceFriendlyName(pInfo->Adapter[i].Name, MAX_PATH, szFriendlyName); + GetAdapterFriendlyName(pAdapterInfo->AdapterName, MAX_PATH, szFriendlyName); if ((pszAdapterName == NULL) || MatchWildcard(pszAdapterName, szFriendlyName)) { - /* TODO: Check for enabled DHCP and connected medium */ + bFoundAdapter = TRUE; - CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); + mibEntry.dwIndex = pAdapter->Index; + GetIfEntry(&mibEntry); - /* Call IpRenewAddress to renew the IP address on the specified adapter. */ - ret = IpRenewAddress(&AdapterInfo); - if (ret != NO_ERROR) + if (mibEntry.dwOperStatus == MIB_IF_OPER_STATUS_CONNECTED || + mibEntry.dwOperStatus == MIB_IF_OPER_STATUS_OPERATIONAL) { - _tprintf(_T("\nAn error occured while renew interface %ls : "), szFriendlyName); - DoFormatMessage(ret); + if (pAdapter->DhcpEnabled) + { + BuildAdapterMap(&AdapterMap, pAdapter); + + /* Call IpRenewAddress to renew the IP address on the specified adapter. */ + ret = IpRenewAddress(&AdapterMap); + if (ret != NO_ERROR) + { + _tprintf(_T("\nAn error occured while renew interface %ls : "), szFriendlyName); + DoFormatMessage(ret); + } + } + else + { + ConResPrintf(StdOut, IDS_DHCPNOTENABLED, szFriendlyName); + } + } + else + { + ConResPrintf(StdOut, IDS_DHCPNOTCONNECTED, szFriendlyName); } } + + pAdapter = pAdapter->Next; + } + + if (bFoundAdapter == FALSE) + { + ConResPrintf(StdOut, IDS_DHCPNOADAPTER); + } + else + { + ShowInfo(FALSE, FALSE); } done: - HeapFree(ProcessHeap, 0, pInfo); + if (pAdapterInfo) + HeapFree(ProcessHeap, 0, pAdapterInfo); } VOID @@ -1175,13 +1274,13 @@ int wmain(int argc, wchar_t *argv[]) switch (argc) { case 1: /* Default behaviour if no options are given*/ - ShowInfo(FALSE); + ShowInfo(TRUE, FALSE); break; case 2: /* Process all the options that take no parameters */ if (DoUsage) Usage(); else if (DoAll) - ShowInfo(TRUE); + ShowInfo(TRUE, TRUE); else if (DoRelease) Release(NULL); else if (DoRenew) diff --git a/base/applications/network/ipconfig/lang/bg-BG.rc b/base/applications/network/ipconfig/lang/bg-BG.rc index a91a4b04c10..505d454725f 100644 --- a/base/applications/network/ipconfig/lang/bg-BG.rc +++ b/base/applications/network/ipconfig/lang/bg-BG.rc @@ -44,15 +44,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nДруг вид карта: %ls\n" - IDS_ETH "\nКарта Ethernet: %ls\n" - IDS_TOKEN "\nКарта Token Ring: %ls\n" - IDS_FDDI "\nКарта FDDI: %ls\n" - IDS_PPP "\nКарта PPP: %ls\n" - IDS_LOOP "\nКарта Loopback: %ls\n" - IDS_SLIP "\nКарта SLIP: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nДруг вид карта: %ls\n\n" + IDS_ETH "\nКарта Ethernet: %ls\n\n" + IDS_TOKEN "\nКарта Token Ring: %ls\n\n" + IDS_FDDI "\nКарта FDDI: %ls\n\n" + IDS_PPP "\nКарта PPP: %ls\n\n" + IDS_LOOP "\nКарта Loopback: %ls\n\n" + IDS_SLIP "\nКарта SLIP: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -85,6 +85,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/de-DE.rc b/base/applications/network/ipconfig/lang/de-DE.rc index 3ac1118752e..76313151a15 100644 --- a/base/applications/network/ipconfig/lang/de-DE.rc +++ b/base/applications/network/ipconfig/lang/de-DE.rc @@ -46,15 +46,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnbekannter Adapter: %ls\n" - IDS_OTHER "\nAnderer Adapter: %ls\n" - IDS_ETH "\nEthernet-Adapter: %ls\n" - IDS_TOKEN "\nToken-Ring-Adapter: %ls\n" - IDS_FDDI "\nFDDI-Adapter: %ls\n" - IDS_PPP "\nPPP-Adapter: %ls\n" - IDS_LOOP "\nLoopback-Adapter: %ls\n" - IDS_SLIP "\nSLIP-Adapter: %ls\n" - IDS_WIFI "\nDrahtlos-LAN-Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnbekannter Adapter: %ls\n\n" + IDS_OTHER "\nAnderer Adapter: %ls\n\n" + IDS_ETH "\nEthernet-Adapter: %ls\n\n" + IDS_TOKEN "\nToken-Ring-Adapter: %ls\n\n" + IDS_FDDI "\nFDDI-Adapter: %ls\n\n" + IDS_PPP "\nPPP-Adapter: %ls\n\n" + IDS_LOOP "\nLoopback-Adapter: %ls\n\n" + IDS_SLIP "\nSLIP-Adapter: %ls\n\n" + IDS_WIFI "\nDrahtlos-LAN-Adapter: %ls\n\n" END STRINGTABLE @@ -87,6 +87,10 @@ BEGIN IDS_DNSNONAME "\tName existiert nicht.\n\n" IDS_DNSFLUSHERROR "Der DNS-Auflösungscache konnte nicht geleert werden: " IDS_DNSFLUSHSUCCESS "Der DNS-Auflösungscache wurde geleert.\n" + IDS_DHCPNOTCONNECTED "Es kann kein Vorgang auf %ls ausgeführt werden, solange dessen Medium nicht verbunden ist.\n" + IDS_DHCPNOTENABLED "Der Adapter %ls ist nicht für DHCP aktiviert.\n" + IDS_DHCPNOADAPTER "Der Vorgang ist fehlgeschlagen, weil kein Adapter sich in einem für diesen\nVorgang zulässigen Zustand befindet.\n" + IDS_DHCPRELEASED "Die IP-Adresse für den Adapter %ls wurde bereits freigegeben.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/el-GR.rc b/base/applications/network/ipconfig/lang/el-GR.rc index 2278736e48d..77d3ab06a5d 100644 --- a/base/applications/network/ipconfig/lang/el-GR.rc +++ b/base/applications/network/ipconfig/lang/el-GR.rc @@ -44,15 +44,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nΆλλος τύπος προσαρμογέα: %ls\n" - IDS_ETH "\nΠροσαρμογέας Ethernet: %ls\n" - IDS_TOKEN "\nΠροσαρμογέας Token Ring: %ls\n" - IDS_FDDI "\nΠροσαρμογέας FDDI: %ls\n" - IDS_PPP "\nΠροσαρμογέας PPP: %ls\n" - IDS_LOOP "\nΠροσαρμογέας Loopback: %ls\n" - IDS_SLIP "\nΠροσαρμογέας SLIP: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nΆλλος τύπος προσαρμογέα: %ls\n\n" + IDS_ETH "\nΠροσαρμογέας Ethernet: %ls\n\n" + IDS_TOKEN "\nΠροσαρμογέας Token Ring: %ls\n\n" + IDS_FDDI "\nΠροσαρμογέας FDDI: %ls\n\n" + IDS_PPP "\nΠροσαρμογέας PPP: %ls\n\n" + IDS_LOOP "\nΠροσαρμογέας Loopback: %ls\n\n" + IDS_SLIP "\nΠροσαρμογέας SLIP: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -85,6 +85,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/en-US.rc b/base/applications/network/ipconfig/lang/en-US.rc index 454e0ff118c..d7d5b2ee05e 100644 --- a/base/applications/network/ipconfig/lang/en-US.rc +++ b/base/applications/network/ipconfig/lang/en-US.rc @@ -44,15 +44,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nOther Type Of Adapter: %ls\n" - IDS_ETH "\nEthernet Adapter: %ls\n" - IDS_TOKEN "\nToken Ring Adapter: %ls\n" - IDS_FDDI "\nFDDI Adapter: %ls\n" - IDS_PPP "\nPPP Adapter: %ls\n" - IDS_LOOP "\nLoopback Adapter: %ls\n" - IDS_SLIP "\nSLIP Adapter: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nOther Type Of Adapter: %ls\n\n" + IDS_ETH "\nEthernet Adapter: %ls\n\n" + IDS_TOKEN "\nToken Ring Adapter: %ls\n\n" + IDS_FDDI "\nFDDI Adapter: %ls\n\n" + IDS_PPP "\nPPP Adapter: %ls\n\n" + IDS_LOOP "\nLoopback Adapter: %ls\n\n" + IDS_SLIP "\nSLIP Adapter: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -85,6 +85,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/es-ES.rc b/base/applications/network/ipconfig/lang/es-ES.rc index a1ee73c5a51..6049a922906 100644 --- a/base/applications/network/ipconfig/lang/es-ES.rc +++ b/base/applications/network/ipconfig/lang/es-ES.rc @@ -45,15 +45,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nOtro tipo de adaptador: %ls\n" - IDS_ETH "\nAdaptador Ethernet: %ls\n" - IDS_TOKEN "\nAdaptador de red en anillo: %ls\n" - IDS_FDDI "\nAdaptador FDDI: %ls\n" - IDS_PPP "\nAdaptador PPP: %ls\n" - IDS_LOOP "\nAdaptador de bucle invertido: %ls\n" - IDS_SLIP "\nAdaptador SLIP: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nOtro tipo de adaptador: %ls\n\n" + IDS_ETH "\nAdaptador Ethernet: %ls\n\n" + IDS_TOKEN "\nAdaptador de red en anillo: %ls\n\n" + IDS_FDDI "\nAdaptador FDDI: %ls\n\n" + IDS_PPP "\nAdaptador PPP: %ls\n\n" + IDS_LOOP "\nAdaptador de bucle invertido: %ls\n\n" + IDS_SLIP "\nAdaptador SLIP: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -86,6 +86,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/fr-FR.rc b/base/applications/network/ipconfig/lang/fr-FR.rc index fdc4dbc2969..d0f212dcdb1 100644 --- a/base/applications/network/ipconfig/lang/fr-FR.rc +++ b/base/applications/network/ipconfig/lang/fr-FR.rc @@ -46,15 +46,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nAutre Type d'adapteur: %ls\n" - IDS_ETH "\nAdapteur Ethernet: %ls\n" - IDS_TOKEN "\nAdapteur Token Ring: %ls\n" - IDS_FDDI "\nAdapteur FDDI: %ls\n" - IDS_PPP "\nAdapteur PPP: %ls\n" - IDS_LOOP "\nAdapteur Loopback: %ls\n" - IDS_SLIP "\nAdapteur SLIP: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nAutre Type d'adapteur: %ls\n\n" + IDS_ETH "\nAdapteur Ethernet: %ls\n\n" + IDS_TOKEN "\nAdapteur Token Ring: %ls\n\n" + IDS_FDDI "\nAdapteur FDDI: %ls\n\n" + IDS_PPP "\nAdapteur PPP: %ls\n\n" + IDS_LOOP "\nAdapteur Loopback: %ls\n\n" + IDS_SLIP "\nAdapteur SLIP: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -87,6 +87,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/id-ID.rc b/base/applications/network/ipconfig/lang/id-ID.rc index 728c47ade57..f1230c23632 100644 --- a/base/applications/network/ipconfig/lang/id-ID.rc +++ b/base/applications/network/ipconfig/lang/id-ID.rc @@ -44,15 +44,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nAdapter Tipe Lainnya: %ls\n" - IDS_ETH "\nAdapter Ethernet: %ls\n" - IDS_TOKEN "\nAdapter Token Ring: %ls\n" - IDS_FDDI "\nAdapter FDDI: %ls\n" - IDS_PPP "\nAdapter PPP: %ls\n" - IDS_LOOP "\nAdapter Loopback: %ls\n" - IDS_SLIP "\nAdapter SLIP: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nAdapter Tipe Lainnya: %ls\n\n" + IDS_ETH "\nAdapter Ethernet: %ls\n\n" + IDS_TOKEN "\nAdapter Token Ring: %ls\n\n" + IDS_FDDI "\nAdapter FDDI: %ls\n\n" + IDS_PPP "\nAdapter PPP: %ls\n\n" + IDS_LOOP "\nAdapter Loopback: %ls\n\n" + IDS_SLIP "\nAdapter SLIP: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -85,6 +85,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/it-IT.rc b/base/applications/network/ipconfig/lang/it-IT.rc index 0e4e9e1c0e9..c0dfa9e3913 100644 --- a/base/applications/network/ipconfig/lang/it-IT.rc +++ b/base/applications/network/ipconfig/lang/it-IT.rc @@ -44,15 +44,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nAltro tipo di adattatore: %ls\n" - IDS_ETH "\nAdattatore Ethernet: %ls\n" - IDS_TOKEN "\nAdattatore Token Ring: %ls\n" - IDS_FDDI "\nAdattatore FDDI: %ls\n" - IDS_PPP "\nAdattatore PPP: %ls\n" - IDS_LOOP "\nAdattatore Loopback: %ls\n" - IDS_SLIP "\nAdattatore SLIP: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nAltro tipo di adattatore: %ls\n\n" + IDS_ETH "\nAdattatore Ethernet: %ls\n\n" + IDS_TOKEN "\nAdattatore Token Ring: %ls\n\n" + IDS_FDDI "\nAdattatore FDDI: %ls\n\n" + IDS_PPP "\nAdattatore PPP: %ls\n\n" + IDS_LOOP "\nAdattatore Loopback: %ls\n\n" + IDS_SLIP "\nAdattatore SLIP: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -85,6 +85,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/no-NO.rc b/base/applications/network/ipconfig/lang/no-NO.rc index c117bc3407b..e710a25f57f 100644 --- a/base/applications/network/ipconfig/lang/no-NO.rc +++ b/base/applications/network/ipconfig/lang/no-NO.rc @@ -44,15 +44,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nOther Type Of Adapter: %ls\n" - IDS_ETH "\nEthernet Adapter: %ls\n" - IDS_TOKEN "\nToken Ring Adapter: %ls\n" - IDS_FDDI "\nFDDI Adapter: %ls\n" - IDS_PPP "\nPPP Adapter: %ls\n" - IDS_LOOP "\nLoopback Adapter: %ls\n" - IDS_SLIP "\nSLIP Adapter: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nOther Type Of Adapter: %ls\n\n" + IDS_ETH "\nEthernet Adapter: %ls\n\n" + IDS_TOKEN "\nToken Ring Adapter: %ls\n\n" + IDS_FDDI "\nFDDI Adapter: %ls\n\n" + IDS_PPP "\nPPP Adapter: %ls\n\n" + IDS_LOOP "\nLoopback Adapter: %ls\n\n" + IDS_SLIP "\nSLIP Adapter: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -85,6 +85,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/pl-PL.rc b/base/applications/network/ipconfig/lang/pl-PL.rc index 920683fa194..5860ea06fa8 100644 --- a/base/applications/network/ipconfig/lang/pl-PL.rc +++ b/base/applications/network/ipconfig/lang/pl-PL.rc @@ -47,15 +47,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nNieznana karta: %ls\n" - IDS_OTHER "\nInna karta: %ls\n" - IDS_ETH "\nKarta Ethernet: %ls\n" - IDS_TOKEN "\nKarta Token Ring: %ls\n" - IDS_FDDI "\nKarta FDDI: %ls\n" - IDS_PPP "\nKarta PPP: %ls\n" - IDS_LOOP "\nKarta sprzężenia zwrotnego: %ls\n" - IDS_SLIP "\nKarta SLIP: %ls\n" - IDS_WIFI "\nKarta bezprzewodowej sieci LAN: %ls\n" + IDS_UNKNOWNADAPTER "\nNieznana karta: %ls\n\n" + IDS_OTHER "\nInna karta: %ls\n\n" + IDS_ETH "\nKarta Ethernet: %ls\n\n" + IDS_TOKEN "\nKarta Token Ring: %ls\n\n" + IDS_FDDI "\nKarta FDDI: %ls\n\n" + IDS_PPP "\nKarta PPP: %ls\n\n" + IDS_LOOP "\nKarta sprzężenia zwrotnego: %ls\n\n" + IDS_SLIP "\nKarta SLIP: %ls\n\n" + IDS_WIFI "\nKarta bezprzewodowej sieci LAN: %ls\n\n" END STRINGTABLE @@ -64,6 +64,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/ro-RO.rc b/base/applications/network/ipconfig/lang/ro-RO.rc index 75f99443de1..bc24294c3d3 100644 --- a/base/applications/network/ipconfig/lang/ro-RO.rc +++ b/base/applications/network/ipconfig/lang/ro-RO.rc @@ -45,15 +45,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nAdaptor necunoscut: %ls\n" - IDS_OTHER "\nAlt tip de adaptor: %ls\n" - IDS_ETH "\nAdaptor Ethernet: %ls\n" - IDS_TOKEN "\nAdaptor Token Ring: %ls\n" - IDS_FDDI "\nAdaptor FDDI: %ls\n" - IDS_PPP "\nAdaptor PPP: %ls\n" - IDS_LOOP "\nAdaptor Loopback: %ls\n" - IDS_SLIP "\nAdaptor SLIP: %ls\n" - IDS_WIFI "\nAdaptor de rețea fără fir: %ls\n" + IDS_UNKNOWNADAPTER "\nAdaptor necunoscut: %ls\n\n" + IDS_OTHER "\nAlt tip de adaptor: %ls\n\n" + IDS_ETH "\nAdaptor Ethernet: %ls\n\n" + IDS_TOKEN "\nAdaptor Token Ring: %ls\n\n" + IDS_FDDI "\nAdaptor FDDI: %ls\n\n" + IDS_PPP "\nAdaptor PPP: %ls\n\n" + IDS_LOOP "\nAdaptor Loopback: %ls\n\n" + IDS_SLIP "\nAdaptor SLIP: %ls\n\n" + IDS_WIFI "\nAdaptor de rețea fără fir: %ls\n\n" END STRINGTABLE @@ -86,6 +86,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/ru-RU.rc b/base/applications/network/ipconfig/lang/ru-RU.rc index 893c982a400..340b40921d6 100644 --- a/base/applications/network/ipconfig/lang/ru-RU.rc +++ b/base/applications/network/ipconfig/lang/ru-RU.rc @@ -45,15 +45,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nНеизвестный адаптер: %ls\n" - IDS_OTHER "\nДругой тип адаптера: %ls\n" - IDS_ETH "\nEthernet адаптер: %ls\n" - IDS_TOKEN "\nАдаптер Token Ring: %ls\n" - IDS_FDDI "\nАдаптер FDDI: %ls\n" - IDS_PPP "\nАдаптер PPP: %ls\n" - IDS_LOOP "\nАдаптер замыкания на себя: %ls\n" - IDS_SLIP "\nАдаптер SLIP: %ls\n" - IDS_WIFI "\nАдаптер беспроводной сети: %ls\n" + IDS_UNKNOWNADAPTER "\nНеизвестный адаптер: %ls\n\n" + IDS_OTHER "\nДругой тип адаптера: %ls\n\n" + IDS_ETH "\nEthernet адаптер: %ls\n\n" + IDS_TOKEN "\nАдаптер Token Ring: %ls\n\n" + IDS_FDDI "\nАдаптер FDDI: %ls\n\n" + IDS_PPP "\nАдаптер PPP: %ls\n\n" + IDS_LOOP "\nАдаптер замыкания на себя: %ls\n\n" + IDS_SLIP "\nАдаптер SLIP: %ls\n\n" + IDS_WIFI "\nАдаптер беспроводной сети: %ls\n\n" END STRINGTABLE @@ -86,6 +86,10 @@ BEGIN IDS_DNSNONAME "\tИмя не существует.\n\n" IDS_DNSFLUSHERROR "Не удается очистить кэш распознавателя DNS: " IDS_DNSFLUSHSUCCESS "Успешно сброшен кэш распознавателя DNS.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/sk-SK.rc b/base/applications/network/ipconfig/lang/sk-SK.rc index 3c50220c492..71bd81648c6 100644 --- a/base/applications/network/ipconfig/lang/sk-SK.rc +++ b/base/applications/network/ipconfig/lang/sk-SK.rc @@ -44,15 +44,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nIný adaptér: %ls\n" - IDS_ETH "\nAdaptér siete Ethernet: %ls\n" - IDS_TOKEN "\nAdaptér siete Token Ring: %ls\n" - IDS_FDDI "\nAdaptér FDDI: %ls\n" - IDS_PPP "\nAdaptér PPP: %ls\n" - IDS_LOOP "\nAdaptér pre spätnú slučku: %ls\n" - IDS_SLIP "\nAdaptér SLIP: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nIný adaptér: %ls\n\n" + IDS_ETH "\nAdaptér siete Ethernet: %ls\n\n" + IDS_TOKEN "\nAdaptér siete Token Ring: %ls\n\n" + IDS_FDDI "\nAdaptér FDDI: %ls\n\n" + IDS_PPP "\nAdaptér PPP: %ls\n\n" + IDS_LOOP "\nAdaptér pre spätnú slučku: %ls\n\n" + IDS_SLIP "\nAdaptér SLIP: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -85,6 +85,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/sq-AL.rc b/base/applications/network/ipconfig/lang/sq-AL.rc index 9c2f193c1d0..8dc5e361839 100644 --- a/base/applications/network/ipconfig/lang/sq-AL.rc +++ b/base/applications/network/ipconfig/lang/sq-AL.rc @@ -44,15 +44,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nTipe te tjera adaptuesi: %ls\n" - IDS_ETH "\nAdapter Ethernet: %ls\n" - IDS_TOKEN "\nAdapter Token Ring: %ls\n" - IDS_FDDI "\nAdapter FDDI: %ls\n" - IDS_PPP "\nAdapter PPP: %ls\n" - IDS_LOOP "\nAdapter Loopback: %ls\n" - IDS_SLIP "\nAdapter SLIP: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nTipe te tjera adaptuesi: %ls\n\n" + IDS_ETH "\nAdapter Ethernet: %ls\n\n" + IDS_TOKEN "\nAdapter Token Ring: %ls\n\n" + IDS_FDDI "\nAdapter FDDI: %ls\n\n" + IDS_PPP "\nAdapter PPP: %ls\n\n" + IDS_LOOP "\nAdapter Loopback: %ls\n\n" + IDS_SLIP "\nAdapter SLIP: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -85,6 +85,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/sv-SE.rc b/base/applications/network/ipconfig/lang/sv-SE.rc index 379b5b7e01e..24eea34eb75 100644 --- a/base/applications/network/ipconfig/lang/sv-SE.rc +++ b/base/applications/network/ipconfig/lang/sv-SE.rc @@ -45,15 +45,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nAnnan typ av adapter: %ls\n" - IDS_ETH "\nEthernet-adapter: %ls\n" - IDS_TOKEN "\nTokenring-adapter: %ls\n" - IDS_FDDI "\nFDDI-adapter: %ls\n" - IDS_PPP "\nPPP-adapter: %ls\n" - IDS_LOOP "\nLoopback-adapter: %ls\n" - IDS_SLIP "\nSLIP-adapter: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nAnnan typ av adapter: %ls\n\n" + IDS_ETH "\nEthernet-adapter: %ls\n\n" + IDS_TOKEN "\nTokenring-adapter: %ls\n\n" + IDS_FDDI "\nFDDI-adapter: %ls\n\n" + IDS_PPP "\nPPP-adapter: %ls\n\n" + IDS_LOOP "\nLoopback-adapter: %ls\n\n" + IDS_SLIP "\nSLIP-adapter: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -86,6 +86,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/tr-TR.rc b/base/applications/network/ipconfig/lang/tr-TR.rc index bddb634ab9e..dfc2a5fec83 100644 --- a/base/applications/network/ipconfig/lang/tr-TR.rc +++ b/base/applications/network/ipconfig/lang/tr-TR.rc @@ -45,15 +45,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nDiğer Bağdaştırıcı: %ls\n" - IDS_ETH "\nEthernet Bağdaştırıcısı: %ls\n" - IDS_TOKEN "\nSimgeli Halka Bağdaştırıcısı: %ls\n" - IDS_FDDI "\nFDDI Bağdaştırıcısı: %ls\n" - IDS_PPP "\nPPP Bağdaştırıcısı: %ls\n" - IDS_LOOP "\nGeri Döngü Bağdaştırıcısı: %ls\n" - IDS_SLIP "\nSLIP Bağdaştırıcısı: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nDiğer Bağdaştırıcı: %ls\n\n" + IDS_ETH "\nEthernet Bağdaştırıcısı: %ls\n\n" + IDS_TOKEN "\nSimgeli Halka Bağdaştırıcısı: %ls\n\n" + IDS_FDDI "\nFDDI Bağdaştırıcısı: %ls\n\n" + IDS_PPP "\nPPP Bağdaştırıcısı: %ls\n\n" + IDS_LOOP "\nGeri Döngü Bağdaştırıcısı: %ls\n\n" + IDS_SLIP "\nSLIP Bağdaştırıcısı: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -86,6 +86,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/uk-UA.rc b/base/applications/network/ipconfig/lang/uk-UA.rc index d75d697cef3..63b33b1fe34 100644 --- a/base/applications/network/ipconfig/lang/uk-UA.rc +++ b/base/applications/network/ipconfig/lang/uk-UA.rc @@ -45,15 +45,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\nІнший тип адаптера: %ls\n" - IDS_ETH "\nEthernet адаптер: %ls\n" - IDS_TOKEN "\nToken Ring адаптер: %ls\n" - IDS_FDDI "\nFDDI адаптер: %ls\n" - IDS_PPP "\nPPP адаптер: %ls\n" - IDS_LOOP "\nLoopback адаптер: %ls\n" - IDS_SLIP "\nSLIP адаптер: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\nІнший тип адаптера: %ls\n\n" + IDS_ETH "\nEthernet адаптер: %ls\n\n" + IDS_TOKEN "\nToken Ring адаптер: %ls\n\n" + IDS_FDDI "\nFDDI адаптер: %ls\n\n" + IDS_PPP "\nPPP адаптер: %ls\n\n" + IDS_LOOP "\nLoopback адаптер: %ls\n\n" + IDS_SLIP "\nSLIP адаптер: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -86,6 +86,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/zh-CN.rc b/base/applications/network/ipconfig/lang/zh-CN.rc index a976f0e6af3..588851408bc 100644 --- a/base/applications/network/ipconfig/lang/zh-CN.rc +++ b/base/applications/network/ipconfig/lang/zh-CN.rc @@ -45,15 +45,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\n其他类型的适配器: %ls\n" - IDS_ETH "\n以太网适配器: %ls\n" - IDS_TOKEN "\n令牌环适配器: %ls\n" - IDS_FDDI "\nFDDI 适配器: %ls\n" - IDS_PPP "\nPPP 适配器: %ls\n" - IDS_LOOP "\n本地环回适配器: %ls\n" - IDS_SLIP "\nSLIP 适配器: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\n其他类型的适配器: %ls\n\n" + IDS_ETH "\n以太网适配器: %ls\n\n" + IDS_TOKEN "\n令牌环适配器: %ls\n\n" + IDS_FDDI "\nFDDI 适配器: %ls\n\n" + IDS_PPP "\nPPP 适配器: %ls\n\n" + IDS_LOOP "\n本地环回适配器: %ls\n\n" + IDS_SLIP "\nSLIP 适配器: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -86,6 +86,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/zh-TW.rc b/base/applications/network/ipconfig/lang/zh-TW.rc index 53825808d57..17272ed578f 100644 --- a/base/applications/network/ipconfig/lang/zh-TW.rc +++ b/base/applications/network/ipconfig/lang/zh-TW.rc @@ -45,15 +45,15 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n" - IDS_OTHER "\n其他類型的配接器: %ls\n" - IDS_ETH "\n乙太網配接器: %ls\n" - IDS_TOKEN "\n權杖環配接器: %ls\n" - IDS_FDDI "\nFDDI 配接器: %ls\n" - IDS_PPP "\nPPP 配接器: %ls\n" - IDS_LOOP "\n本地環回配接器: %ls\n" - IDS_SLIP "\nSLIP 配接器: %ls\n" - IDS_WIFI "\nWireless Network Adapter: %ls\n" + IDS_UNKNOWNADAPTER "\nUnknown Adapter: %ls\n\n" + IDS_OTHER "\n其他類型的配接器: %ls\n\n" + IDS_ETH "\n乙太網配接器: %ls\n\n" + IDS_TOKEN "\n權杖環配接器: %ls\n\n" + IDS_FDDI "\nFDDI 配接器: %ls\n\n" + IDS_PPP "\nPPP 配接器: %ls\n\n" + IDS_LOOP "\n本地環回配接器: %ls\n\n" + IDS_SLIP "\nSLIP 配接器: %ls\n\n" + IDS_WIFI "\nWireless Network Adapter: %ls\n\n" END STRINGTABLE @@ -86,6 +86,10 @@ BEGIN IDS_DNSNONAME "\tName does not exist.\n\n" IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" + IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" + IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" + IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" + IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" END STRINGTABLE diff --git a/base/applications/network/ipconfig/resource.h b/base/applications/network/ipconfig/resource.h index 5b356fa5f3c..0395027b423 100644 --- a/base/applications/network/ipconfig/resource.h +++ b/base/applications/network/ipconfig/resource.h @@ -71,3 +71,7 @@ #define IDS_DNSNONAME 201 #define IDS_DNSFLUSHERROR 202 #define IDS_DNSFLUSHSUCCESS 203 +#define IDS_DHCPNOTCONNECTED 204 +#define IDS_DHCPNOTENABLED 205 +#define IDS_DHCPNOADAPTER 206 +#define IDS_DHCPRELEASED 207

1 year, 5 months

[reactos] 01/01: [NTGDI][GDI32] Icon fixes for Office 2000, VB6, and Hoyle Cards (#5227)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12e1919e5efc1ffc47c67… commit 12e1919e5efc1ffc47c673ff1b660a4fed5975ad Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Jul 2 06:24:15 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jul 2 13:24:15 2023 +0200 [NTGDI][GDI32] Icon fixes for Office 2000, VB6, and Hoyle Cards (#5227) Many thanks for Simone Lombardo for pointing to the code needing attention and providing a working proof-of-concept solution. CORE-12377 CORE-18084 CORE-13889 --- win32ss/gdi/gdi32/objects/bitmap.c | 260 ++++++++++++++++++++++++++++++++++++- win32ss/gdi/ntgdi/dibobj.c | 26 +++- 2 files changed, 282 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/bitmap.c b/win32ss/gdi/gdi32/objects/bitmap.c index b029d4ad2df..5fbcf50568a 100644 --- a/win32ss/gdi/gdi32/objects/bitmap.c +++ b/win32ss/gdi/gdi32/objects/bitmap.c @@ -5,6 +5,52 @@ #define NDEBUG #include <debug.h> +/* Copied from win32ss/gdi/eng/surface.c */ +ULONG +FASTCALL +BitmapFormat(ULONG cBits, ULONG iCompression) +{ + switch (iCompression) + { + case BI_RGB: + /* Fall through */ + case BI_BITFIELDS: + if (cBits <= 1) return BMF_1BPP; + if (cBits <= 4) return BMF_4BPP; + if (cBits <= 8) return BMF_8BPP; + if (cBits <= 16) return BMF_16BPP; + if (cBits <= 24) return BMF_24BPP; + if (cBits <= 32) return BMF_32BPP; + return 0; + + case BI_RLE4: + return BMF_4RLE; + + case BI_RLE8: + return BMF_8RLE; + + default: + return 0; + } +} + +/* Copied from win32ss/gdi/eng/surface.c */ +UCHAR +gajBitsPerFormat[11] = +{ + 0, /* 0: unused */ + 1, /* 1: BMF_1BPP */ + 4, /* 2: BMF_4BPP */ + 8, /* 3: BMF_8BPP */ + 16, /* 4: BMF_16BPP */ + 24, /* 5: BMF_24BPP */ + 32, /* 6: BMF_32BPP */ + 4, /* 7: BMF_4RLE */ + 8, /* 8: BMF_8RLE */ + 0, /* 9: BMF_JPEG */ + 0, /* 10: BMF_PNG */ +}; + // From Yuan, ScanLineSize = (Width * bitcount + 31)/32 #define WIDTH_BYTES_ALIGN32(cx, bpp) ((((cx) * (bpp) + 31) & ~31) >> 3) @@ -577,6 +623,9 @@ SetDIBits( INT LinesCopied = 0; BOOL newDC = FALSE; + if (fuColorUse != DIB_RGB_COLORS && fuColorUse != DIB_PAL_COLORS) + return 0; + if (!lpvBits || (GDI_HANDLE_GET_TYPE(hBitmap) != GDI_OBJECT_TYPE_BITMAP)) return 0; @@ -590,6 +639,16 @@ SetDIBits( } } + if (lpbmi->bmiHeader.biCompression == BI_BITFIELDS) + { + DWORD *masks = (DWORD *)lpbmi->bmiColors; + if (!masks[0] || !masks[1] || !masks[2]) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + } + hDCc = NtGdiGetDCforBitmap(hBitmap); // hDC can be NULL, so, get it from the bitmap. SavehDC = hDCc; if (!hDCc) // No DC associated with bitmap, Clone or Create one. @@ -666,10 +725,31 @@ SetDIBitsToDevice( UINT cjBmpScanSize = 0; BOOL Hit = FALSE; PVOID pvSafeBits = (PVOID) Bits; + UINT bmiHeight; + BOOL top_down; + INT src_y = 0; + ULONG iFormat, cBitsPixel, cjBits, cjWidth; + + #define MaxScanLines 1000 + #define MaxHeight 2000 + #define MaxSourceHeight 2000 + #define IS_ALIGNED(Pointer, Alignment) \ + (((ULONG_PTR)(void *)(Pointer)) % (Alignment) == 0) if (!ScanLines || !lpbmi || !Bits) return 0; + DPRINT("ScanLines %d Height %d Width %d biHeight %d biWidth %d\n" + " lpbmi '%p' ColorUse '%d' SizeImage '%d' StartScan %d\n" + " biCompression '%d' biBitCount '%d'\n", + ScanLines, Height, Width, lpbmi->bmiHeader.biHeight, + lpbmi->bmiHeader.biWidth, lpbmi, ColorUse, + lpbmi->bmiHeader.biSizeImage, StartScan, + lpbmi->bmiHeader.biCompression, lpbmi->bmiHeader.biBitCount); + + if (lpbmi->bmiHeader.biWidth < 0) + return 0; + if (ColorUse && ColorUse != DIB_PAL_COLORS && ColorUse != DIB_PAL_COLORS + 1) return 0; @@ -677,6 +757,91 @@ SetDIBitsToDevice( if (!pConvertedInfo) return 0; + if (ScanLines > MaxScanLines) + { + LinesCopied = 0; + goto Exit; + } + + bmiHeight = abs(pConvertedInfo->bmiHeader.biHeight); + top_down = (pConvertedInfo->bmiHeader.biHeight < 0); + if ((StartScan > bmiHeight) && (ScanLines > bmiHeight)) + { + DPRINT("Returning ScanLines of '%d'\n", ScanLines); + LinesCopied = ScanLines; + goto Exit; + } + + if (pConvertedInfo->bmiHeader.biHeight == 0) + { + LinesCopied = 0; + goto Exit; + } + + if (!IS_ALIGNED(Bits, 2) && (ScanLines > Height)) + { + LinesCopied = 0; + goto Exit; + } + + /* Below code modeled after Wine's nulldrv_SetDIBitsToDevice */ + if (StartScan <= YSrc + bmiHeight) + { + if ((pConvertedInfo->bmiHeader.biCompression == BI_RLE8) || + (pConvertedInfo->bmiHeader.biCompression == BI_RLE4)) + { + StartScan = 0; + ScanLines = bmiHeight; + } + else + { + if (StartScan >= bmiHeight) + { + LinesCopied = 0; + goto Exit; + } + if (!top_down && ScanLines > bmiHeight - StartScan) + { + ScanLines = bmiHeight - StartScan; + } + src_y = StartScan + ScanLines - (YSrc + Height); + if (!top_down) + { + /* get rid of unnecessary lines */ + if ((src_y < 0 || src_y >= (INT)ScanLines) && + pConvertedInfo->bmiHeader.biCompression != BI_BITFIELDS) + { + LinesCopied = ScanLines; + goto Exit; + } + if (YDest >= 0) + { + LinesCopied = ScanLines + StartScan; + ScanLines -= src_y; + } + else + { + LinesCopied = ScanLines - src_y; + } + } + else if (src_y < 0 || src_y >= (INT)ScanLines) + { + if (lpbmi->bmiHeader.biHeight < 0 && + StartScan > MaxScanLines) + { + ScanLines = lpbmi->bmiHeader.biHeight - StartScan; + } + DPRINT("Returning ScanLines of '%d'\n", ScanLines); + LinesCopied = ScanLines; + goto Exit; + } + else + { + LinesCopied = ScanLines; + } + } + } + HANDLE_METADC(INT, SetDIBitsToDevice, 0, @@ -742,12 +907,19 @@ SetDIBitsToDevice( { Hit = TRUE; } - _SEH2_END + _SEH2_END; if (Hit) { // We don't die, we continue on with a allocated safe pointer to kernel // space..... + + if (!IS_ALIGNED(Bits, 2)) // If both Read Exception and mis-aligned + { + LinesCopied = 0; + goto Exit; + } + DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %p or Bits: %p & Size: %u\n", pConvertedInfo, Bits, cjBmpScanSize); } @@ -761,6 +933,53 @@ SetDIBitsToDevice( LinesCopied = 0; goto Exit; } + + /* Calculation of ScanLines for NtGdiSetDIBitsToDeviceInternal */ + if (YDest >= 0) + { + ScanLines = min(abs(Height), ScanLines); + if (YSrc > 0) + ScanLines += YSrc; + } + else + { + ScanLines = min(ScanLines, + abs(pConvertedInfo->bmiHeader.biHeight) - StartScan); + } + + if (YDest >= 0 && YSrc > 0 && bmiHeight <= MaxHeight) + { + ScanLines += YSrc; + } + + /* Find Format from lpbmi which is now pConvertedInfo */ + iFormat = BitmapFormat(pConvertedInfo->bmiHeader.biBitCount, + pConvertedInfo->bmiHeader.biCompression); + + /* Get bits per pixel from the format */ + cBitsPixel = gajBitsPerFormat[iFormat]; + + cjWidth = WIDTH_BYTES_ALIGN32(pConvertedInfo->bmiHeader.biWidth, cBitsPixel); + + /* Calculate the correct bitmap size in bytes */ + if (!NT_SUCCESS(RtlULongMult(cjWidth, max(ScanLines, LinesCopied), &cjBits))) + { + DPRINT1("Overflow calculating size: cjWidth %lu, ScanLines %lu\n", + cjWidth, max(ScanLines, LinesCopied)); + goto Exit; + } + + /* Make sure the buffer is large enough */ + if (pConvertedInfo->bmiHeader.biSizeImage < cjBits) + { + DPRINT("Buffer is too small, required: %lu, got %lu\n", + cjBits, pConvertedInfo->bmiHeader.biSizeImage); + if (pConvertedInfo->bmiHeader.biCompression == BI_RGB) + { + pConvertedInfo->bmiHeader.biSizeImage = cjBits; + } + } + /* if ( !pDc_Attr || // DC is Public ColorUse == DIB_PAL_COLORS || @@ -768,12 +987,47 @@ SetDIBitsToDevice( (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ { - LinesCopied = NtGdiSetDIBitsToDeviceInternal(hdc, XDest, YDest, Width, Height, XSrc, YSrc, - StartScan, ScanLines, (LPBYTE) pvSafeBits, (LPBITMAPINFO) pConvertedInfo, ColorUse, + LinesCopied = NtGdiSetDIBitsToDeviceInternal(hdc, XDest, YDest, + Width, Height, XSrc, YSrc, + StartScan, ScanLines, (LPBYTE) pvSafeBits, + (LPBITMAPINFO) pConvertedInfo, ColorUse, cjBmpScanSize, ConvertedInfoSize, TRUE, NULL); } + + if (bmiHeight > MaxScanLines) + { + LinesCopied = ScanLines; + } + + if (YDest < 0) + { + if (top_down) + LinesCopied = ScanLines; + else + LinesCopied = ScanLines - src_y; + } + + if (pConvertedInfo->bmiHeader.biCompression == BI_RLE8 || + pConvertedInfo->bmiHeader.biCompression == BI_RLE4) + { + LinesCopied = bmiHeight; + } + + if (pConvertedInfo->bmiHeader.biHeight < 0) + { + if (pConvertedInfo->bmiHeader.biHeight < -MaxSourceHeight || + (YDest >= 0 && src_y < -ScanLines)) + { + LinesCopied = ScanLines + src_y; + } + else + { + LinesCopied = ScanLines; + } + } + Exit: if (Bits != pvSafeBits) RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); diff --git a/win32ss/gdi/ntgdi/dibobj.c b/win32ss/gdi/ntgdi/dibobj.c index ec5fa69a469..456210d880a 100644 --- a/win32ss/gdi/ntgdi/dibobj.c +++ b/win32ss/gdi/ntgdi/dibobj.c @@ -518,7 +518,27 @@ NtGdiSetDIBitsToDeviceInternal( } _SEH2_END; - ScanLines = min(ScanLines, abs(bmi->bmiHeader.biHeight) - StartScan); + DPRINT("StartScan %d ScanLines %d Bits %p bmi %p ColorUse %d\n" + " Height %d Width %d SizeImage %d\n" + " biHeight %d biWidth %d biBitCount %d\n" + " XSrc %d YSrc %d xDext %d yDest %d\n", + StartScan, ScanLines, Bits, bmi, ColorUse, + Height, Width, bmi->bmiHeader.biSizeImage, + bmi->bmiHeader.biHeight, bmi->bmiHeader.biWidth, + bmi->bmiHeader.biBitCount, + XSrc, YSrc, XDest, YDest); + + if (YDest >= 0) + { + ScanLines = min(abs(Height), ScanLines); + if (YSrc > 0) + ScanLines += YSrc; + } + else + { + ScanLines = min(ScanLines, abs(bmi->bmiHeader.biHeight) - StartScan); + } + if (ScanLines == 0) { DPRINT1("ScanLines == 0\n"); @@ -562,6 +582,10 @@ NtGdiSetDIBitsToDeviceInternal( SourceSize.cx = bmi->bmiHeader.biWidth; SourceSize.cy = ScanLines; + if (YDest >= 0 && YSrc > 0) + { + ScanLines += YSrc; + } //DIBWidth = WIDTH_BYTES_ALIGN32(SourceSize.cx, bmi->bmiHeader.biBitCount);

1 year, 5 months

[reactos] 01/01: [WIN32K:NTUSER] Add ASSERT() on "linking window to itself" (#4749)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38560761cef087cfd68af… commit 38560761cef087cfd68af94f1e938f04a938dddf Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Jul 2 13:19:06 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jul 2 13:19:06 2023 +0200 [WIN32K:NTUSER] Add ASSERT() on "linking window to itself" (#4749) Addendum to ee0511b (0.4.10-dev-323). CORE-18132 --- win32ss/user/ntuser/window.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index b4ab2d6e69f..e587c73a58d 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -943,7 +943,8 @@ IntLinkWindow( { if (Wnd == WndInsertAfter) { - ERR("IntLinkWindow -- Trying to link window 0x%p to itself!!\n", Wnd); + ERR("Trying to link window 0x%p to itself\n", Wnd); + ASSERT(WndInsertAfter != Wnd); return; } @@ -1046,8 +1047,15 @@ VOID FASTCALL IntLinkHwnd(PWND Wnd, HWND hWndPrev) } if (Wnd == WndInsertAfter) - ERR("IntLinkHwnd -- Trying to link window 0x%p to itself!!\n", Wnd); - IntLinkWindow(Wnd, WndInsertAfter); + { + ERR("Trying to link window 0x%p to itself\n", Wnd); + ASSERT(WndInsertAfter != Wnd); + // FIXME: IntUnlinkWindow(Wnd) was already called. Continuing as is seems wrong! + } + else + { + IntLinkWindow(Wnd, WndInsertAfter); + } /* Fix the WS_EX_TOPMOST flag */ if (!(WndInsertAfter->ExStyle & WS_EX_TOPMOST))

1 year, 5 months

[reactos] 01/01: [INPUT] Improve Romanian (ro-RO) translation (#5386)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e4c6ae98328015d6f150… commit 5e4c6ae98328015d6f1507a6e28a063bd647f92e Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Jul 2 14:01:09 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jul 2 13:01:09 2023 +0200 [INPUT] Improve Romanian (ro-RO) translation (#5386) --- dll/cpl/input/lang/ro-RO.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/cpl/input/lang/ro-RO.rc b/dll/cpl/input/lang/ro-RO.rc index 37ba927525c..bec5068c3f5 100644 --- a/dll/cpl/input/lang/ro-RO.rc +++ b/dll/cpl/input/lang/ro-RO.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2022 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2022-2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -14,16 +14,16 @@ CAPTION "Configurare" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Default input &language", -1, 5, 5, 246, 55 - LTEXT "Select one of the installed input languages to use when your computer starts.", -1, 15, 15, 230, 23 + LTEXT "Selectați una din limbile de intrare pentru a o folosi atunci când vă pornește calculatorul.", -1, 15, 15, 230, 23 COMBOBOX IDC_DEFAULT_LANGUAGE, 15, 40, 230, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "&Installed services", -1, 5, 65, 246, 125 + GROUPBOX "&Servicii instalate", -1, 5, 65, 246, 125 LTEXT "Gestionați serviciile aferente limbilor de intrare utilizate în sistem. Utilizați butoanele pentru a aduce modificări listei.", -1, 15, 78, 230, 25 CONTROL "", IDC_KEYLAYOUT_LIST, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 15, 105, 155, 80 PUSHBUTTON "A&dăugare…", IDC_ADD_BUTTON, 175, 105, 70, 14 PUSHBUTTON "&Elimină", IDC_REMOVE_BUTTON, 175, 125, 70, 14 PUSHBUTTON "&Proprietăți…", IDC_PROP_BUTTON, 175, 145, 70, 14 GROUPBOX "Preferințe", -1, 5, 195, 245, 30 - PUSHBUTTON "Language &Bar...", IDC_LANGUAGE_BAR, 15, 205, 110, 14 + PUSHBUTTON "&Bara de limbă...", IDC_LANGUAGE_BAR, 15, 205, 110, 14 PUSHBUTTON "&Combinații de taste…", IDC_KEY_SET_BTN, 133, 205, 110, 14 END

1 year, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2023