Ros-diffs October 2018

ros-diffs@reactos.org

21 participants
354 discussions

03/07: [NTOSKRNL] Stub support for querying DOS name when parsing FO name
by Pierre Schweitzer 03 Oct '18

03 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abfddca8bb1c5334f4a8a… commit abfddca8bb1c5334f4a8a14305189565c5b21d2d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Oct 3 11:45:08 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Oct 3 11:45:08 2018 +0200 [NTOSKRNL] Stub support for querying DOS name when parsing FO name --- ntoskrnl/include/internal/io.h | 12 ++++++++++++ ntoskrnl/io/iomgr/file.c | 21 +++++++++++++++++++++ ntoskrnl/io/iomgr/iomgr.c | 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 95e3607bb5..9928cbaab4 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1217,11 +1217,23 @@ IopGetSetSecurityObject( IN OUT PGENERIC_MAPPING GenericMapping ); +NTSTATUS +NTAPI +IopQueryName( + IN PVOID ObjectBody, + IN BOOLEAN HasName, + OUT POBJECT_NAME_INFORMATION ObjectNameInfo, + IN ULONG Length, + OUT PULONG ReturnLength, + IN KPROCESSOR_MODE PreviousMode +); + NTSTATUS NTAPI IopQueryNameInternal( IN PVOID ObjectBody, IN BOOLEAN HasName, + IN BOOLEAN QueryDosName, OUT POBJECT_NAME_INFORMATION ObjectNameInfo, IN ULONG Length, OUT PULONG ReturnLength, diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index e877888c74..792376ca82 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -1867,10 +1867,29 @@ IopGetSetSecurityObject(IN PVOID ObjectBody, return Status; } +NTSTATUS +NTAPI +IopQueryName(IN PVOID ObjectBody, + IN BOOLEAN HasName, + OUT POBJECT_NAME_INFORMATION ObjectNameInfo, + IN ULONG Length, + OUT PULONG ReturnLength, + IN KPROCESSOR_MODE PreviousMode) +{ + return IopQueryNameInternal(ObjectBody, + HasName, + FALSE, + ObjectNameInfo, + Length, + ReturnLength, + PreviousMode); +} + NTSTATUS NTAPI IopQueryNameInternal(IN PVOID ObjectBody, IN BOOLEAN HasName, + IN BOOLEAN QueryDosName, OUT POBJECT_NAME_INFORMATION ObjectNameInfo, IN ULONG Length, OUT PULONG ReturnLength, @@ -1893,6 +1912,8 @@ IopQueryNameInternal(IN PVOID ObjectBody, return STATUS_INFO_LENGTH_MISMATCH; } + if (QueryDosName) return STATUS_NOT_IMPLEMENTED; + /* Allocate Buffer */ LocalInfo = ExAllocatePoolWithTag(PagedPool, Length, TAG_IO); if (!LocalInfo) return STATUS_INSUFFICIENT_RESOURCES; diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index fec80855ae..8d01f35079 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -317,7 +317,7 @@ IopCreateObjectTypes(VOID) ObjectTypeInitializer.CloseProcedure = IopCloseFile; ObjectTypeInitializer.DeleteProcedure = IopDeleteFile; ObjectTypeInitializer.SecurityProcedure = IopGetSetSecurityObject; - ObjectTypeInitializer.QueryNameProcedure = IopQueryNameInternal; + ObjectTypeInitializer.QueryNameProcedure = IopQueryName; ObjectTypeInitializer.ParseProcedure = IopParseFile; ObjectTypeInitializer.UseDefaultObject = FALSE; if (!NT_SUCCESS(ObCreateObjectType(&Name,

1 0

02/07: [NTOSKRNL] Use faster internal helper to query name
by Pierre Schweitzer 03 Oct '18

03 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1401a75772f489bb59c8… commit a1401a75772f489bb59c895b33e1f192ebde5fc8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Oct 3 10:21:39 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Oct 3 10:22:33 2018 +0200 [NTOSKRNL] Use faster internal helper to query name This only applies if we're called from kernel mode with a synchronous file. --- ntoskrnl/include/internal/io.h | 10 ++++++++++ ntoskrnl/io/iomgr/file.c | 22 +++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 29ecb808f9..95e3607bb5 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1276,6 +1276,16 @@ IoComputeDesiredAccessFileObject( IN PACCESS_MASK DesiredAccess ); +NTSTATUS +NTAPI +IopGetFileInformation( + IN PFILE_OBJECT FileObject, + IN ULONG Length, + IN FILE_INFORMATION_CLASS FileInfoClass, + OUT PVOID Buffer, + OUT PULONG ReturnedLength +); + // // I/O Timer Routines // diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 4cbdb640a1..e877888c74 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -1941,11 +1941,23 @@ IopQueryNameInternal(IN PVOID ObjectBody, FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); /* Query the File name */ - Status = IoQueryFileInformation(FileObject, - FileNameInformation, - LengthMismatch ? Length : FileLength, - LocalFileInfo, - &LocalReturnLength); + if (PreviousMode == KernelMode && + BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) + { + Status = IopGetFileInformation(FileObject, + LengthMismatch ? Length : FileLength, + FileNameInformation, + LocalFileInfo, + &LocalReturnLength); + } + else + { + Status = IoQueryFileInformation(FileObject, + FileNameInformation, + LengthMismatch ? Length : FileLength, + LocalFileInfo, + &LocalReturnLength); + } if (NT_ERROR(Status)) { /* Fail on errors only, allow warnings */

1 0

01/07: [NTOSKRNL] Rename IopQueryNameFile to IopQueryNameInternal
by Pierre Schweitzer 03 Oct '18

03 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1348f62f20075eb51eb4a… commit 1348f62f20075eb51eb4a1b4f50a67f82cccc087 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Oct 3 10:15:30 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Oct 3 10:22:33 2018 +0200 [NTOSKRNL] Rename IopQueryNameFile to IopQueryNameInternal --- ntoskrnl/include/internal/io.h | 2 +- ntoskrnl/io/iomgr/file.c | 12 ++++++------ ntoskrnl/io/iomgr/iomgr.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 97df17f2ea..29ecb808f9 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1219,7 +1219,7 @@ IopGetSetSecurityObject( NTSTATUS NTAPI -IopQueryNameFile( +IopQueryNameInternal( IN PVOID ObjectBody, IN BOOLEAN HasName, OUT POBJECT_NAME_INFORMATION ObjectNameInfo, diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 6133c9e45d..4cbdb640a1 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -1869,12 +1869,12 @@ IopGetSetSecurityObject(IN PVOID ObjectBody, NTSTATUS NTAPI -IopQueryNameFile(IN PVOID ObjectBody, - IN BOOLEAN HasName, - OUT POBJECT_NAME_INFORMATION ObjectNameInfo, - IN ULONG Length, - OUT PULONG ReturnLength, - IN KPROCESSOR_MODE PreviousMode) +IopQueryNameInternal(IN PVOID ObjectBody, + IN BOOLEAN HasName, + OUT POBJECT_NAME_INFORMATION ObjectNameInfo, + IN ULONG Length, + OUT PULONG ReturnLength, + IN KPROCESSOR_MODE PreviousMode) { POBJECT_NAME_INFORMATION LocalInfo; PFILE_NAME_INFORMATION LocalFileInfo; diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index 292c947036..fec80855ae 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -317,7 +317,7 @@ IopCreateObjectTypes(VOID) ObjectTypeInitializer.CloseProcedure = IopCloseFile; ObjectTypeInitializer.DeleteProcedure = IopDeleteFile; ObjectTypeInitializer.SecurityProcedure = IopGetSetSecurityObject; - ObjectTypeInitializer.QueryNameProcedure = IopQueryNameFile; + ObjectTypeInitializer.QueryNameProcedure = IopQueryNameInternal; ObjectTypeInitializer.ParseProcedure = IopParseFile; ObjectTypeInitializer.UseDefaultObject = FALSE; if (!NT_SUCCESS(ObCreateObjectType(&Name,

1 0

01/01: [FONT][WIN32SS] Include the style name in the registry key. Thanks to Doug Lyons for pinpointing the issue.
by Mark Jansen 02 Oct '18

02 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d44f79e3e6fb72b36f55… commit 3d44f79e3e6fb72b36f555b3fcb281790c13dcd6 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Oct 2 00:50:34 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Oct 2 22:40:50 2018 +0200 [FONT][WIN32SS] Include the style name in the registry key. Thanks to Doug Lyons for pinpointing the issue. CORE-14044 --- win32ss/gdi/ntgdi/font.h | 1 + win32ss/gdi/ntgdi/freetype.c | 58 ++++++++++++++++++++++++++++++++------------ 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/win32ss/gdi/ntgdi/font.h b/win32ss/gdi/ntgdi/font.h index 8d466bd2ec..a5e43330cc 100644 --- a/win32ss/gdi/ntgdi/font.h +++ b/win32ss/gdi/ntgdi/font.h @@ -6,6 +6,7 @@ typedef struct _FONT_ENTRY LIST_ENTRY ListEntry; FONTGDI *Font; UNICODE_STRING FaceName; + UNICODE_STRING StyleName; BYTE NotEnum; } FONT_ENTRY, *PFONT_ENTRY; diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 3d53dac22e..5377d6eb18 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -953,7 +953,7 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, FONTGDI * FontGDI; NTSTATUS Status; FT_Face Face; - ANSI_STRING AnsiFaceName; + ANSI_STRING AnsiString; FT_WinFNT_HeaderRec WinFNT; INT FaceCount = 0, CharSetCount = 0; PUNICODE_STRING pFileName = pLoadFont->pFileName; @@ -1075,8 +1075,24 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, FontGDI->OriginalWeight = WeightFromStyle(Face->style_name); FontGDI->RequestWeight = FW_NORMAL; - RtlInitAnsiString(&AnsiFaceName, Face->family_name); - Status = RtlAnsiStringToUnicodeString(&Entry->FaceName, &AnsiFaceName, TRUE); + RtlInitAnsiString(&AnsiString, Face->family_name); + Status = RtlAnsiStringToUnicodeString(&Entry->FaceName, &AnsiString, TRUE); + if (NT_SUCCESS(Status)) + { + if (Face->style_name[0] && strcmp(Face->style_name, "Regular")) + { + RtlInitAnsiString(&AnsiString, Face->style_name); + Status = RtlAnsiStringToUnicodeString(&Entry->StyleName, &AnsiString, TRUE); + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&Entry->FaceName); + } + } + else + { + RtlInitUnicodeString(&Entry->StyleName, NULL); + } + } if (!NT_SUCCESS(Status)) { if (PrivateEntry) @@ -1206,15 +1222,25 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, if (CharSetIndex == -1) { INT i; + USHORT NameLength = Entry->FaceName.Length; + + if (Entry->StyleName.Length) + NameLength += Entry->StyleName.Length + sizeof(WCHAR); if (pLoadFont->RegValueName.Length == 0) { - RtlCreateUnicodeString(pValueName, Entry->FaceName.Buffer); + pValueName->Length = 0; + pValueName->MaximumLength = NameLength + sizeof(WCHAR); + pValueName->Buffer = ExAllocatePoolWithTag(PagedPool, + pValueName->MaximumLength, + TAG_USTR); + pValueName->Buffer[0] = UNICODE_NULL; + RtlAppendUnicodeStringToString(pValueName, &Entry->FaceName); } else { UNICODE_STRING NewString; - USHORT Length = pValueName->Length + 3 * sizeof(WCHAR) + Entry->FaceName.Length; + USHORT Length = pValueName->Length + 3 * sizeof(WCHAR) + NameLength; NewString.Length = 0; NewString.MaximumLength = Length + sizeof(WCHAR); NewString.Buffer = ExAllocatePoolWithTag(PagedPool, @@ -1229,6 +1255,11 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, RtlFreeUnicodeString(pValueName); *pValueName = NewString; } + if (Entry->StyleName.Length) + { + RtlAppendUnicodeToString(pValueName, L" "); + RtlAppendUnicodeStringToString(pValueName, &Entry->StyleName); + } for (i = 1; i < CharSetCount; ++i) { @@ -5148,15 +5179,10 @@ IntGdiGetFontResourceInfo( case 1: /* copy the font title */ /* calculate the required size */ Size = 0; - Size += wcslen(FamInfo[0].EnumLogFontEx.elfLogFont.lfFaceName); - if (FamInfo[0].EnumLogFontEx.elfStyle[0] && - _wcsicmp(FamInfo[0].EnumLogFontEx.elfStyle, L"Regular") != 0) - { - Size += 1 + wcslen(FamInfo[0].EnumLogFontEx.elfStyle); - } - for (i = 1; i < Count; ++i) + for (i = 0; i < Count; ++i) { - Size += 3; /* " & " */ + if (i > 0) + Size += 3; /* " & " */ Size += wcslen(FamInfo[i].EnumLogFontEx.elfLogFont.lfFaceName); if (FamInfo[i].EnumLogFontEx.elfStyle[0] && _wcsicmp(FamInfo[i].EnumLogFontEx.elfStyle, L"Regular") != 0) @@ -5179,10 +5205,10 @@ IntGdiGetFontResourceInfo( /* store font title to buffer */ WCHAR *psz = pBuffer; *psz = 0; - IntAddNameFromFamInfo(psz, &FamInfo[0]); - for (i = 1; i < Count; ++i) + for (i = 0; i < Count; ++i) { - wcscat(psz, L" & "); + if (i > 0) + wcscat(psz, L" & "); IntAddNameFromFamInfo(psz, &FamInfo[i]); } psz[wcslen(psz) + 1] = UNICODE_NULL;

1 0

01/01: [NEWDEV] Fix a truncated text on device driver name
by Bișoc George 02 Oct '18

02 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=758f9fbdb93646d31d4e2… commit 758f9fbdb93646d31d4e27ed49fb4cc576d15672 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Tue Oct 2 17:44:00 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 2 21:54:30 2018 +0200 [NEWDEV] Fix a truncated text on device driver name --- dll/win32/newdev/lang/bg-BG.rc | 8 ++++---- dll/win32/newdev/lang/cs-CZ.rc | 8 ++++---- dll/win32/newdev/lang/de-DE.rc | 8 ++++---- dll/win32/newdev/lang/el-GR.rc | 8 ++++---- dll/win32/newdev/lang/en-US.rc | 8 ++++---- dll/win32/newdev/lang/es-ES.rc | 8 ++++---- dll/win32/newdev/lang/fr-FR.rc | 8 ++++---- dll/win32/newdev/lang/he-IL.rc | 8 ++++---- dll/win32/newdev/lang/hu-HU.rc | 8 ++++---- dll/win32/newdev/lang/id-ID.rc | 8 ++++---- dll/win32/newdev/lang/it-IT.rc | 8 ++++---- dll/win32/newdev/lang/ja-JP.rc | 8 ++++---- dll/win32/newdev/lang/nl-NL.rc | 8 ++++---- dll/win32/newdev/lang/no-NO.rc | 8 ++++---- dll/win32/newdev/lang/pl-PL.rc | 8 ++++---- dll/win32/newdev/lang/ro-RO.rc | 8 ++++---- dll/win32/newdev/lang/ru-RU.rc | 8 ++++---- dll/win32/newdev/lang/sk-SK.rc | 8 ++++---- dll/win32/newdev/lang/sq-AL.rc | 8 ++++---- dll/win32/newdev/lang/th-TH.rc | 8 ++++---- dll/win32/newdev/lang/tr-TR.rc | 8 ++++---- dll/win32/newdev/lang/uk-UA.rc | 8 ++++---- dll/win32/newdev/lang/zh-CN.rc | 8 ++++---- dll/win32/newdev/lang/zh-TW.rc | 8 ++++---- 24 files changed, 96 insertions(+), 96 deletions(-) diff --git a/dll/win32/newdev/lang/bg-BG.rc b/dll/win32/newdev/lang/bg-BG.rc index ed49c49c55..bb09ef8321 100644 --- a/dll/win32/newdev/lang/bg-BG.rc +++ b/dll/win32/newdev/lang/bg-BG.rc @@ -8,7 +8,7 @@ BEGIN LTEXT "Здравейте", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Вълшебникът ще сложи водач за ново устройство:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Натиснете „Напред“ за продължение.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "НЕИЗВЕСТНО УСТРОЙСТВО", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "НЕИЗВЕСТНО УСТРОЙСТВО", IDC_DEVICE, 148, 36, 147, 17 LTEXT "ВНИМАНИЕ! СЛАГАНЕТО НА ИЗБРАНО ОТ ПОТРЕБИТЕЛЯ УСТРОЙСТВО МОЖЕ ДА ДОВЕДЕ ДО ЗАБИВАНЕ НА КОМПЮТЪРА ВИ ИЛИ ДА ГО НАПРАВИ НЕЗАПУСКАЕМ!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Сам сложи водача", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Слагане на водача от определено място", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Слагането неуспешно", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Устройството не можа да бъде подкарано, поради неочавана грешка.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "НЕИЗВЕСТНО УСТРОЙСТВО", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "НЕИЗВЕСТНО УСТРОЙСТВО", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "Слагането приключи", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Трябва да презапуснете компютъра, за да завърши слагането на:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Натиснете „Край“, за да затворите вълшебника.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "НЕИЗВЕСТНО УСТРОЙСТВО", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "НЕИЗВЕСТНО УСТРОЙСТВО", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -83,7 +83,7 @@ BEGIN LTEXT "Слагането завърши", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Вълшебникът завърши слагането на водач за:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Натиснете „Край“ за затваряне на вълшебника.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "НЕИЗВЕСТНО УСТРОЙСТВО", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "НЕИЗВЕСТНО УСТРОЙСТВО", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/cs-CZ.rc b/dll/win32/newdev/lang/cs-CZ.rc index 68621f7164..a2b757f221 100644 --- a/dll/win32/newdev/lang/cs-CZ.rc +++ b/dll/win32/newdev/lang/cs-CZ.rc @@ -13,7 +13,7 @@ BEGIN LTEXT "Vítejte", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Tento průvodce nainstaluje ovladač nového zařízení pro:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Pokračujte kliknutím na Další.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "NEZNÁMÉ ZAŘÍZENÍ", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "NEZNÁMÉ ZAŘÍZENÍ", IDC_DEVICE, 148, 36, 147, 17 LTEXT "POZOR! INSTALACE VLASTNÍHO ZAŘÍZENÍ MŮŽE ZASEKNOUT POČÍTAČ NEBO ZNEMOŽNIT START OPERAČNÍHO SYSTÉMU!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Nainstalovat ovladač automaticky", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Nainstalovat ovladač ze specifického umístění", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -37,7 +37,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Instalace selhala", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Zařízení nemohlo být nainstalováno, protože se vyskytla neočekávaná chyba.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -77,7 +77,7 @@ BEGIN LTEXT "Instalace je kompletní", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Bude potřeba restartovat systém, aby mohla být dokončena instalace:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Kliknutím na Dokončit zavřete průvodce.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "NEZNÁMÉ ZAŘÍZENÍ", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "NEZNÁMÉ ZAŘÍZENÍ", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -88,7 +88,7 @@ BEGIN LTEXT "Instalace je kompletní", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Průvodce dokončil instalaci ovladače pro:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Kliknutím na Dokončit zavřete průvodce.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "NEZNÁMÉ ZAŘÍZENÍ", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "NEZNÁMÉ ZAŘÍZENÍ", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/de-DE.rc b/dll/win32/newdev/lang/de-DE.rc index 8124492a2c..aba3e53337 100644 --- a/dll/win32/newdev/lang/de-DE.rc +++ b/dll/win32/newdev/lang/de-DE.rc @@ -8,7 +8,7 @@ BEGIN LTEXT "Willkommen", IDC_WELCOMETITLE, 120, 8, 195, 12 LTEXT "Dieser Assistent installiert einen neuen Gerätetreiber für:", IDC_STATIC, 120, 21, 195, 12 LTEXT "Klicken Sie auf Weiter, um fortzufahren.", IDC_STATIC, 120, 169, 195, 12 - LTEXT "UNBEKANNTES GERÄT", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "UNBEKANNTES GERÄT", IDC_DEVICE, 148, 36, 147, 17 LTEXT "WARNUNG! DAS INSTALLIEREN VON TREIBERN KANN IHREN PC ZUM ABSTURZ BRINGEN ODER AM STARTEN HINDERN!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Treiber automatisch installieren", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Treiber von einer bestimmten Position installieren", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Installation fehlgeschlagen", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Das Gerät konnte aufgrund eines unerwarteten Fehlers nicht installiert werden.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "UNBEKANNTES GERÄT", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UNBEKANNTES GERÄT", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "Installation vollständig", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Sie müssen den Computer neustarten, um folgende Installation abzuschließen:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Klicken Sie auf Beenden, um den Assistenten zu schließen.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "UNBEKANNTES GERÄT", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UNBEKANNTES GERÄT", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -83,7 +83,7 @@ BEGIN LTEXT "Installation abgeschlossen", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Der Assistent hat die Installation erfolgreich abgeschlossen.", IDC_STATIC, 120, 32, 195, 12 LTEXT "Klicken Sie zum Beenden der Installation auf Fertigstellen.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "UNBEKANNTES GERÄT", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UNBEKANNTES GERÄT", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/el-GR.rc b/dll/win32/newdev/lang/el-GR.rc index 77c628b7df..a2669f84dd 100644 --- a/dll/win32/newdev/lang/el-GR.rc +++ b/dll/win32/newdev/lang/el-GR.rc @@ -8,7 +8,7 @@ BEGIN LTEXT "Καλώς ήλθατε", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Αυτός ο βοηθός εγκαθιστά έναν οδηγό συσκευής για το:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Πατήστε 'Επόμενο' για να συνεχίσετε.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "ΑΓΝΩΣΤΗ ΣΥΣΚΕΥΗ", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "ΑΓΝΩΣΤΗ ΣΥΣΚΕΥΗ", IDC_DEVICE, 148, 36, 147, 17 LTEXT "ΠΡΟΕΙΔΟΠΟΙΗΣΗ! Η ΕΓΚΑΤΆΣΤΑΣΗ ΜΙΑΣ ΔΙΚΗΣ ΣΑΣ ΣΥΣΚΕΥΗΣ ΜΠΟΡΕΙ ΝΑ ΠΑΓΩΣΕΙ ΤΗ ΛΕΙΤΟΥΡΓΙΑ ΤΟΥ ΥΠΟΛΟΓΙΣΤΗ 'Η ΝΑ ΤΟΝ ΚΑΝΕΙ ΜΗ ΕΠΑΝΕΚΚΙΝΗΣΙΜΟ!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Αυτόματη εγκατάσταση οδηγού", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Εγκατάσταση οδηγού από συγκεκριμένη τοποθεσία", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Η εγκατάσταση απέτυχε", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Η συσκευή δεν ήταν δυνατόν να εγκατασταθεί γιατί συνέβη ένα απρόσμενο λάθος.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "ΑΓΝΩΣΤΗ ΣΥΣΚΕΥΗ", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "ΑΓΝΩΣΤΗ ΣΥΣΚΕΥΗ", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "Η εγκατάσταση ολοκληρώθηκε", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Πρέπει να επανεκκινήσετε τον υπολογιστή σας για να ολοκληρώσετε την εγκατάσταση του:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Πατήστε 'Ολοκλήρωση' για να κλείσετε το βοηθό.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "ΑΓΝΩΣΤΗ ΣΥΣΚΕΥΗ", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "ΑΓΝΩΣΤΗ ΣΥΣΚΕΥΗ", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -83,7 +83,7 @@ BEGIN LTEXT "Η εγκατάσταση ολοκληρώθηκε", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Ο βοηθός ολοκλήρωσε την εγκατάσταση οδηγού για το:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Πατήστε 'Ολοκλήρωση' για να κλείσετε το βοηθό.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "ΑΓΝΩΣΤΗ ΣΥΣΚΕΥΗ", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "ΑΓΝΩΣΤΗ ΣΥΣΚΕΥΗ", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/en-US.rc b/dll/win32/newdev/lang/en-US.rc index d461049e3d..64e3ec466a 100644 --- a/dll/win32/newdev/lang/en-US.rc +++ b/dll/win32/newdev/lang/en-US.rc @@ -8,7 +8,7 @@ BEGIN LTEXT "Welcome", IDC_WELCOMETITLE, 120, 8, 195, 24 LTEXT "This wizard installs a new device driver for:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Click Next to continue.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 36, 147, 17 LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Install driver automatically", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Install driver from specific location", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Installation failed", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "The device could not be installed because an unexpected error happened.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "Installation complete", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "You need to reboot to finish the install of:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Click Finish to close the wizard.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -83,7 +83,7 @@ BEGIN LTEXT "Installation complete", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "The wizard has finished installing the driver for:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Click Finish to close the wizard.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/es-ES.rc b/dll/win32/newdev/lang/es-ES.rc index 7220d2320a..5981412dcf 100644 --- a/dll/win32/newdev/lang/es-ES.rc +++ b/dll/win32/newdev/lang/es-ES.rc @@ -13,7 +13,7 @@ BEGIN LTEXT "Bienvenido", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Este asistente le ayudará a instalar un nuevo controlador de dispositivo para:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Haga clic en Siguiente para continuar.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "Dispositivo desconocido", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "Dispositivo desconocido", IDC_DEVICE, 148, 36, 147, 17 LTEXT "¡Advertencia! ¡Instalar un dispositivo puede ralentizar su equipo o volverlo inestable!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Instalar un controlador automáticamente", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Instalar un controlador específico", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -37,7 +37,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "La instalación ha fallado", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "El dispositivo no se pudo instalar al producirse un error inesperado.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "Dispositivo desconocido", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "Dispositivo desconocido", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -77,7 +77,7 @@ BEGIN LTEXT "Instalación completa", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Necesita reiniciar su equipo para finalizar la instalación de:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Haga clic en Finalizar para cerrar el asistente.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "Dispositivo desconocido", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "Dispositivo desconocido", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -88,7 +88,7 @@ BEGIN LTEXT "Instalación completa.", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "El asistente ha terminado de instalar el controlador de dispositivo:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Haga clic en Finalizar para cerrar el asistente.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "Dispositivo desconocido", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "Dispositivo desconocido", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/fr-FR.rc b/dll/win32/newdev/lang/fr-FR.rc index 6265b28b61..e38edee1fc 100644 --- a/dll/win32/newdev/lang/fr-FR.rc +++ b/dll/win32/newdev/lang/fr-FR.rc @@ -8,7 +8,7 @@ BEGIN LTEXT "Bienvenue", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Cet assistant installe un nouveau pilote pour :", IDC_STATIC, 120, 21, 195, 16 LTEXT "Cliquer sur Suivant pour continuer.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "MATÉRIEL INCONNU", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "MATÉRIEL INCONNU", IDC_DEVICE, 148, 36, 147, 17 LTEXT "ATTENTION ! L'INSTALLATION D'UN PILOTE PEUT ENTRAINER LE BLOCAGE DE VOTRE ORDINATEUR OU LE RENDRE INDEMARRABLE !", IDC_STATIC, 120, 59, 200, 16 CONTROL "Installer le pilote automatiquement", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Installer le pilote depuis un endroit spécifié", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "L'installation a échoué", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Le matériel n'a pu etre installé en raison d'une erreur inattendue.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "MATÉRIEL INCONNU", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "MATÉRIEL INCONNU", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "Installation terminée", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Vous devez redémarrer l'ordinateur avant d'utiliser :", IDC_STATIC, 120, 32, 195, 16 LTEXT "Cliquer sur Terminer pour fermer l'assistant.", IDC_STATIC, 120, 174, 179, 12 - LTEXT "MATÉRIEL INCONNU", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "MATÉRIEL INCONNU", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -83,7 +83,7 @@ BEGIN LTEXT "Installation terminée", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "L'assistant a fini d'installer le pilote pour :", IDC_STATIC, 120, 32, 195, 16 LTEXT "Cliquer sur Terminer pour fermer l'assistant.", IDC_STATIC, 120, 174, 179, 12 - LTEXT "MATÉRIEL INCONNU", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "MATÉRIEL INCONNU", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/he-IL.rc b/dll/win32/newdev/lang/he-IL.rc index 4df1b7a550..aac47bef39 100644 --- a/dll/win32/newdev/lang/he-IL.rc +++ b/dll/win32/newdev/lang/he-IL.rc @@ -8,7 +8,7 @@ BEGIN LTEXT "ברוכים הבאים", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "This wizard installs a new device driver for:", IDC_STATIC, 120, 21, 195, 16 LTEXT "לחץ הבא כדי להמשיך.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 36, 147, 17 LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!", IDC_STATIC, 120, 59, 195, 16 CONTROL "התקן תוכנת מנהל התקן באופן אוטומטי", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "התקן תוכנת מהל התקן ממיקום מסוים", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ההגדרה נכשלה", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "The device could not be installed because an unexpected error happened.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "ההגדרה הושלמה", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "You need to reboot to finish the install of:", IDC_STATIC, 120, 32, 195, 16 LTEXT "לחץ סיום כדי לסגור את האשף.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -83,7 +83,7 @@ BEGIN LTEXT "ההגדרה הושלמה", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "The wizard has finished installing the driver for:", IDC_STATIC, 120, 32, 195, 16 LTEXT "לחץ סיום כדי לסגור את האשף.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/hu-HU.rc b/dll/win32/newdev/lang/hu-HU.rc index cfa3139176..7fd524c640 100644 --- a/dll/win32/newdev/lang/hu-HU.rc +++ b/dll/win32/newdev/lang/hu-HU.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Welcome", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "A telepítõ a következõ hardverhez telepít fel eszközmeghatjtót:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Kattints a Tovább gombra a folytatáshoz.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "Ismeretlen eszköz!", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "Ismeretlen eszköz!", IDC_DEVICE, 148, 36, 147, 17 LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Automatikus telepítés", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Eszközmeghajtó kiválasztása", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Installation failed", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "The device could not be installed because an unexpected error happened.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -74,7 +74,7 @@ BEGIN LTEXT "Installation complete", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "You need to reboot to finish the install of:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Click Finish to close the wizard.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -85,7 +85,7 @@ BEGIN LTEXT "A telepítés sikeresen befejezõdött", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "A telepítõ feltelepítette az eszközmeghajtókat a következõ eszközhöz:", IDC_STATIC, 120, 32, 195, 16 LTEXT "A kilépéshez kattints a Befejezés gombra.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "Ismeretlen eszköz!", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "Ismeretlen eszköz!", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/id-ID.rc b/dll/win32/newdev/lang/id-ID.rc index 2be8737a8d..55a6350436 100644 --- a/dll/win32/newdev/lang/id-ID.rc +++ b/dll/win32/newdev/lang/id-ID.rc @@ -8,7 +8,7 @@ BEGIN LTEXT "Selamat datang", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Bimbingan ini menginstalasi device driver baru untuk:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Klik Lanjut untuk melanjutkan.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "DEVICE TIDAK DIKENAL", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "DEVICE TIDAK DIKENAL", IDC_DEVICE, 148, 36, 147, 17 LTEXT "PERINGATAN! MENGINSTALASI KUSTOM DEVICE BISA MENDIAMKAN KOMPUTER ANDA ATAU MENGAKIBATKAN TIDAK BISA DI-BOOT!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Instalasi driver secara otomatis", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Instalasi driver dari lokasi spesifik", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Instalasi gagal", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Device tidak bisa diinstalasi karena kesalahan tidak diharapkan telah terjadi.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "DEVICE TIDAK DIKENAL", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "DEVICE TIDAK DIKENAL", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "Instalasi selesai", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Anda perlu mem-boot ulang untuk menyelesaikan instalasi:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Klik Selesai untuk menutup bimbingan.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "DEVICE TIDAK DIKENAL", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "DEVICE TIDAK DIKENAL", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -83,7 +83,7 @@ BEGIN LTEXT "Instalasi selesai", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Bimbingan telah selesai menginstalasi driver untuk:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Klik Selesai untuk menutup bimbingan.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "DEVICE TIDAK DIKENAL", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "DEVICE TIDAK DIKENAL", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/it-IT.rc b/dll/win32/newdev/lang/it-IT.rc index a657c6a004..d7bc585434 100644 --- a/dll/win32/newdev/lang/it-IT.rc +++ b/dll/win32/newdev/lang/it-IT.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Benvenuto", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Questa procedura guidata installa un nuovo driver di dispositivi per:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Selezionare Successivo per continuare.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "DISPOSITIVO SCONOSCIUTO", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "DISPOSITIVO SCONOSCIUTO", IDC_DEVICE, 148, 36, 147, 17 LTEXT "ATTENZIONE! INSTALLARE UN DISPOSITIVO PERSONALIZZATO PUÒ BLOCCARE IL COMPUTER O IMPEDIRNE L'AVVIO!", IDC_STATIC, 120, 59, 210, 25 CONTROL "Installa il driver automaticamente", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Installa il driver da una posizione specifica", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "L'installazione è fallita", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Impossibile installare il dispositivo perché si è verificato un errore inatteso.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "DISPOSITIVO SCONOSCIUTO", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "DISPOSITIVO SCONOSCIUTO", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -74,7 +74,7 @@ BEGIN LTEXT "Installazione completata", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "È necessario riavviare per terminare l'installazione di:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Selezionare Fine per chiudere questa procedura guidata.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "DISPOSITIVO SCONOSCIUTO", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "DISPOSITIVO SCONOSCIUTO", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -85,7 +85,7 @@ BEGIN LTEXT "Installazione completata", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "La procedura guidata ha terminato l'installazione del driver per:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Selezionare Fine per chiudere questa procedura guidata.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "DISPOSITIVO SCONOSCIUTO", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "DISPOSITIVO SCONOSCIUTO", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/ja-JP.rc b/dll/win32/newdev/lang/ja-JP.rc index dbe16862a4..5557f7a7ec 100644 --- a/dll/win32/newdev/lang/ja-JP.rc +++ b/dll/win32/newdev/lang/ja-JP.rc @@ -8,7 +8,7 @@ BEGIN LTEXT "ようこそ", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "このウィザードでは、以下の新しいデバイスドライバをインストールします:", IDC_STATIC, 120, 21, 195, 16 LTEXT "続行するには、[次へ] をクリックしてください。", IDC_STATIC, 120, 169, 195, 16 - LTEXT "不明なデバイス", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "不明なデバイス", IDC_DEVICE, 148, 36, 147, 17 LTEXT "警告! カスタムデバイスをインストールすると、コンピュータがフリーズしたり、起動不能になる可能性があります!", IDC_STATIC, 120, 67, 195, 16 CONTROL "ドライバを自動的にインストールする", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "ドライバを特定の場所からインストールする", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -32,7 +32,7 @@ FONT 9, "MS UI Gothic" BEGIN LTEXT "インストール失敗", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "予期せぬエラーが発生したため、デバイスはインストールされませんでした。", IDC_STATIC, 120, 32, 195, 16 - LTEXT "不明なデバイス", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "不明なデバイス", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "インストール完了", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "以下のインストールを完了するには再起動が必要です:", IDC_STATIC, 120, 32, 195, 16 LTEXT "[完了] をクリックするとウィザードを閉じます。", IDC_STATIC, 120, 174, 195, 12 - LTEXT "不明なデバイス", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "不明なデバイス", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -83,7 +83,7 @@ BEGIN LTEXT "インストール完了", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "ウィザードは以下のドライバのインストールを完了しました:", IDC_STATIC, 120, 32, 195, 16 LTEXT "[完了] をクリックするとウィザードを閉じます。", IDC_STATIC, 120, 174, 195, 12 - LTEXT "不明なデバイス", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "不明なデバイス", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/nl-NL.rc b/dll/win32/newdev/lang/nl-NL.rc index d77c97770c..52734aa8e4 100644 --- a/dll/win32/newdev/lang/nl-NL.rc +++ b/dll/win32/newdev/lang/nl-NL.rc @@ -15,7 +15,7 @@ BEGIN LTEXT "Welkom", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Deze wizard installeert een nieuwe driver voor:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Klik op Volgende om verder te gaan.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "ONBEKEND APPARAAT", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "ONBEKEND APPARAAT", IDC_DEVICE, 148, 36, 147, 17 LTEXT "WAARSCHUWING! EEN ONBEKEND APPARAAT INSTALLEREN KAN UW COMPUTER LATEN VASTLOPEN OF ONOPSTARTBAAR MAKEN!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Installeer de driver automatisch", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Installeer de driver van een bepaalde locatie", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -39,7 +39,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Installatie mislukt.", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Het apparaat kon niet geïnstalleerd worden omdat er een onverwachte fout optrad.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "ONBEKEND APPARAAT", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "ONBEKEND APPARAAT", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -79,7 +79,7 @@ BEGIN LTEXT "Installatie voltooid", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "U moet uw computer herstarten om de installatie te voltooien van:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Klik op Voltooien om de wizard te sluiten.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "ONBEKEND APPARAAT", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "ONBEKEND APPARAAT", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -90,7 +90,7 @@ BEGIN LTEXT "Installatie voltooid", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "De wizard is voltooid met het installeren van de driver voor:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Klik op Voltooien om de wizard te sluiten.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "ONBEKEND APPARAAT", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "ONBEKEND APPARAAT", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/no-NO.rc b/dll/win32/newdev/lang/no-NO.rc index 9ae823e76b..14de601019 100644 --- a/dll/win32/newdev/lang/no-NO.rc +++ b/dll/win32/newdev/lang/no-NO.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Velkommen", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Denne veiviseren installerer driver for ny enhet:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Klikk Neste for å fortsette.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "UKJENT ENHET", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "UKJENT ENHET", IDC_DEVICE, 148, 36, 147, 17 LTEXT "ADVARSEL! INSTALLASJON AV EN DRIVER KAN FRYSE DIN MASKIN, ELLER GJØRE AT DEN IKKE STARTER OPP!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Installer driver automatisk", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Installer driver fra spesifikk lokasjon", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Installasjonen feilet", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Enheten kunne ikke installeres fordi en ukjent feil oppstod.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "UKJENT ENHET", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UKJENT ENHET", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -74,7 +74,7 @@ BEGIN LTEXT "Installasjonen er ferdig", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Du må starte maskinen på nytt for å fullføre installasjonen av:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Trykk Fullfør for å avslutte veiviseren.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "UKJENT ENHET", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UKJENT ENHET", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -85,7 +85,7 @@ BEGIN LTEXT "Installasjonen er ferdig", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Veiviseren har installert driveren for: ", IDC_STATIC, 120, 32, 195, 16 LTEXT "Trykk Fullfør for å avslutte veiviseren.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "UKJENT ENHET", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "UKJENT ENHET", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/pl-PL.rc b/dll/win32/newdev/lang/pl-PL.rc index 9c8a6ce99c..1b81bb489e 100644 --- a/dll/win32/newdev/lang/pl-PL.rc +++ b/dll/win32/newdev/lang/pl-PL.rc @@ -16,7 +16,7 @@ BEGIN LTEXT "Witamy", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Ten kreator zainstaluje nowe sterowniki dla urządzenia:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Naciśnij Dalej, aby kontynuować.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "NIEZNANE URZĄDZENIE", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "NIEZNANE URZĄDZENIE", IDC_DEVICE, 148, 36, 147, 17 LTEXT "UWAGA! NIEODPOWIEDNI STEROWNIK MOŻE ZDESTABILIZOWAĆ LUB NAWET ZAWIESIĆ SYSTEM!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Zainstaluj sterownik automatycznie", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Zainstaluj sterownik z określonej lokalizacji", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -40,7 +40,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Instalacja nieudana", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Instalacja zakończona niepowodzeniem, z powodu wystąpienia nieoczekiwanego błędu.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "NIEZNANE URZĄDZENIE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "NIEZNANE URZĄDZENIE", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -80,7 +80,7 @@ BEGIN LTEXT "Instalacja zakończona", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Należy zrestartować komputer, zakańczanie instalacji:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Naciśnij Zakończ, aby zamknąć kreator.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "NIEZNANE URZĄDZENIE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "NIEZNANE URZĄDZENIE", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -91,7 +91,7 @@ BEGIN LTEXT "Instalacja zakończona", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Kreator zakończył instalację sterownika dla:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Naciśnij Zakończ, aby zamknąć kreator.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "NIEZNANE URZĄDZENIE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "NIEZNANE URZĄDZENIE", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/ro-RO.rc b/dll/win32/newdev/lang/ro-RO.rc index d014ed5872..d9a612d2ec 100644 --- a/dll/win32/newdev/lang/ro-RO.rc +++ b/dll/win32/newdev/lang/ro-RO.rc @@ -17,7 +17,7 @@ BEGIN LTEXT "Bun venit!", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Acest asistent va instala module-pilot pentru dispozitivul:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Apăsați „Înainte” pentru a continua.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 36, 147, 17 LTEXT "AVERTISMENT: INSTALAREA UNUI DISPOZITIV NEOBIȘNUIT VĂ POATE SCOATE DIN FUNCȚIUNE CALCULATORUL!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Instalează modulele-pilot a&utomat", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Instalează modulele-pilot din lo&cație specificată", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -41,7 +41,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Instalarea a eșuat", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Dispozitivul nu a fost instalat din cauza unei erori neașteptate.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -81,7 +81,7 @@ BEGIN LTEXT "Instalare completă", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Este necesară repornirea sistemului pentru a încheia instalarea:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Apăsați „Sfârșit” pentru a închide asistentul.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -92,7 +92,7 @@ BEGIN LTEXT "Instalare completă", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Asistentul a încheiat instalarea dispozitivului:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Apăsați „Sfârșit” pentru a încheia instalarea.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/ru-RU.rc b/dll/win32/newdev/lang/ru-RU.rc index 8ec2dda482..7ed91c3e63 100644 --- a/dll/win32/newdev/lang/ru-RU.rc +++ b/dll/win32/newdev/lang/ru-RU.rc @@ -8,7 +8,7 @@ BEGIN LTEXT "Установка нового оборудования", IDC_WELCOMETITLE, 120, 8, 210, 16 LTEXT "Этот мастер устанавливает драйвер для:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Для продолжения нажмите кнопку ""Далее"".", IDC_STATIC, 120, 169, 195, 16 - LTEXT "Неизвестное устройство", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "Неизвестное устройство", IDC_DEVICE, 148, 36, 147, 17 LTEXT "ВНИМАНИЕ! Установка нового оборудования может закончиться зависанием компьютера или невозможностью загрузить его!", IDC_STATIC, 120, 59, 195, 24 CONTROL "Установить драйвер автоматически", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Установить драйвер из указанного места", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Это оборудование установить не удалось", IDC_FINISHTITLE, 120, 8, 195, 26 LTEXT "Неизвестная ошибка. Не удалось установить устройство.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "Неизвестное устройство", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "Неизвестное устройство", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -72,7 +72,7 @@ BEGIN LTEXT "Установка оборудования завершена", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Вы должны выполнить перезагрузку, чтобы закончить установку:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Нажмите ""Готово"" для завершения мастера.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "Неизвестное устройство", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "Неизвестное устройство", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -83,7 +83,7 @@ BEGIN LTEXT "Установка завершена", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Мастер закончил установку драйвера для:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Нажмите ""Готово"" для завершения мастера.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "Неизвестное устройство", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "Неизвестное устройство", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/sk-SK.rc b/dll/win32/newdev/lang/sk-SK.rc index d64ff57868..d7b6858307 100644 --- a/dll/win32/newdev/lang/sk-SK.rc +++ b/dll/win32/newdev/lang/sk-SK.rc @@ -13,7 +13,7 @@ BEGIN LTEXT "Vitajte", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Tento sprievodca nainštaluje nový ovládač zariadenia pre:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Kliknite na tlačidlo Ďalej pre pokračovanie.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "NEZNÁME ZARIADENIE", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "NEZNÁME ZARIADENIE", IDC_DEVICE, 148, 36, 147, 17 LTEXT "UPOZORNENIE! NAINŠTALOVANIE VLASTNÉHO ZARIADENIA MÔŽE SPÔSOBIŤ ZAMŔZANIE VÁŠHO POČÍTAČA ALEBO ZNEFUNKČNIŤ ZAVÁDZANIE OPERAČNÉHO SYSTÉMU!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Nainštalovať ovládač automaticky", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Nainštalovať ovládač zo zadaného umiestnenia", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -37,7 +37,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Inštalácia zlyhala", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Zariadenie sa nepodarilo nainštalovať, lebo sa vyskytla nepredvídaná chyba.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "NEZNÁME ZARIADENIE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "NEZNÁME ZARIADENIE", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -77,7 +77,7 @@ BEGIN LTEXT "Inštalácia dokončená", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Musíte reštartovať počítač pre dokončenie inštalácie:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Kliknutím na tlačidlo Dokončiť zavriete sprievodcu", IDC_STATIC, 120, 174, 195, 12 - LTEXT "NEZNÁME ZARIADENIE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "NEZNÁME ZARIADENIE", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -88,7 +88,7 @@ BEGIN LTEXT "Inštalácia dokončená", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Sprievodca dokončil inštaláciu ovládača pre:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Kliknutím na tlačidlo Dokončiť zavriete sprievodcu.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "NEZNÁME ZARIADENIE", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "NEZNÁME ZARIADENIE", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/sq-AL.rc b/dll/win32/newdev/lang/sq-AL.rc index 8d859ab269..6a07be29be 100644 --- a/dll/win32/newdev/lang/sq-AL.rc +++ b/dll/win32/newdev/lang/sq-AL.rc @@ -12,7 +12,7 @@ BEGIN LTEXT "Mirëseerdhët", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Ky magjistar instalon një komandues të ri të pajisjes për:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Klikoni Vazhdo për të vazhduar.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 148, 36, 147, 17 LTEXT "KUJDES! INSTALIMI I NJË PAJISJE TË PERSONALIZUAR MUND TË NGRIJË KOMPJUTERIN TUAJ OSE TA BËJNË TË MOS NISET!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Instalo komanduesit automatikisht", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Instalo komanduesit nga një vend specifik", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -36,7 +36,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Instalimi dështoj", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Pajisja nuk mund të instalohet për shkak se një gabim i papritur ka ndodhur.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -76,7 +76,7 @@ BEGIN LTEXT "Instalimi i plotë", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Ju duhet të rinisni për të përfunduar të instaluari të:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Kliko Mbaro për të mbyllur magjistar.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -87,7 +87,7 @@ BEGIN LTEXT "Instalimi i plotë", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Magjistar ka përfunduar instalimin e komanduesit për:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Kliko Mbaro për të mbyllur magjistar.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/th-TH.rc b/dll/win32/newdev/lang/th-TH.rc index 0860c3da5b..30deb12b9c 100644 --- a/dll/win32/newdev/lang/th-TH.rc +++ b/dll/win32/newdev/lang/th-TH.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "ยินดีต้อนรับ", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "การติดตั้งอุปกรณ์ขับเคลื่อนใหม่อัตโนมัติเพื่อ:", IDC_STATIC, 120, 21, 195, 16 LTEXT "กดเลือกถัดไปเพื่อทำงานต่อ", IDC_STATIC, 120, 169, 195, 16 - LTEXT "ไม่ทราบค่าอุปกรณ์", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "ไม่ทราบค่าอุปกรณ์", IDC_DEVICE, 148, 36, 147, 17 LTEXT "ระวัง! การติดตั้งอุปกรณ์ตามปกติแล้วอาจทำให้เครื่องของคุณหยุดนิ่งหรือมีผลให้เปิดเครื่องใหม่ไม่ได้!", IDC_STATIC, 120, 59, 195, 16 CONTROL "ทำการติดตั้งอุปกรณ์อัตโนมัติ", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "การติดตั้งอุปกรณ์จากตำแหน่งที่ระบุ", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "การติดตั้งผิดพลาด", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "อุปกรณ์นี้ไม่สามารถติดตั้งได้เพราะมีสิ่งผิดปกติที่ไม่สามารถคาดการณ์ได้เกิดขึ้น", IDC_STATIC, 120, 32, 195, 16 - LTEXT "ไม่รู้จักอุปกรณ์", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "ไม่รู้จักอุปกรณ์", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -74,7 +74,7 @@ BEGIN LTEXT "การติดตั้งเสร็จสมบูรณ์", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "คุณจำเป็นต้องเริ่มเปิดเครื่องใหม่เมื่อเสร็จสิ้นการติดตั้ง:", IDC_STATIC, 120, 32, 195, 16 LTEXT "กดเลือกเสร็จสิ้นเพื่อปิดการติดตั้งอัตโนมัติ", IDC_STATIC, 120, 174, 195, 12 - LTEXT "ไม่รู้จักอุปกรณ์", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "ไม่รู้จักอุปกรณ์", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -85,7 +85,7 @@ BEGIN LTEXT "การติดตั้งเสร็จสมบูรณ์", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "การติดตั้งอัตโนมัติเสร็จสำหรับอุปกรณ์:", IDC_STATIC, 120, 32, 195, 16 LTEXT "กดเลือกเสร็จสิ้นเพื่อปิดการติดตั้งอัตโนมัติ", IDC_STATIC, 120, 174, 195, 12 - LTEXT "ไม่รู้จักอุปกรณ์", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "ไม่รู้จักอุปกรณ์", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/tr-TR.rc b/dll/win32/newdev/lang/tr-TR.rc index 7859f861a9..f73f7268e1 100644 --- a/dll/win32/newdev/lang/tr-TR.rc +++ b/dll/win32/newdev/lang/tr-TR.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Hoş Geldiniz", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Bu yardımcı, şunun için yeni bir aygıt sürücüsü kurar:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Sürdürmek için İleri'ye tıklayınız.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "BİLİNMEYEN AYGIT", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "BİLİNMEYEN AYGIT", IDC_DEVICE, 148, 36, 147, 17 LTEXT "UYARI! HUSÛSİ BİR AYGIT KURMA BİLGİSAYARINIZI, DONDURABİLİR VEYÂ AÇILAMAZ YAPABİLİR!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Sürücüyü Kendiliğinden Kur", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Sürücüyü Belirli Konumdan Kur", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Kurulum Başarısız Oldu", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Beklenmeyen bir yanlışlık olduğundan dolayı aygıt kurulamadı.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "BİLİNMEYEN AYGIT", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "BİLİNMEYEN AYGIT", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -74,7 +74,7 @@ BEGIN LTEXT "Kurulum Bitti", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Şunun kurulumunu bitirmek için yeniden başlatmaya gereksiniminiz var:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Bu yardımcıyı kapatmak için Bitir'e tıklayınız.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "BİLİNMEYEN AYGIT", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "BİLİNMEYEN AYGIT", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -85,7 +85,7 @@ BEGIN LTEXT "Kurulum Bitti", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Bu yardımcı, şunun için sürücüyü kurmayı bitirdi:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Bu yardımcıyı kapatmak için Bitir'e tıklayınız.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "BİLİNMEYEN AYGIT", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "BİLİNMEYEN AYGIT", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/uk-UA.rc b/dll/win32/newdev/lang/uk-UA.rc index 67eb76445a..6027ef3d0c 100644 --- a/dll/win32/newdev/lang/uk-UA.rc +++ b/dll/win32/newdev/lang/uk-UA.rc @@ -16,7 +16,7 @@ BEGIN LTEXT "Ласкаво просимо", IDC_WELCOMETITLE, 120, 8, 195, 16 LTEXT "Цей майстер встановлює новий драйвер пристрою для:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Натисніть ""Далі"" для продовження.", IDC_STATIC, 120, 169, 195, 16 - LTEXT "НЕВІДОМИЙ ПРИСТРІЙ", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "НЕВІДОМИЙ ПРИСТРІЙ", IDC_DEVICE, 148, 36, 147, 17 LTEXT "ПОПЕРЕДЖЕННЯ! ВСТАНОВЛЕННЯ ПРИСТРОЮ МОЖЕ ЗАМОРОЗИТИ ВАШ КОМП'ЮТЕР АБО ЗРОБИТИ ЙОГО НЕЗДАТНИМ ДО ЗАВАНТАЖЕННЯ!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Встановити драйвер автоматично", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Встановити драйвер з вказаного місця", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -40,7 +40,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Встановлення не вдалося", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "Пристрій не встановлено тому що сталася несподівана помилка.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "НЕВІДОМИЙ ПРИСТРІЙ", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "НЕВІДОМИЙ ПРИСТРІЙ", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -80,7 +80,7 @@ BEGIN LTEXT "Встановлення завершене", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Ви маєте перезапустити комп’ютер, щоб закінчити встановлення:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Натисніть ""Завершити"" для виходу з майстра.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "НЕВІДОМИЙ ПРИСТРІЙ", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "НЕВІДОМИЙ ПРИСТРІЙ", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -91,7 +91,7 @@ BEGIN LTEXT "Встановлення завершене", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "Майстер закінчив встановлення драйвера для:", IDC_STATIC, 120, 32, 195, 16 LTEXT "Натисніть ""Завершити"" для виходу з майстра.", IDC_STATIC, 120, 174, 195, 12 - LTEXT "НЕВІДОМИЙ ПРИСТРІЙ", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "НЕВІДОМИЙ ПРИСТРІЙ", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/zh-CN.rc b/dll/win32/newdev/lang/zh-CN.rc index c839d13dff..0332e095c3 100644 --- a/dll/win32/newdev/lang/zh-CN.rc +++ b/dll/win32/newdev/lang/zh-CN.rc @@ -11,7 +11,7 @@ BEGIN LTEXT "欢迎", IDC_WELCOMETITLE, 120, 8, 195, 24 LTEXT "此向导将安装新的设备驱动程序:", IDC_STATIC, 120, 21, 195, 16 LTEXT "单击下一步继续。", IDC_STATIC, 120, 169, 195, 16 - LTEXT "未知设备", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "未知设备", IDC_DEVICE, 148, 36, 147, 17 LTEXT "警告! 安装自定义的设备可能会冻结您的计算机或使其无法启动!", IDC_STATIC, 120, 59, 195, 16 CONTROL "自动安装驱动程序", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "从特定位置安装驱动程序", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -35,7 +35,7 @@ FONT 9, "宋体" BEGIN LTEXT "安装失败", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "因为发生意外的错误，无法安装该设备。", IDC_STATIC, 120, 32, 195, 16 - LTEXT "未知设备", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "未知设备", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -75,7 +75,7 @@ BEGIN LTEXT "安装完成", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "您需要重新启动才能完成安装:", IDC_STATIC, 120, 32, 195, 16 LTEXT "单击完成关闭向导。", IDC_STATIC, 120, 174, 195, 12 - LTEXT "未知设备", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "未知设备", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -86,7 +86,7 @@ BEGIN LTEXT "安装完成", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "向导已完成安装的驱动程序:", IDC_STATIC, 120, 32, 195, 16 LTEXT "单击完成关闭向导。", IDC_STATIC, 120, 174, 195, 12 - LTEXT "未知设备", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "未知设备", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE diff --git a/dll/win32/newdev/lang/zh-TW.rc b/dll/win32/newdev/lang/zh-TW.rc index 66c4e32c9d..6e59b062a7 100644 --- a/dll/win32/newdev/lang/zh-TW.rc +++ b/dll/win32/newdev/lang/zh-TW.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "歡迎", IDC_WELCOMETITLE, 120, 8, 195, 24 LTEXT "此嚮導將安裝新的裝置驅動程式:", IDC_STATIC, 120, 21, 195, 16 LTEXT "單擊下一步繼續。", IDC_STATIC, 120, 169, 195, 16 - LTEXT "未知的裝置", IDC_DEVICE, 148, 36, 147, 12 + LTEXT "未知的裝置", IDC_DEVICE, 148, 36, 147, 17 LTEXT "警告! 安裝自定義的裝置可能會凍結您的計算機或使其無法啟動!", IDC_STATIC, 120, 59, 195, 16 CONTROL "自動安裝驅動程式", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "從特定位置安裝驅動程式", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 @@ -34,7 +34,7 @@ FONT 9, "新細明體" BEGIN LTEXT "安裝失敗", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "因為發生意外的錯誤，無法安裝該裝置。", IDC_STATIC, 120, 32, 195, 16 - LTEXT "未知的裝置", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "未知的裝置", IDC_DEVICE, 148, 53, 147, 17 END IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 @@ -74,7 +74,7 @@ BEGIN LTEXT "安裝完成", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "您需要重新啟動才能完成安裝:", IDC_STATIC, 120, 32, 195, 16 LTEXT "單擊完成關閉嚮導。", IDC_STATIC, 120, 174, 195, 12 - LTEXT "未知的裝置", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "未知的裝置", IDC_DEVICE, 148, 53, 147, 17 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -85,7 +85,7 @@ BEGIN LTEXT "安裝完成", IDC_FINISHTITLE, 120, 8, 195, 12 LTEXT "嚮導已完成安裝的驅動程式:", IDC_STATIC, 120, 32, 195, 16 LTEXT "單擊完成關閉嚮導。", IDC_STATIC, 120, 174, 195, 12 - LTEXT "未知的裝置", IDC_DEVICE, 148, 53, 147, 12 + LTEXT "未知的裝置", IDC_DEVICE, 148, 53, 147, 17 END STRINGTABLE

1 0

01/01: [FONTS] Fix underline/underscore position of Tahoma (#892)
by Katayama Hirofumi MZ 02 Oct '18

02 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b560491ccf86d226a4720… commit b560491ccf86d226a4720f784ddaa7dd03ee2504 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 3 04:53:04 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 2 21:53:04 2018 +0200 [FONTS] Fix underline/underscore position of Tahoma (#892) Because of FontForge's bug, the underline position value of Tahoma and Tahoma Bold was wrongly set (#789, #809). This commit fixes those values. CORE-15079 --- media/fonts/tahoma.ttf | Bin 168308 -> 168308 bytes media/fonts/tahomabd.ttf | Bin 182136 -> 175800 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index 8864e7cffa..b9a0c771a2 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 5b059e9c35..9a00123a5f 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

1 0

01/01: [NETCFGX] Network property page: Add support for enum type options, the 'Optional' setting and the 'TextLimit' and 'Uppercase' settings for edit type options.
by Eric Kohl 02 Oct '18

02 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91ba4e73508a0168796af… commit 91ba4e73508a0168796af9fed67557ade3a6f792 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Oct 2 17:57:32 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Oct 2 17:58:16 2018 +0200 [NETCFGX] Network property page: Add support for enum type options, the 'Optional' setting and the 'TextLimit' and 'Uppercase' settings for edit type options. --- dll/win32/netcfgx/propertypage.c | 362 ++++++++++++++++++++++++++++++++++----- 1 file changed, 322 insertions(+), 40 deletions(-) diff --git a/dll/win32/netcfgx/propertypage.c b/dll/win32/netcfgx/propertypage.c index fe9f48f852..3cf5f56c58 100644 --- a/dll/win32/netcfgx/propertypage.c +++ b/dll/win32/netcfgx/propertypage.c @@ -18,16 +18,26 @@ typedef enum _PARAM_TYPE ENUM_TYPE, } PARAM_TYPE, *PPARAM_TYPE; +typedef struct _ENUM_OPTION +{ + PWSTR pszValue; + PWSTR pszName; +} ENUM_OPTION, *PENUM_OPTION; + typedef struct _PARAMETER { PWSTR pszName; PWSTR pszDescription; PWSTR pszValue; PWSTR pszDefault; + BOOL bOptional; PARAM_TYPE Type; + + DWORD dwEnumOptions; + PENUM_OPTION pEnumOptions; + BOOL bUpperCase; - BOOL bOptional; - INT iLimitText; + INT iTextLimit; } PARAMETER, *PPARAMETER; @@ -43,7 +53,7 @@ VOID FreeParameterArray( _In_ PPARAMETER_ARRAY ParamArray) { - INT i; + INT i, j; if (ParamArray == NULL) return; @@ -59,6 +69,20 @@ FreeParameterArray( if (ParamArray->Array[i].pszDefault != NULL) HeapFree(GetProcessHeap(), 0, ParamArray->Array[i].pszDefault); + + if (ParamArray->Array[i].pEnumOptions != NULL) + { + for (j = 0; j < ParamArray->Array[i].dwEnumOptions; j++) + { + if (ParamArray->Array[i].pEnumOptions[j].pszValue != NULL) + HeapFree(GetProcessHeap(), 0, ParamArray->Array[i].pEnumOptions[j].pszValue); + + if (ParamArray->Array[i].pEnumOptions[j].pszName != NULL) + HeapFree(GetProcessHeap(), 0, ParamArray->Array[i].pEnumOptions[j].pszName); + } + + HeapFree(GetProcessHeap(), 0, ParamArray->Array[i].pEnumOptions); + } } HeapFree(GetProcessHeap(), 0, ParamArray); @@ -66,42 +90,242 @@ FreeParameterArray( static DWORD -GetValueString( +GetStringValue( IN HKEY hKey, - IN LPWSTR lpValueName, - OUT LPWSTR *lpString) + IN PWSTR pValueName, + OUT PWSTR *pString) { - LPWSTR lpBuffer; + PWSTR pBuffer; DWORD dwLength = 0; DWORD dwRegType; - DWORD rc; + DWORD dwError; - *lpString = NULL; + *pString = NULL; - RegQueryValueExW(hKey, lpValueName, NULL, &dwRegType, NULL, &dwLength); + RegQueryValueExW(hKey, pValueName, NULL, &dwRegType, NULL, &dwLength); if (dwLength == 0 || dwRegType != REG_SZ) return ERROR_FILE_NOT_FOUND; - lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(WCHAR)); - if (lpBuffer == NULL) + pBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(WCHAR)); + if (pBuffer == NULL) return ERROR_NOT_ENOUGH_MEMORY; - rc = RegQueryValueExW(hKey, lpValueName, NULL, NULL, (LPBYTE)lpBuffer, &dwLength); - if (rc != ERROR_SUCCESS) + dwError = RegQueryValueExW(hKey, pValueName, NULL, NULL, (LPBYTE)pBuffer, &dwLength); + if (dwError != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, pBuffer); + return dwError; + } + + pBuffer[dwLength / sizeof(WCHAR)] = UNICODE_NULL; + + *pString = pBuffer; + + return ERROR_SUCCESS; +} + + +static DWORD +GetBooleanValue( + _In_ HKEY hKey, + _In_ PWSTR pValueName, + _In_ BOOL bDefault, + _Out_ PBOOL pValue) +{ + WCHAR szBuffer[16]; + DWORD dwLength = 0; + DWORD dwRegType; + + *pValue = bDefault; + + dwLength = sizeof(szBuffer); + RegQueryValueExW(hKey, + pValueName, + NULL, + &dwRegType, + (LPBYTE)szBuffer, + &dwLength); + + if (dwRegType == REG_SZ && dwLength >= sizeof(WCHAR)) { - HeapFree(GetProcessHeap(), 0, lpBuffer); - return rc; + if (szBuffer[0] == L'0') + *pValue = FALSE; + else + *pValue = TRUE; } - lpBuffer[dwLength / sizeof(WCHAR)] = UNICODE_NULL; + return ERROR_SUCCESS; +} + + +static DWORD +GetIntValue( + _In_ HKEY hKey, + _In_ PWSTR pValueName, + _In_ INT iDefault, + _Out_ PINT pValue) +{ + WCHAR szBuffer[24]; + DWORD dwLength = 0; + DWORD dwRegType; - *lpString = lpBuffer; + *pValue = iDefault; + + dwLength = sizeof(szBuffer); + RegQueryValueExW(hKey, + pValueName, + NULL, + &dwRegType, + (LPBYTE)szBuffer, + &dwLength); + + if (dwRegType == REG_SZ && dwLength >= sizeof(WCHAR)) + { + *pValue = _wtoi(szBuffer); + } return ERROR_SUCCESS; } +static +DWORD +GetEnumOptions( + _In_ HKEY hKey, + _In_ PPARAMETER pParameter) +{ + HKEY hEnumKey = NULL; + PENUM_OPTION pOptions = NULL; + DWORD dwValues, dwMaxValueNameLen, dwMaxValueLen; + DWORD dwValueNameLength, dwValueLength; + DWORD i; + DWORD dwError; + + dwError = RegOpenKeyExW(hKey, + L"enum", + 0, + KEY_READ, + &hEnumKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwError = RegQueryInfoKeyW(hEnumKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &dwValues, + &dwMaxValueNameLen, + &dwMaxValueLen, + NULL, + NULL); + if (dwError != ERROR_SUCCESS) + { + ERR("RegQueryInfoKeyW failed (Error %lu)\n", dwError); + goto done; + } + + pOptions = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwValues * sizeof(ENUM_OPTION)); + if (pOptions == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + for (i = 0; i < dwValues; i++) + { + dwValueNameLength = dwMaxValueNameLen + sizeof(WCHAR); + pOptions[i].pszValue = HeapAlloc(GetProcessHeap(), + 0, + dwValueNameLength * sizeof(WCHAR)); + if (pOptions[i].pszValue == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + dwValueLength = dwMaxValueLen; + pOptions[i].pszName = HeapAlloc(GetProcessHeap(), + 0, + dwValueLength); + if (pOptions[i].pszName == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + dwError = RegEnumValueW(hEnumKey, + i, + pOptions[i].pszValue, + &dwValueNameLength, + NULL, + NULL, + (PBYTE)pOptions[i].pszName, + &dwValueLength); + if (dwError == ERROR_NO_MORE_ITEMS) + { + dwError == ERROR_SUCCESS; + goto done; + } + else if (dwError != ERROR_SUCCESS) + { + goto done; + } + } + + pParameter->pEnumOptions = pOptions; + pParameter->dwEnumOptions = dwValues; + pOptions = NULL; + +done: + if (pOptions != NULL) + { + for (i = 0; i < dwValues; i++) + { + if (pOptions[i].pszValue != NULL) + HeapFree(GetProcessHeap(), 0, pOptions[i].pszValue); + + if (pOptions[i].pszName != NULL) + HeapFree(GetProcessHeap(), 0, pOptions[i].pszName); + } + + HeapFree(GetProcessHeap(), 0, pOptions); + } + + if (hEnumKey != NULL) + RegCloseKey(hEnumKey); + + return dwError; +} + + +static +INT +FindEnumOption( + _In_ PPARAMETER pParameter, + _In_ PWSTR pszValue) +{ + INT i; + + if ((pParameter->pEnumOptions == NULL) || + (pParameter->dwEnumOptions == 0)) + return -1; + + for (i = 0; i < pParameter->dwEnumOptions; i++) + { + if (_wcsicmp(pParameter->pEnumOptions[i].pszValue, pszValue) == 0) + return i; + } + + return -1; +} + + static BOOL BuildParameterArray( @@ -212,11 +436,11 @@ BuildParameterArray( &hParamKey); if (lError == ERROR_SUCCESS) { - GetValueString(hParamKey, + GetStringValue(hParamKey, L"ParamDesc", &ParamArray->Array[dwIndex].pszDescription); - GetValueString(hParamKey, + GetStringValue(hParamKey, L"Type", &pszType); if (pszType != NULL) @@ -240,18 +464,44 @@ BuildParameterArray( pszType = NULL; } - GetValueString(hParamKey, + GetStringValue(hParamKey, L"Default", &ParamArray->Array[dwIndex].pszDefault); - ParamArray->Array[dwIndex].bUpperCase = FALSE; - ParamArray->Array[dwIndex].bOptional = FALSE; - ParamArray->Array[dwIndex].iLimitText = 0; + GetBooleanValue(hParamKey, + L"Optional", + FALSE, + &ParamArray->Array[dwIndex].bOptional); + + if (ParamArray->Array[dwIndex].Type == INT_TYPE || + ParamArray->Array[dwIndex].Type == LONG_TYPE || + ParamArray->Array[dwIndex].Type == WORD_TYPE || + ParamArray->Array[dwIndex].Type == DWORD_TYPE) + { + /* FIXME: Read Base, Min, Max and Step values */ + } + else if (ParamArray->Array[dwIndex].Type == EDIT_TYPE) + { + GetBooleanValue(hParamKey, + L"UpperCase", + FALSE, + &ParamArray->Array[dwIndex].bUpperCase); + + GetIntValue(hParamKey, + L"TextLimit", + 0, + &ParamArray->Array[dwIndex].iTextLimit); + } + else if (ParamArray->Array[dwIndex].Type == ENUM_TYPE) + { + GetEnumOptions(hParamKey, + &ParamArray->Array[dwIndex]); + } RegCloseKey(hParamKey); } - GetValueString(hDriverKey, + GetStringValue(hDriverKey, ParamArray->Array[dwIndex].pszName, &ParamArray->Array[dwIndex].pszValue); } @@ -279,10 +529,18 @@ DisplayParameter( HWND hwnd, PPARAMETER Parameter) { + HWND hwndControl; LONG_PTR Style; + INT idx; + DWORD i; ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_PRESENT), (Parameter->bOptional) ? SW_SHOW : SW_HIDE); ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_NOT_PRESENT), (Parameter->bOptional) ? SW_SHOW : SW_HIDE); + if (Parameter->bOptional) + { + Button_SetCheck(GetDlgItem(hwnd, IDC_PROPERTY_PRESENT), (Parameter->pszValue) ? BST_UNCHECKED : BST_CHECKED); + Button_SetCheck(GetDlgItem(hwnd, IDC_PROPERTY_NOT_PRESENT), (Parameter->pszValue) ? BST_CHECKED : BST_UNCHECKED); + } switch (Parameter->Type) { @@ -290,52 +548,76 @@ DisplayParameter( case LONG_TYPE: case WORD_TYPE: case DWORD_TYPE: - ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), SW_SHOW); ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_UPDN), SW_SHOW); ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST), SW_HIDE); - Style = GetWindowLongPtr(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), GWL_STYLE); + hwndControl = GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT); + ShowWindow(hwndControl, SW_SHOW); + + Style = GetWindowLongPtr(hwndControl, GWL_STYLE); Style |= ES_NUMBER; - SetWindowLongPtr(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), GWL_STYLE, Style); + SetWindowLongPtr(hwndControl, GWL_STYLE, Style); - Edit_LimitText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), 0); + Edit_LimitText(hwndControl, 0); if (Parameter->pszValue) - Edit_SetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->pszValue); + Edit_SetText(hwndControl, Parameter->pszValue); else if (Parameter->pszDefault) - Edit_SetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->pszDefault); + Edit_SetText(hwndControl, Parameter->pszDefault); break; case EDIT_TYPE: - ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), SW_SHOW); ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_UPDN), SW_HIDE); ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST), SW_HIDE); - Style = GetWindowLongPtr(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), GWL_STYLE); + hwndControl = GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT); + ShowWindow(hwndControl, SW_SHOW); + + Style = GetWindowLongPtr(hwndControl, GWL_STYLE); Style &= ~ES_NUMBER; if (Parameter->bUpperCase) Style |= ES_UPPERCASE; else Style &= ~ES_UPPERCASE; - SetWindowLongPtr(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), GWL_STYLE, Style); + SetWindowLongPtr(hwndControl, GWL_STYLE, Style); - Edit_LimitText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->iLimitText); + Edit_LimitText(hwndControl, Parameter->iTextLimit); if (Parameter->pszValue) - Edit_SetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->pszValue); + Edit_SetText(hwndControl, Parameter->pszValue); else if (Parameter->pszDefault) - Edit_SetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->pszDefault); + Edit_SetText(hwndControl, Parameter->pszDefault); break; case ENUM_TYPE: ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), SW_HIDE); ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_UPDN), SW_HIDE); - ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST), SW_SHOW); + + hwndControl = GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST); + ShowWindow(hwndControl, SW_SHOW); + + ComboBox_ResetContent(hwndControl); + + if (Parameter->pEnumOptions != NULL && Parameter->dwEnumOptions != 0) + { + for (i = 0; i < Parameter->dwEnumOptions; i++) + { + ComboBox_AddString(hwndControl, Parameter->pEnumOptions[i].pszName); + } + } if (Parameter->pszValue) - Edit_SetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->pszValue); + { + idx = FindEnumOption(Parameter, Parameter->pszValue); + if (idx != CB_ERR) + ComboBox_SetCurSel(hwndControl, idx); + } else if (Parameter->pszDefault) - Edit_SetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->pszDefault); + { + idx = FindEnumOption(Parameter, Parameter->pszDefault); + if (idx != CB_ERR) + ComboBox_SetCurSel(hwndControl, idx); + } break; default:

1 0

01/01: [USETUP] Add missing line jump
by Pierre Schweitzer 02 Oct '18

02 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a2e979f5530787ba7dd5… commit 6a2e979f5530787ba7dd5737a64a61af1f023632 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Oct 2 13:34:59 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Oct 2 13:34:59 2018 +0200 [USETUP] Add missing line jump --- base/setup/usetup/usetup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 944e8118e7..777b62ffef 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3642,7 +3642,7 @@ PrepareCopyPageInfFile(HINF InfFile, Status = SetupCreateDirectory(PathBuffer); if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) { - DPRINT1("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); + DPRINT1("Creating directory '%S' failed: Status = 0x%08lx\n", PathBuffer, Status); MUIDisplayError(ERROR_CREATE_INSTALL_DIR, Ir, POPUP_WAIT_ENTER); return FALSE; }

1 0

01/01: [NTOS:IO] Implement IopAcquireFileObjectLock and use it to fix IopLockFileObject
by Thomas Faber 02 Oct '18

02 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8fbc4880505a714b73936… commit 8fbc4880505a714b73936d04f974d0cc44ab069b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Oct 2 09:55:07 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Oct 2 09:56:55 2018 +0200 [NTOS:IO] Implement IopAcquireFileObjectLock and use it to fix IopLockFileObject --- ntoskrnl/include/internal/io.h | 9 ++++ ntoskrnl/include/internal/io_x.h | 30 +++++++++---- ntoskrnl/io/iomgr/file.c | 57 ++++++++++++++++++++++-- ntoskrnl/io/iomgr/iofunc.c | 96 ++++++++++++++++++++++++++++++++++------ 4 files changed, 167 insertions(+), 25 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 83fe7ce3c7..97df17f2ea 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1238,6 +1238,15 @@ IopCloseFile( IN ULONG SystemHandleCount ); +NTSTATUS +NTAPI +IopAcquireFileObjectLock( + _In_ PFILE_OBJECT FileObject, + _In_ KPROCESSOR_MODE AccessMode, + _In_ BOOLEAN Alertable, + _Out_ PBOOLEAN LockFailed +); + PVOID NTAPI IoGetFileObjectFilterContext( diff --git a/ntoskrnl/include/internal/io_x.h b/ntoskrnl/include/internal/io_x.h index 7e0d028d94..7cf42e9dc0 100644 --- a/ntoskrnl/include/internal/io_x.h +++ b/ntoskrnl/include/internal/io_x.h @@ -8,16 +8,26 @@ static __inline -VOID -IopLockFileObject(IN PFILE_OBJECT FileObject) +NTSTATUS +IopLockFileObject( + _In_ PFILE_OBJECT FileObject, + _In_ KPROCESSOR_MODE WaitMode) { + BOOLEAN LockFailed; + /* Lock the FO and check for contention */ - InterlockedIncrement((PLONG)&FileObject->Waiters); - while (InterlockedCompareExchange((PLONG)&FileObject->Busy, TRUE, FALSE) != FALSE) + if (InterlockedExchange((PLONG)&FileObject->Busy, TRUE) == FALSE) + { + ObReferenceObject(FileObject); + return STATUS_SUCCESS; + } + else { - /* FIXME - pause for a little while? */ + return IopAcquireFileObjectLock(FileObject, + WaitMode, + BooleanFlagOn(FileObject->Flags, FO_ALERTABLE_IO), + &LockFailed); } - InterlockedDecrement((PLONG)&FileObject->Waiters); } static @@ -26,8 +36,12 @@ VOID IopUnlockFileObject(IN PFILE_OBJECT FileObject) { /* Unlock the FO and wake any waiters up */ - InterlockedExchange((PLONG)&FileObject->Busy, FALSE); - if (FileObject->Waiters) KeSetEvent(&FileObject->Lock, 0, FALSE); + NT_VERIFY(InterlockedExchange((PLONG)&FileObject->Busy, FALSE) == TRUE); + if (FileObject->Waiters) + { + KeSetEvent(&FileObject->Lock, IO_NO_INCREMENT, FALSE); + } + ObDereferenceObject(FileObject); } FORCEINLINE diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 1768bc29ca..6133c9e45d 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -1729,7 +1729,12 @@ IopGetSetSecurityObject(IN PVOID ObjectBody, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock the file object */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, ExGetPreviousMode()); + if (Status != STATUS_SUCCESS) + { + ObDereferenceObject(FileObject); + return Status; + } } else { @@ -2026,7 +2031,7 @@ IopCloseFile(IN PEPROCESS Process OPTIONAL, /* Check if this is a sync FO and lock it */ if (BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) { - IopLockFileObject(FileObject); + (VOID)IopLockFileObject(FileObject, KernelMode); } /* Go the FastIO path if possible, otherwise fall back to IRP */ @@ -2100,7 +2105,7 @@ IopCloseFile(IN PEPROCESS Process OPTIONAL, if (Process != NULL && BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) { - IopLockFileObject(FileObject); + (VOID)IopLockFileObject(FileObject, KernelMode); } /* Clear and set up Events */ @@ -2259,6 +2264,52 @@ IopQueryAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, return Status; } +NTSTATUS +NTAPI +IopAcquireFileObjectLock( + _In_ PFILE_OBJECT FileObject, + _In_ KPROCESSOR_MODE WaitMode, + _In_ BOOLEAN Alertable, + _Out_ PBOOLEAN LockFailed) +{ + NTSTATUS Status; + + PAGED_CODE(); + + InterlockedIncrement((PLONG)&FileObject->Waiters); + + Status = STATUS_SUCCESS; + do + { + if (!InterlockedExchange((PLONG)&FileObject->Busy, TRUE)) + { + break; + } + Status = KeWaitForSingleObject(&FileObject->Lock, + Executive, + WaitMode, + Alertable, + NULL); + } while (Status == STATUS_SUCCESS); + + InterlockedDecrement((PLONG)&FileObject->Waiters); + if (Status == STATUS_SUCCESS) + { + ObReferenceObject(FileObject); + *LockFailed = FALSE; + } + else + { + if (!FileObject->Busy && FileObject->Waiters) + { + KeSetEvent(&FileObject->Lock, IO_NO_INCREMENT, FALSE); + } + *LockFailed = TRUE; + } + + return Status; +} + PVOID NTAPI IoGetFileObjectFilterContext(IN PFILE_OBJECT FileObject) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index d119f851e1..2ee72479cf 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -334,7 +334,13 @@ IopDeviceFsIoControl(IN HANDLE DeviceHandle, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock it */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, PreviousMode); + if (Status != STATUS_SUCCESS) + { + if (EventObject) ObDereferenceObject(EventObject); + ObDereferenceObject(FileObject); + return Status; + } /* Remember to unlock later */ LockedForSynch = TRUE; @@ -666,7 +672,7 @@ IopQueryDeviceInformation(IN PFILE_OBJECT FileObject, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock it */ - IopLockFileObject(FileObject); + (void)IopLockFileObject(FileObject, KernelMode); /* Use File Object event */ KeClearEvent(&FileObject->Event); @@ -1221,7 +1227,7 @@ IoSetInformation(IN PFILE_OBJECT FileObject, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock it */ - IopLockFileObject(FileObject); + (void)IopLockFileObject(FileObject, KernelMode); /* Use File Object event */ KeClearEvent(&FileObject->Event); @@ -1431,7 +1437,12 @@ NtFlushBuffersFile(IN HANDLE FileHandle, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock it */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, PreviousMode); + if (Status != STATUS_SUCCESS) + { + ObDereferenceObject(FileObject); + return Status; + } } else { @@ -1579,7 +1590,13 @@ NtNotifyChangeDirectoryFile(IN HANDLE FileHandle, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock it */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, PreviousMode); + if (Status != STATUS_SUCCESS) + { + if (Event) ObDereferenceObject(Event); + ObDereferenceObject(FileObject); + return Status; + } LockedForSync = TRUE; } @@ -1779,7 +1796,13 @@ NtLockFile(IN HANDLE FileHandle, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock it */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, PreviousMode); + if (Status != STATUS_SUCCESS) + { + if (Event) ObDereferenceObject(Event); + ObDereferenceObject(FileObject); + return Status; + } LockedForSync = TRUE; } @@ -1972,7 +1995,14 @@ NtQueryDirectoryFile(IN HANDLE FileHandle, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock it */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, PreviousMode); + if (Status != STATUS_SUCCESS) + { + if (Event) ObDereferenceObject(Event); + ObDereferenceObject(FileObject); + if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB); + return Status; + } /* Remember to unlock later */ LockedForSynch = TRUE; @@ -2207,7 +2237,12 @@ NtQueryInformationFile(IN HANDLE FileHandle, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock it */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, PreviousMode); + if (Status != STATUS_SUCCESS) + { + ObDereferenceObject(FileObject); + return Status; + } /* Check if the caller just wants the position */ if (FileInformationClass == FilePositionInformation) @@ -2619,7 +2654,13 @@ NtReadFile(IN HANDLE FileHandle, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock the file object */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, PreviousMode); + if (Status != STATUS_SUCCESS) + { + if (EventObject) ObDereferenceObject(EventObject); + ObDereferenceObject(FileObject); + return Status; + } /* Check if we don't have a byte offset available */ if (!(ByteOffset) || @@ -2961,7 +3002,12 @@ NtSetInformationFile(IN HANDLE FileHandle, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock it */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, PreviousMode); + if (Status != STATUS_SUCCESS) + { + ObDereferenceObject(FileObject); + return Status; + } /* Check if the caller just wants the position */ if (FileInformationClass == FilePositionInformation) @@ -3411,7 +3457,12 @@ NtUnlockFile(IN HANDLE FileHandle, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock it */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, PreviousMode); + if (Status != STATUS_SUCCESS) + { + ObDereferenceObject(FileObject); + return Status; + } } else { @@ -3616,7 +3667,13 @@ NtWriteFile(IN HANDLE FileHandle, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock the file object */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, PreviousMode); + if (Status != STATUS_SUCCESS) + { + if (EventObject) ObDereferenceObject(EventObject); + ObDereferenceObject(FileObject); + return Status; + } /* Check if we don't have a byte offset available */ if (!(ByteOffset) || @@ -3897,7 +3954,12 @@ NtQueryVolumeInformationFile(IN HANDLE FileHandle, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock it */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, PreviousMode); + if (Status != STATUS_SUCCESS) + { + ObDereferenceObject(FileObject); + return Status; + } } else { @@ -4068,7 +4130,13 @@ NtSetVolumeInformationFile(IN HANDLE FileHandle, if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Lock it */ - IopLockFileObject(FileObject); + Status = IopLockFileObject(FileObject, PreviousMode); + if (Status != STATUS_SUCCESS) + { + ObDereferenceObject(FileObject); + if (TargetDeviceObject) ObDereferenceObject(TargetDeviceObject); + return Status; + } } else {

1 0

01/01: [NETCFGX] Network property page: Implement reading of configured settings. Editing and writing is not implemented yet.
by Eric Kohl 01 Oct '18

01 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6142174af35849b742f0… commit c6142174af35849b742f0cb65de398eea503f121 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Oct 1 21:15:24 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Oct 1 21:16:22 2018 +0200 [NETCFGX] Network property page: Implement reading of configured settings. Editing and writing is not implemented yet. --- dll/win32/netcfgx/lang/bg-BG.rc | 9 + dll/win32/netcfgx/lang/cs-CZ.rc | 9 + dll/win32/netcfgx/lang/da-DK.rc | 9 + dll/win32/netcfgx/lang/de-DE.rc | 9 + dll/win32/netcfgx/lang/el-GR.rc | 9 + dll/win32/netcfgx/lang/en-US.rc | 9 + dll/win32/netcfgx/lang/es-ES.rc | 9 + dll/win32/netcfgx/lang/fr-FR.rc | 9 + dll/win32/netcfgx/lang/he-IL.rc | 9 + dll/win32/netcfgx/lang/hu-HU.rc | 9 + dll/win32/netcfgx/lang/id-ID.rc | 9 + dll/win32/netcfgx/lang/it-IT.rc | 9 + dll/win32/netcfgx/lang/ja-JP.rc | 9 + dll/win32/netcfgx/lang/nl-NL.rc | 9 + dll/win32/netcfgx/lang/no-NO.rc | 9 + dll/win32/netcfgx/lang/pl-PL.rc | 9 + dll/win32/netcfgx/lang/ro-RO.rc | 9 + dll/win32/netcfgx/lang/ru-RU.rc | 9 + dll/win32/netcfgx/lang/sk-SK.rc | 9 + dll/win32/netcfgx/lang/sq-AL.rc | 9 + dll/win32/netcfgx/lang/sv-SE.rc | 9 + dll/win32/netcfgx/lang/tr-TR.rc | 9 + dll/win32/netcfgx/lang/uk-UA.rc | 9 + dll/win32/netcfgx/lang/zh-CN.rc | 9 + dll/win32/netcfgx/lang/zh-TW.rc | 9 + dll/win32/netcfgx/precomp.h | 1 + dll/win32/netcfgx/propertypage.c | 457 ++++++++++++++++++++++++++++++++++++++- dll/win32/netcfgx/resource.h | 7 + 28 files changed, 683 insertions(+), 7 deletions(-) diff --git a/dll/win32/netcfgx/lang/bg-BG.rc b/dll/win32/netcfgx/lang/bg-BG.rc index 03b8e8a043..bd32f6909c 100644 --- a/dll/win32/netcfgx/lang/bg-BG.rc +++ b/dll/win32/netcfgx/lang/bg-BG.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/cs-CZ.rc b/dll/win32/netcfgx/lang/cs-CZ.rc index 007a4e1dee..073c80c6ed 100644 --- a/dll/win32/netcfgx/lang/cs-CZ.rc +++ b/dll/win32/netcfgx/lang/cs-CZ.rc @@ -206,6 +206,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/da-DK.rc b/dll/win32/netcfgx/lang/da-DK.rc index 5c0d0a5ac7..bb9fd14bac 100644 --- a/dll/win32/netcfgx/lang/da-DK.rc +++ b/dll/win32/netcfgx/lang/da-DK.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/de-DE.rc b/dll/win32/netcfgx/lang/de-DE.rc index 19479ceac5..f81f50bdb3 100644 --- a/dll/win32/netcfgx/lang/de-DE.rc +++ b/dll/win32/netcfgx/lang/de-DE.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Erweitert" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Folgende Eigenschaften sind für diesen Netzwerkadapter verfügbar. Klicken Sie links auf die Eigenschaft, die geändert werden soll, und wählen Sie den Wert auf der rechten Seite aus.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Eigenschaft:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Wert:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Nicht vorhanden", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/el-GR.rc b/dll/win32/netcfgx/lang/el-GR.rc index 3bb1fc04e7..bbb34b01f4 100644 --- a/dll/win32/netcfgx/lang/el-GR.rc +++ b/dll/win32/netcfgx/lang/el-GR.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/en-US.rc b/dll/win32/netcfgx/lang/en-US.rc index feea1713ac..2c29dcbda2 100644 --- a/dll/win32/netcfgx/lang/en-US.rc +++ b/dll/win32/netcfgx/lang/en-US.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/es-ES.rc b/dll/win32/netcfgx/lang/es-ES.rc index 6ea5be2a73..950015b1ff 100644 --- a/dll/win32/netcfgx/lang/es-ES.rc +++ b/dll/win32/netcfgx/lang/es-ES.rc @@ -202,6 +202,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc index b696364a18..eb29c4b294 100644 --- a/dll/win32/netcfgx/lang/fr-FR.rc +++ b/dll/win32/netcfgx/lang/fr-FR.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/he-IL.rc b/dll/win32/netcfgx/lang/he-IL.rc index 34716189bd..056affbb53 100644 --- a/dll/win32/netcfgx/lang/he-IL.rc +++ b/dll/win32/netcfgx/lang/he-IL.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/hu-HU.rc b/dll/win32/netcfgx/lang/hu-HU.rc index d89e15db9a..6fe00e2a77 100644 --- a/dll/win32/netcfgx/lang/hu-HU.rc +++ b/dll/win32/netcfgx/lang/hu-HU.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/id-ID.rc b/dll/win32/netcfgx/lang/id-ID.rc index 5bf8d0ba8b..bc341c134e 100644 --- a/dll/win32/netcfgx/lang/id-ID.rc +++ b/dll/win32/netcfgx/lang/id-ID.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/it-IT.rc b/dll/win32/netcfgx/lang/it-IT.rc index 1be24d196f..a5af3dc350 100644 --- a/dll/win32/netcfgx/lang/it-IT.rc +++ b/dll/win32/netcfgx/lang/it-IT.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/ja-JP.rc b/dll/win32/netcfgx/lang/ja-JP.rc index f546e31715..242fab9325 100644 --- a/dll/win32/netcfgx/lang/ja-JP.rc +++ b/dll/win32/netcfgx/lang/ja-JP.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/nl-NL.rc b/dll/win32/netcfgx/lang/nl-NL.rc index 299c0fe5bb..dd893c8061 100644 --- a/dll/win32/netcfgx/lang/nl-NL.rc +++ b/dll/win32/netcfgx/lang/nl-NL.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/no-NO.rc b/dll/win32/netcfgx/lang/no-NO.rc index 4b6b0d54ed..96f254bf6a 100644 --- a/dll/win32/netcfgx/lang/no-NO.rc +++ b/dll/win32/netcfgx/lang/no-NO.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/pl-PL.rc b/dll/win32/netcfgx/lang/pl-PL.rc index 8ea8cf18d8..5bd9bf8995 100644 --- a/dll/win32/netcfgx/lang/pl-PL.rc +++ b/dll/win32/netcfgx/lang/pl-PL.rc @@ -207,6 +207,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc index 299eaec46e..97f9869328 100644 --- a/dll/win32/netcfgx/lang/ro-RO.rc +++ b/dll/win32/netcfgx/lang/ro-RO.rc @@ -206,6 +206,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc index cfecc1b962..4437d73127 100644 --- a/dll/win32/netcfgx/lang/ru-RU.rc +++ b/dll/win32/netcfgx/lang/ru-RU.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/sk-SK.rc b/dll/win32/netcfgx/lang/sk-SK.rc index 7ea1f8eb4f..38ba38296a 100644 --- a/dll/win32/netcfgx/lang/sk-SK.rc +++ b/dll/win32/netcfgx/lang/sk-SK.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/sq-AL.rc b/dll/win32/netcfgx/lang/sq-AL.rc index 261a22a088..694945b1a6 100644 --- a/dll/win32/netcfgx/lang/sq-AL.rc +++ b/dll/win32/netcfgx/lang/sq-AL.rc @@ -205,6 +205,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/sv-SE.rc b/dll/win32/netcfgx/lang/sv-SE.rc index dd2c3502d1..3ab171db76 100644 --- a/dll/win32/netcfgx/lang/sv-SE.rc +++ b/dll/win32/netcfgx/lang/sv-SE.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/tr-TR.rc b/dll/win32/netcfgx/lang/tr-TR.rc index 3dcaa7a889..ad6db04169 100644 --- a/dll/win32/netcfgx/lang/tr-TR.rc +++ b/dll/win32/netcfgx/lang/tr-TR.rc @@ -202,6 +202,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/uk-UA.rc b/dll/win32/netcfgx/lang/uk-UA.rc index c4a0d1d37c..ac53abf3df 100644 --- a/dll/win32/netcfgx/lang/uk-UA.rc +++ b/dll/win32/netcfgx/lang/uk-UA.rc @@ -200,6 +200,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/zh-CN.rc b/dll/win32/netcfgx/lang/zh-CN.rc index 755762a2f1..54b030f174 100644 --- a/dll/win32/netcfgx/lang/zh-CN.rc +++ b/dll/win32/netcfgx/lang/zh-CN.rc @@ -208,6 +208,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc index 82f1cc5238..b60cf4857a 100644 --- a/dll/win32/netcfgx/lang/zh-TW.rc +++ b/dll/win32/netcfgx/lang/zh-TW.rc @@ -208,6 +208,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + RADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP END STRINGTABLE diff --git a/dll/win32/netcfgx/precomp.h b/dll/win32/netcfgx/precomp.h index b8c69a583e..ed736aea49 100644 --- a/dll/win32/netcfgx/precomp.h +++ b/dll/win32/netcfgx/precomp.h @@ -14,6 +14,7 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> +#include <windowsx.h> #include <objbase.h> #include <netcfgx.h> #include <setupapi.h> diff --git a/dll/win32/netcfgx/propertypage.c b/dll/win32/netcfgx/propertypage.c index 65f667835b..fe9f48f852 100644 --- a/dll/win32/netcfgx/propertypage.c +++ b/dll/win32/netcfgx/propertypage.c @@ -7,6 +7,441 @@ #include "precomp.h" +typedef enum _PARAM_TYPE +{ + NO_TYPE, + INT_TYPE, + LONG_TYPE, + WORD_TYPE, + DWORD_TYPE, + EDIT_TYPE, + ENUM_TYPE, +} PARAM_TYPE, *PPARAM_TYPE; + +typedef struct _PARAMETER +{ + PWSTR pszName; + PWSTR pszDescription; + PWSTR pszValue; + PWSTR pszDefault; + PARAM_TYPE Type; + BOOL bUpperCase; + BOOL bOptional; + INT iLimitText; + +} PARAMETER, *PPARAMETER; + +typedef struct _PARAMETER_ARRAY +{ + DWORD dwCount; + PARAMETER Array[0]; +} PARAMETER_ARRAY, *PPARAMETER_ARRAY; + + +static +VOID +FreeParameterArray( + _In_ PPARAMETER_ARRAY ParamArray) +{ + INT i; + + if (ParamArray == NULL) + return; + + for (i = 0; i < ParamArray->dwCount; i++) + { + if (ParamArray->Array[i].pszName != NULL) + HeapFree(GetProcessHeap(), 0, ParamArray->Array[i].pszName); + + if (ParamArray->Array[i].pszDescription != NULL) + HeapFree(GetProcessHeap(), 0, ParamArray->Array[i].pszDescription); + + if (ParamArray->Array[i].pszDefault != NULL) + HeapFree(GetProcessHeap(), 0, ParamArray->Array[i].pszDefault); + + } + + HeapFree(GetProcessHeap(), 0, ParamArray); +} + + +static DWORD +GetValueString( + IN HKEY hKey, + IN LPWSTR lpValueName, + OUT LPWSTR *lpString) +{ + LPWSTR lpBuffer; + DWORD dwLength = 0; + DWORD dwRegType; + DWORD rc; + + *lpString = NULL; + + RegQueryValueExW(hKey, lpValueName, NULL, &dwRegType, NULL, &dwLength); + + if (dwLength == 0 || dwRegType != REG_SZ) + return ERROR_FILE_NOT_FOUND; + + lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(WCHAR)); + if (lpBuffer == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + rc = RegQueryValueExW(hKey, lpValueName, NULL, NULL, (LPBYTE)lpBuffer, &dwLength); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, lpBuffer); + return rc; + } + + lpBuffer[dwLength / sizeof(WCHAR)] = UNICODE_NULL; + + *lpString = lpBuffer; + + return ERROR_SUCCESS; +} + + +static +BOOL +BuildParameterArray( + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData, + _Out_ PPARAMETER_ARRAY *ParameterArray) +{ + HKEY hDriverKey = INVALID_HANDLE_VALUE; + HKEY hParamsKey = INVALID_HANDLE_VALUE; + HKEY hParamKey; + PPARAMETER_ARRAY ParamArray = NULL; + DWORD dwSubKeys, dwMaxSubKeyLen, dwKeyLen, dwIndex; + PWSTR pszType = NULL; + LONG lError; + BOOL ret = FALSE; + + hDriverKey = SetupDiOpenDevRegKey(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + KEY_READ); + if (hDriverKey == INVALID_HANDLE_VALUE) + { + ERR("SetupDiOpenDevRegKey() failed\n"); + return FALSE; + } + + lError = RegOpenKeyExW(hDriverKey, + L"Ndi\\Params", + 0, + KEY_READ, + &hParamsKey); + if (lError != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed (Error %lu)\n", lError); + goto done; + } + + lError = RegQueryInfoKeyW(hParamsKey, + NULL, + NULL, + NULL, + &dwSubKeys, + &dwMaxSubKeyLen, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL); + if (lError != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed (Error %lu)\n", lError); + goto done; + } + + FIXME("Sub keys: %lu\n", dwSubKeys); + + if (dwSubKeys == 0) + { + TRACE("No sub keys. Done!\n"); + goto done; + } + + ParamArray = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PARAMETER_ARRAY) + (dwSubKeys * sizeof(PARAMETER))); + if (ParamArray == NULL) + { + ERR("Parameter array allocation failed!\n"); + goto done; + } + + ParamArray->dwCount = dwSubKeys; + + dwMaxSubKeyLen++; + + for (dwIndex = 0; dwIndex < dwSubKeys; dwIndex++) + { + ParamArray->Array[dwIndex].pszName = HeapAlloc(GetProcessHeap(), + 0, + dwMaxSubKeyLen * sizeof(WCHAR)); + if (ParamArray->Array[dwIndex].pszName == NULL) + { + ERR("Parameter array allocation failed!\n"); + goto done; + } + + dwKeyLen = dwMaxSubKeyLen; + lError = RegEnumKeyExW(hParamsKey, + dwIndex, + ParamArray->Array[dwIndex].pszName, + &dwKeyLen, + NULL, + NULL, + NULL, + NULL); + if (lError != ERROR_SUCCESS) + break; + + FIXME("Sub key '%S'\n", ParamArray->Array[dwIndex].pszName); + + lError = RegOpenKeyExW(hParamsKey, + ParamArray->Array[dwIndex].pszName, + 0, + KEY_READ, + &hParamKey); + if (lError == ERROR_SUCCESS) + { + GetValueString(hParamKey, + L"ParamDesc", + &ParamArray->Array[dwIndex].pszDescription); + + GetValueString(hParamKey, + L"Type", + &pszType); + if (pszType != NULL) + { + if (_wcsicmp(pszType, L"int") == 0) + ParamArray->Array[dwIndex].Type = INT_TYPE; + else if (_wcsicmp(pszType, L"long") == 0) + ParamArray->Array[dwIndex].Type = LONG_TYPE; + else if (_wcsicmp(pszType, L"word") == 0) + ParamArray->Array[dwIndex].Type = WORD_TYPE; + else if (_wcsicmp(pszType, L"dword") == 0) + ParamArray->Array[dwIndex].Type = DWORD_TYPE; + else if (_wcsicmp(pszType, L"edit") == 0) + ParamArray->Array[dwIndex].Type = EDIT_TYPE; + else if (_wcsicmp(pszType, L"enum") == 0) + ParamArray->Array[dwIndex].Type = ENUM_TYPE; + else + ParamArray->Array[dwIndex].Type = NO_TYPE; + + HeapFree(GetProcessHeap(), 0, pszType); + pszType = NULL; + } + + GetValueString(hParamKey, + L"Default", + &ParamArray->Array[dwIndex].pszDefault); + + ParamArray->Array[dwIndex].bUpperCase = FALSE; + ParamArray->Array[dwIndex].bOptional = FALSE; + ParamArray->Array[dwIndex].iLimitText = 0; + + RegCloseKey(hParamKey); + } + + GetValueString(hDriverKey, + ParamArray->Array[dwIndex].pszName, + &ParamArray->Array[dwIndex].pszValue); + } + + *ParameterArray = ParamArray; + ret = TRUE; + +done: + if (ret == FALSE && ParamArray != NULL) + FreeParameterArray(ParamArray); + + if (hParamsKey != INVALID_HANDLE_VALUE) + RegCloseKey(hParamsKey); + + if (hDriverKey != INVALID_HANDLE_VALUE) + RegCloseKey(hDriverKey); + + return ret; +} + + +static +VOID +DisplayParameter( + HWND hwnd, + PPARAMETER Parameter) +{ + LONG_PTR Style; + + ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_PRESENT), (Parameter->bOptional) ? SW_SHOW : SW_HIDE); + ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_NOT_PRESENT), (Parameter->bOptional) ? SW_SHOW : SW_HIDE); + + switch (Parameter->Type) + { + case INT_TYPE: + case LONG_TYPE: + case WORD_TYPE: + case DWORD_TYPE: + ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), SW_SHOW); + ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_UPDN), SW_SHOW); + ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST), SW_HIDE); + + Style = GetWindowLongPtr(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), GWL_STYLE); + Style |= ES_NUMBER; + SetWindowLongPtr(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), GWL_STYLE, Style); + + Edit_LimitText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), 0); + + if (Parameter->pszValue) + Edit_SetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->pszValue); + else if (Parameter->pszDefault) + Edit_SetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->pszDefault); + break; + + case EDIT_TYPE: + ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), SW_SHOW); + ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_UPDN), SW_HIDE); + ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST), SW_HIDE); + + Style = GetWindowLongPtr(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), GWL_STYLE); + Style &= ~ES_NUMBER; + if (Parameter->bUpperCase) + Style |= ES_UPPERCASE; + else + Style &= ~ES_UPPERCASE; + SetWindowLongPtr(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), GWL_STYLE, Style); + + Edit_LimitText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->iLimitText); + + if (Parameter->pszValue) + Edit_SetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->pszValue); + else if (Parameter->pszDefault) + Edit_SetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->pszDefault); + break; + + case ENUM_TYPE: + ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), SW_HIDE); + ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_UPDN), SW_HIDE); + ShowWindow(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_LIST), SW_SHOW); + + if (Parameter->pszValue) + Edit_SetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->pszValue); + else if (Parameter->pszDefault) + Edit_SetText(GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT), Parameter->pszDefault); + break; + + default: + break; + } +} + + +static +BOOL +OnInitDialog( + HWND hwnd, + WPARAM wParam, + LPARAM lParam) +{ + PPARAMETER_ARRAY pParamArray; + HWND hwndControl; + PWSTR pszText; + DWORD i; + + FIXME("OnInitDialog()\n"); + + pParamArray = (PPARAMETER_ARRAY)((LPPROPSHEETPAGEW)lParam)->lParam; + if (pParamArray == NULL) + { + ERR("pParamArray is NULL\n"); + return FALSE; + } + + SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)pParamArray); + + hwndControl = GetDlgItem(hwnd, IDC_PROPERTY_NAME); + if (hwndControl) + { + for (i = 0; i < pParamArray->dwCount; i++) + { + if (pParamArray->Array[i].pszDescription != NULL) + pszText = pParamArray->Array[i].pszDescription; + else + pszText = pParamArray->Array[i].pszName; + + ListBox_AddString(hwndControl, pszText); + } + + if (pParamArray->dwCount > 0) + { + ListBox_SetCurSel(hwndControl, 0); + DisplayParameter(hwnd, &pParamArray->Array[0]); + } + } + + return TRUE; +} + + +static +VOID +OnCommand( + HWND hwnd, + WPARAM wParam, + LPARAM lParam) +{ + PPARAMETER_ARRAY pParamArray; + INT iIndex; + + TRACE("OnCommand()\n"); + + pParamArray = (PPARAMETER_ARRAY)GetWindowLongPtr(hwnd, DWLP_USER); + if (pParamArray == NULL) + { + ERR("pParamArray is NULL\n"); + return; + } + + if ((LOWORD(wParam) == IDC_PROPERTY_NAME) && (HIWORD(wParam) == LBN_SELCHANGE)) + { + iIndex = ListBox_GetCurSel((HWND)lParam); + if (iIndex != LB_ERR && iIndex < pParamArray->dwCount) + { + DisplayParameter(hwnd, &pParamArray->Array[iIndex]); + } + } +} + + +static +VOID +OnDestroy( + HWND hwnd) +{ + PPARAMETER_ARRAY pParamArray; + + FIXME("OnDestroy()\n"); + + pParamArray = (PPARAMETER_ARRAY)GetWindowLongPtr(hwnd, DWLP_USER); + if (pParamArray == NULL) + { + ERR("pParamArray is NULL\n"); + return; + } + + FreeParameterArray(pParamArray); + SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)NULL); +} + + static INT_PTR CALLBACK @@ -19,13 +454,15 @@ NetPropertyPageDlgProc( switch (uMsg) { case WM_INITDIALOG: - ERR("NetPropertyPageDlgProc: WM_INITDIALOG\n"); - return TRUE; -// return OnInitDialog(hwnd, wParam, lParam); + return OnInitDialog(hwnd, wParam, lParam); -// case WM_DESTROY: -// OnDestroy(hwnd); -// break; + case WM_COMMAND: + OnCommand(hwnd, wParam, lParam); + break; + + case WM_DESTROY: + OnDestroy(hwnd); + break; default: break; @@ -44,10 +481,16 @@ NetPropPageProvider( { PROPSHEETPAGEW PropSheetPage; HPROPSHEETPAGE hPropSheetPage; + PPARAMETER_ARRAY ParameterArray = NULL; ERR("NetPropPageProvider(%p %p %lx)\n", lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + if (!BuildParameterArray(lpPropSheetPageRequest->DeviceInfoSet, + lpPropSheetPageRequest->DeviceInfoData, + &ParameterArray)) + return FALSE; + if (lpPropSheetPageRequest->PageRequested == SPPSR_ENUM_ADV_DEVICE_PROPERTIES) { ERR("SPPSR_ENUM_ADV_DEVICE_PROPERTIES\n"); @@ -57,7 +500,7 @@ NetPropPageProvider( PropSheetPage.hInstance = netcfgx_hInstance; PropSheetPage.u.pszTemplate = MAKEINTRESOURCE(IDD_NET_PROPERTY_DLG); PropSheetPage.pfnDlgProc = NetPropertyPageDlgProc; - PropSheetPage.lParam = 0; + PropSheetPage.lParam = (LPARAM)ParameterArray; PropSheetPage.pfnCallback = NULL; hPropSheetPage = CreatePropertySheetPageW(&PropSheetPage); diff --git a/dll/win32/netcfgx/resource.h b/dll/win32/netcfgx/resource.h index cb32ceb787..ac58a2234c 100644 --- a/dll/win32/netcfgx/resource.h +++ b/dll/win32/netcfgx/resource.h @@ -83,6 +83,13 @@ #define IDC_PORT_DESC 7016 #define IDC_PORT_VAL 7017 +#define IDC_PROPERTY_NAME 7100 +#define IDC_PROPERTY_VALUE_EDIT 7101 +#define IDC_PROPERTY_VALUE_UPDN 7102 +#define IDC_PROPERTY_VALUE_LIST 7103 +#define IDC_PROPERTY_PRESENT 7104 +#define IDC_PROPERTY_NOT_PRESENT 7105 + /* strings */ #define IDS_NET_CONNECT 8000 #define IDS_NO_IPADDR_SET 8001

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2018