Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

03/05: [NTOSKRNL] Use interlocked operations when dealing with map count.
by Pierre Schweitzer 15 Apr '18

15 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40017a54f958093ee6a12… commit 40017a54f958093ee6a12cd73412aedbe44f0ea1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 8 18:58:15 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 15 22:52:53 2018 +0200 [NTOSKRNL] Use interlocked operations when dealing with map count. CORE-14349 --- ntoskrnl/cc/view.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 1ec4c35b1f..cde1c2d6fa 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -344,7 +344,7 @@ retry: CcRosVacbIncRefCount(current); /* Check if it's mapped and not dirty */ - if (current->MappedCount > 0 && !current->Dirty) + if (InterlockedCompareExchange((PLONG)&current->MappedCount, 0, 0) > 0 && !current->Dirty) { /* We have to break these locks because Cc sucks */ KeReleaseSpinLock(&current->SharedCacheMap->CacheMapLock, oldIrql); @@ -448,14 +448,13 @@ CcRosReleaseVacb ( if (Mapped) { - Vacb->MappedCount++; - } - Refs = CcRosVacbDecRefCount(Vacb); - if (Mapped && (Vacb->MappedCount == 1)) - { - CcRosVacbIncRefCount(Vacb); + if (InterlockedIncrement((PLONG)&Vacb->MappedCount) == 1) + { + CcRosVacbIncRefCount(Vacb); + } } + Refs = CcRosVacbDecRefCount(Vacb); ASSERT(Refs > 0); CcRosReleaseVacbLock(Vacb); @@ -630,9 +629,7 @@ CcRosUnmapVacb ( } ASSERT(Vacb->MappedCount != 0); - Vacb->MappedCount--; - - if (Vacb->MappedCount == 0) + if (InterlockedDecrement((PLONG)&Vacb->MappedCount) == 0) { CcRosVacbDecRefCount(Vacb); }

1 0

02/05: [NTOSKRNL] Map the VACB in kernel space before inserting it in lists. The avoids race conditions where attempts to read from disk to not fully initialized VACB were performed. Also, added more debug prints in such situations.
by Pierre Schweitzer 15 Apr '18

15 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b672981e2d2c5bd3d679… commit 1b672981e2d2c5bd3d679b9f4adbb6e829075339 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 8 18:45:38 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 15 22:52:53 2018 +0200 [NTOSKRNL] Map the VACB in kernel space before inserting it in lists. The avoids race conditions where attempts to read from disk to not fully initialized VACB were performed. Also, added more debug prints in such situations. CORE-14349 --- ntoskrnl/cc/copy.c | 2 ++ ntoskrnl/cc/view.c | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index c39b2148ec..a70e0ab766 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -110,6 +110,7 @@ CcReadVirtualAddress ( _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); + DPRINT1("MmProbeAndLockPages failed with: %lx for %p (%p, %p)\n", Status, Mdl, Vacb, Vacb->BaseAddress); KeBugCheck(CACHE_MANAGER); } _SEH2_END; @@ -186,6 +187,7 @@ CcWriteVirtualAddress ( _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); + DPRINT1("MmProbeAndLockPages failed with: %lx for %p (%p, %p)\n", Status, Mdl, Vacb, Vacb->BaseAddress); KeBugCheck(CACHE_MANAGER); } _SEH2_END; diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index c835a03a8e..1ec4c35b1f 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -752,6 +752,17 @@ CcRosCreateVacb ( InitializeListHead(&current->CacheMapVacbListEntry); InitializeListHead(&current->DirtyVacbListEntry); InitializeListHead(&current->VacbLruListEntry); + + CcRosVacbIncRefCount(current); + + Status = CcRosMapVacbInKernelSpace(current); + if (!NT_SUCCESS(Status)) + { + CcRosVacbDecRefCount(current); + ExFreeToNPagedLookasideList(&VacbLookasideList, current); + return Status; + } + CcRosAcquireVacbLock(current, NULL); KeAcquireGuardedMutex(&ViewLock); @@ -784,9 +795,10 @@ CcRosCreateVacb ( current); } #endif + CcRosVacbDecRefCount(*Vacb); CcRosReleaseVacbLock(*Vacb); KeReleaseGuardedMutex(&ViewLock); - ExFreeToNPagedLookasideList(&VacbLookasideList, *Vacb); + CcRosInternalFreeVacb(*Vacb); *Vacb = current; CcRosAcquireVacbLock(current, NULL); return STATUS_SUCCESS; @@ -813,7 +825,6 @@ CcRosCreateVacb ( } KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); InsertTailList(&VacbLruListHead, &current->VacbLruListEntry); - CcRosVacbIncRefCount(current); KeReleaseGuardedMutex(&ViewLock); MI_SET_USAGE(MI_USAGE_CACHE); @@ -838,17 +849,6 @@ CcRosCreateVacb ( /* Reference it to allow release */ CcRosVacbIncRefCount(current); - Status = CcRosMapVacbInKernelSpace(current); - if (!NT_SUCCESS(Status)) - { - RemoveEntryList(&current->CacheMapVacbListEntry); - RemoveEntryList(&current->VacbLruListEntry); - CcRosReleaseVacb(SharedCacheMap, current, FALSE, - FALSE, FALSE); - CcRosVacbDecRefCount(current); - ExFreeToNPagedLookasideList(&VacbLookasideList, current); - } - return Status; }

1 0

01/05: [NTOSKRNL] Add extra sanity checks for VACB lists. We now always initialize list members from the VACB and make sure the list entry has properly been removed from the list before free.
by Pierre Schweitzer 15 Apr '18

15 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42df4683d7f3b66aa49cf… commit 42df4683d7f3b66aa49cf678002055c87e539849 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 8 18:34:00 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 15 22:52:53 2018 +0200 [NTOSKRNL] Add extra sanity checks for VACB lists. We now always initialize list members from the VACB and make sure the list entry has properly been removed from the list before free. CORE-14349 --- ntoskrnl/cc/fs.c | 2 ++ ntoskrnl/cc/view.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index 2ab7b5f8ea..31b7ec6bac 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -238,6 +238,7 @@ CcPurgeCacheSection ( /* This VACB is in range, so unlink it and mark for free */ ASSERT(Refs == 1 || Vacb->Dirty); RemoveEntryList(&Vacb->VacbLruListEntry); + InitializeListHead(&Vacb->VacbLruListEntry); if (Vacb->Dirty) { CcRosUnmarkDirtyVacb(Vacb, FALSE); @@ -253,6 +254,7 @@ CcPurgeCacheSection ( Vacb = CONTAINING_RECORD(RemoveHeadList(&FreeList), ROS_VACB, CacheMapVacbListEntry); + InitializeListHead(&Vacb->CacheMapVacbListEntry); CcRosVacbDecRefCount(Vacb); CcRosInternalFreeVacb(Vacb); } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index ba87c5e510..c835a03a8e 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -375,6 +375,7 @@ retry: RemoveEntryList(&current->CacheMapVacbListEntry); RemoveEntryList(&current->VacbLruListEntry); + InitializeListHead(&current->VacbLruListEntry); InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); /* Calculate how many pages we freed for Mm */ @@ -413,6 +414,7 @@ retry: current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); + InitializeListHead(&current->CacheMapVacbListEntry); CcRosVacbDecRefCount(current); CcRosInternalFreeVacb(current); } @@ -567,6 +569,7 @@ CcRosUnmarkDirtyVacb ( Vacb->Dirty = FALSE; RemoveEntryList(&Vacb->DirtyVacbListEntry); + InitializeListHead(&Vacb->DirtyVacbListEntry); CcTotalDirtyPages -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; Vacb->SharedCacheMap->DirtyPages -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; CcRosVacbDecRefCount(Vacb); @@ -743,11 +746,12 @@ CcRosCreateVacb ( } #endif current->MappedCount = 0; - current->DirtyVacbListEntry.Flink = NULL; - current->DirtyVacbListEntry.Blink = NULL; current->ReferenceCount = 0; current->PinCount = 0; KeInitializeMutex(&current->Mutex, 0); + InitializeListHead(&current->CacheMapVacbListEntry); + InitializeListHead(&current->DirtyVacbListEntry); + InitializeListHead(&current->VacbLruListEntry); CcRosAcquireVacbLock(current, NULL); KeAcquireGuardedMutex(&ViewLock); @@ -988,6 +992,9 @@ CcRosInternalFreeVacb ( ASSERT(Vacb->PinCount == 0); ASSERT(Vacb->ReferenceCount == 0); + ASSERT(IsListEmpty(&Vacb->CacheMapVacbListEntry)); + ASSERT(IsListEmpty(&Vacb->DirtyVacbListEntry)); + ASSERT(IsListEmpty(&Vacb->VacbLruListEntry)); RtlFillMemory(Vacb, sizeof(Vacb), 0xfd); ExFreeToNPagedLookasideList(&VacbLookasideList, Vacb); return STATUS_SUCCESS; @@ -1109,6 +1116,7 @@ CcRosDeleteFileCache ( current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); CcRosAcquireVacbLock(current, NULL); RemoveEntryList(&current->VacbLruListEntry); + InitializeListHead(&current->VacbLruListEntry); if (current->Dirty) { KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); @@ -1133,6 +1141,7 @@ CcRosDeleteFileCache ( { current_entry = RemoveTailList(&FreeList); current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); + InitializeListHead(&current->CacheMapVacbListEntry); CcRosVacbDecRefCount(current); CcRosInternalFreeVacb(current); }

1 0

01/01: [NTOS:MM] Do not map two pages into hyperspace in MiCopyFromUserPage. CORE-14548
by Thomas Faber 15 Apr '18

15 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b54e5c689c97cab907c77… commit b54e5c689c97cab907c77c47d26a8e93e38b1f9b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Apr 15 19:42:18 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Apr 15 20:07:21 2018 +0200 [NTOS:MM] Do not map two pages into hyperspace in MiCopyFromUserPage. CORE-14548 Doing this is not only wrong because it acquires the same spinlock twice, it also completely breaks the TLB flushing logic in MiMapPageInHyperSpace. If the PTE with Offset 1 is still valid when a wrap-around to 0 happens, the TLB flush on wrap-around will not clear the entry for this previous page. After another loop around all hyperspace pages, page 1 is re-used but its TLB entry has not been flushed, which may result into incorrect translation. --- ntoskrnl/include/internal/mm.h | 4 ++-- ntoskrnl/mm/section.c | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index d5094e0915..8d0234b4aa 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -757,8 +757,8 @@ MmAccessFault( NTSTATUS NTAPI MiCopyFromUserPage( - PFN_NUMBER NewPage, - PFN_NUMBER OldPage + PFN_NUMBER DestPage, + const VOID *SrcAddress ); /* process.c *****************************************************************/ diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index b588f1c617..e79ff5f07b 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1040,23 +1040,21 @@ BOOLEAN MiIsPageFromCache(PMEMORY_AREA MemoryArea, NTSTATUS NTAPI -MiCopyFromUserPage(PFN_NUMBER DestPage, PFN_NUMBER SrcPage) +MiCopyFromUserPage(PFN_NUMBER DestPage, const VOID *SrcAddress) { PEPROCESS Process; - KIRQL Irql, Irql2; - PVOID DestAddress, SrcAddress; + KIRQL Irql; + PVOID DestAddress; Process = PsGetCurrentProcess(); DestAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); - SrcAddress = MiMapPageInHyperSpace(Process, SrcPage, &Irql2); - if (DestAddress == NULL || SrcAddress == NULL) + if (DestAddress == NULL) { return(STATUS_NO_MEMORY); } ASSERT((ULONG_PTR)DestAddress % PAGE_SIZE == 0); ASSERT((ULONG_PTR)SrcAddress % PAGE_SIZE == 0); RtlCopyMemory(DestAddress, SrcAddress, PAGE_SIZE); - MiUnmapPageInHyperSpace(Process, SrcAddress, Irql2); MiUnmapPageInHyperSpace(Process, DestAddress, Irql); return(STATUS_SUCCESS); } @@ -1781,7 +1779,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, /* * Copy the old page */ - MiCopyFromUserPage(NewPage, OldPage); + NT_VERIFY(NT_SUCCESS(MiCopyFromUserPage(NewPage, PAddress))); /* * Unshare the old page.

1 0

01/01: [ZIPFLDR] Add Chinese(Simplified) translation
by Li Keqing 15 Apr '18

15 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee8d82f29daba5497da0b… commit ee8d82f29daba5497da0b8a067ffb6472d00d68f Author: Li Keqing <auroracloud4096(a)gmail.com> AuthorDate: Sun Apr 15 20:45:31 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 15 15:54:45 2018 +0200 [ZIPFLDR] Add Chinese(Simplified) translation --- dll/shellext/zipfldr/lang/zh-CN.rc | 71 ++++++++++++++++++++++++++++++++++++++ dll/shellext/zipfldr/zipfldr.rc | 3 ++ 2 files changed, 74 insertions(+) diff --git a/dll/shellext/zipfldr/lang/zh-CN.rc b/dll/shellext/zipfldr/lang/zh-CN.rc new file mode 100644 index 0000000000..dc0870577a --- /dev/null +++ b/dll/shellext/zipfldr/lang/zh-CN.rc @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Chinese (Simplified) resource translation + * COPYRIGHT: Copyright 2018 Li Keqing (auroracloud4096(a)gmail.com) + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "选择目标文件夹" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "选择目标文件夹",IDC_STATIC,6,12,174,8 + EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL + PUSHBUTTON "浏览...",IDC_BROWSE,174,42,54,14 + PUSHBUTTON "密码",IDC_PASSWORD,174,66,54,14 + LTEXT "正在解压...",IDC_STATIC,6,114,42,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 +END + +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "解压完成" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "文件已经被解压至下列目录：",IDC_STATIC,6,12,222,18 + LTEXT "目标文件夹",IDC_DESTDIR,6,36,222,8 + CONTROL "显示被解压文件",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 + LTEXT "点击完成以继续。",IDC_STATIC,6,84,174,8 +END + +IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "确认替换文件" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "是(&Y)",IDYES,6,36,62,14 + PUSHBUTTON "取消",IDCANCEL,204,36,62,14 + PUSHBUTTON "全部为是(&T)",IDYESALL,72,36,62,14 + PUSHBUTTON "否(&N)",IDNO,138,36,62,14 + ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 + LTEXT "",IDC_MESSAGE,36,6,228,24 +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "名称" + IDS_COL_TYPE "类型" + IDS_COL_COMPRSIZE "压缩大小" + IDS_COL_PASSWORD "密码" + IDS_COL_SIZE "大小" + IDS_COL_RATIO "压缩率" + IDS_COL_DATE_MOD "修改日期" + IDS_YES "是" + IDS_NO "否" + + IDS_WIZ_TITLE "解压向导" + IDS_WIZ_DEST_TITLE "选择一个目标文件夹" + IDS_WIZ_DEST_SUBTITLE "ZIP 归档中的文件将被解压至指定位置。" + IDS_WIZ_COMPL_TITLE "解压完毕" + IDS_WIZ_COMPL_SUBTITLE "ZIP 归档中的文件已经被解压。" + IDS_WIZ_BROWSE_TITLE "选择您想要解压指定项目到的地方。" + + IDS_OVERWRITEFILE_TEXT "这个文件夹中已经包含一个叫 %1 的文件。\n您想要替换它吗？" + + IDS_MENUITEM "解压全部(&A)..." + IDS_HELPTEXT "解压文件夹内容" + IDS_FRIENDLYNAME "压缩文件夹" +END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index e39e3e22a1..9afe0f1596 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -33,3 +33,6 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif

1 0

01/01: [NET] Implement the options in the NET CONFIG SERVER command
by Eric Kohl 15 Apr '18

15 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8eb64332e90110027d323… commit 8eb64332e90110027d32362330c0567a21413411 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 15 15:32:01 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 15 15:32:31 2018 +0200 [NET] Implement the options in the NET CONFIG SERVER command --- base/applications/network/net/cmdConfig.c | 88 +++++++++++++++++++++++++++---- 1 file changed, 78 insertions(+), 10 deletions(-) diff --git a/base/applications/network/net/cmdConfig.c b/base/applications/network/net/cmdConfig.c index e4f65cfc23..0211b9bfec 100644 --- a/base/applications/network/net/cmdConfig.c +++ b/base/applications/network/net/cmdConfig.c @@ -9,18 +9,14 @@ static INT -DisplayServerConfig(VOID) +DisplayServerConfig( + PSERVER_INFO_102 ServerInfo) { - PSERVER_INFO_102 ServerInfo = NULL; PSERVER_TRANSPORT_INFO_0 TransportInfo = NULL; DWORD dwRead, dwTotal, i; INT nPaddedLength = 38; NET_API_STATUS Status; - Status = NetServerGetInfo(NULL, 102, (PBYTE*)&ServerInfo); - if (Status != NERR_Success) - goto done; - Status = NetServerTransportEnum(NULL, 0, (PBYTE*)&TransportInfo, MAX_PREFERRED_LENGTH, &dwRead, @@ -70,9 +66,6 @@ done: if (TransportInfo != NULL) NetApiBufferFree(TransportInfo); - if (ServerInfo != NULL) - NetApiBufferFree(ServerInfo); - return 0; } @@ -162,6 +155,11 @@ cmdConfig( INT i, result = 0; BOOL bServer = FALSE; BOOL bWorkstation = FALSE; + PWSTR p, endptr; + BOOL bModify = FALSE; + LONG lValue; + PSERVER_INFO_102 ServerInfo = NULL; + NET_API_STATUS Status; for (i = 2; i < argc; i++) { @@ -222,7 +220,73 @@ cmdConfig( if (bServer) { - result = DisplayServerConfig(); + Status = NetServerGetInfo(NULL, 102, (PBYTE*)&ServerInfo); + if (Status != NERR_Success) + goto done; + + for (i = 2; i < argc; i++) + { + if (argv[i][0] != L'/') + continue; + + if (_wcsnicmp(argv[i], L"/autodisconnect:", 16) == 0) + { + p = &argv[i][16]; + lValue = wcstol(p, &endptr, 10); + if (*endptr != 0) + { + ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/AUTODISCONNECT"); + result = 1; + goto done; + } + + if (lValue < -1 || lValue > 65535) + { + ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/AUTODISCONNECT"); + result = 1; + goto done; + } + + ServerInfo->sv102_disc = lValue; + bModify = TRUE; + } + else if (_wcsnicmp(argv[i], L"/srvcomment:", 12) == 0) + { + ServerInfo->sv102_comment = &argv[i][12]; + bModify = TRUE; + } + else if (_wcsnicmp(argv[i], L"/hidden:", 8) == 0) + { + p = &argv[i][8]; + if (_wcsicmp(p, L"yes") != 0 && _wcsicmp(p, L"no") != 0) + { + ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/HIDDEN"); + result = 1; + goto done; + } + + ServerInfo->sv102_hidden = (_wcsicmp(p, L"yes") == 0) ? TRUE : FALSE; + bModify = TRUE; + } + else + { + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + ConResPuts(StdOut, IDS_CONFIG_SERVER_SYNTAX); + result = 1; + goto done; + } + } + + if (bModify) + { + Status = NetServerSetInfo(NULL, 102, (PBYTE)&ServerInfo, NULL); + if (Status != NERR_Success) + result = 1; + } + else + { + result = DisplayServerConfig(ServerInfo); + } } else if (bWorkstation) { @@ -233,6 +297,10 @@ cmdConfig( ConResPuts(StdOut, IDS_CONFIG_TEXT); } +done: + if (ServerInfo != NULL) + NetApiBufferFree(ServerInfo); + if (result == 0) ConResPuts(StdOut, IDS_ERROR_NO_ERROR);

1 0

01/01: [ZIPFLDR] Add French translation
by Pierre Schweitzer 15 Apr '18

15 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74249053d9f35a9443fde… commit 74249053d9f35a9443fde7726e00e238ff08b2e2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 15 10:56:00 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 15 10:56:00 2018 +0200 [ZIPFLDR] Add French translation --- dll/shellext/zipfldr/lang/fr-FR.rc | 71 ++++++++++++++++++++++++++++++++++++++ dll/shellext/zipfldr/zipfldr.rc | 3 ++ 2 files changed, 74 insertions(+) diff --git a/dll/shellext/zipfldr/lang/fr-FR.rc b/dll/shellext/zipfldr/lang/fr-FR.rc new file mode 100644 index 0000000000..1cce07cfa0 --- /dev/null +++ b/dll/shellext/zipfldr/lang/fr-FR.rc @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: French (France) resource translation + * COPYRIGHT: Copyright 2018 Pierre Schweitzer (pierre(a)reactos.org) + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Choisissez une destination" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Choisissez le répertoire de destination",IDC_STATIC,6,12,174,8 + EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL + PUSHBUTTON "Parcourir...",IDC_BROWSE,174,42,54,14 + PUSHBUTTON "Mot de passe",IDC_PASSWORD,174,66,54,14 + LTEXT "Extraction...",IDC_STATIC,6,114,42,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 +END + +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extraction complète" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Les fichiers ont été extraits dans le répertoire :",IDC_STATIC,6,12,222,18 + LTEXT "Répertoire cible",IDC_DESTDIR,6,36,222,8 + CONTROL "Montrer les fichiers extraits",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,174,10 + LTEXT "Cliquer sur Terminer pour continuer.",IDC_STATIC,6,84,174,8 +END + +IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Confirmer le remplacement de fichier" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Oui",IDYES,6,36,62,14 + PUSHBUTTON "Annuler",IDCANCEL,204,36,62,14 + PUSHBUTTON "Oui à &tous",IDYESALL,72,36,62,14 + PUSHBUTTON "&Non",IDNO,138,36,62,14 + ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 + LTEXT "",IDC_MESSAGE,36,6,228,24 +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Nom" + IDS_COL_TYPE "Type" + IDS_COL_COMPRSIZE "Taille compressée" + IDS_COL_PASSWORD "Mot de passe" + IDS_COL_SIZE "Taille" + IDS_COL_RATIO "Ratio" + IDS_COL_DATE_MOD "Date de modification" + IDS_YES "Oui" + IDS_NO "Non" + + IDS_WIZ_TITLE "Assistant d'extraction" + IDS_WIZ_DEST_TITLE "Choisir une destination" + IDS_WIZ_DEST_SUBTITLE "Les fichiers de l'archive zip vont être extraits dans le répertoire spécifié." + IDS_WIZ_COMPL_TITLE "Extraction complète" + IDS_WIZ_COMPL_SUBTITLE "Les fichiers de l'archive zip ont été extraits." + IDS_WIZ_BROWSE_TITLE "Choisissez l'endroit où vous voulez extraits les éléments sélectionnés." + + IDS_OVERWRITEFILE_TEXT "Ce répertoire contient déjà un fichier nommé '%1'.\nVoulez-vous le remplacer ?" + + IDS_MENUITEM "&Tout extraire..." + IDS_HELPTEXT "Extrait le contenu du répertoire" + IDS_FRIENDLYNAME "Répertoire compressé (zip)" +END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index e87ed1a921..e39e3e22a1 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -24,6 +24,9 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" #ifdef LANGUAGE_ET_EE #include "lang/et-EE.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif

1 0

01/01: [WINLOGON] Romanian translation update
by Bișoc George 14 Apr '18

14 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3ff4f5f95ade2d506cd5… commit b3ff4f5f95ade2d506cd5404676565a159fdf04d Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sat Apr 14 17:29:55 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 14 21:11:48 2018 +0200 [WINLOGON] Romanian translation update --- base/system/winlogon/lang/ro-RO.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index ae51afc224..d8b13f0309 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/base/system/winlogon/lang/ro-RO.rc @@ -31,14 +31,14 @@ END IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP -CAPTION "System Shutdown" +CAPTION "Sistem de oprire" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 - LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "Sistemul de oprire a fost inițializat. Salvați toate lucrările și închideți sesiunea. Toate lucrările nesalvate vor fi pierdute atunci când sistemul se va opri.", -1, 38, 7, 135, 40 + LTEXT "Sistemul se va opri în:", -1, 38, 50, 90, 8 LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 - LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "Mesaj:", -1, 38, 65, 135, 8 LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END

1 0

01/01: [TRANSLATION][ZIPFLDR] Added Estonian translation
by Joann Mõndresku 14 Apr '18

14 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4405d41b1df15a4bc7c6d… commit 4405d41b1df15a4bc7c6daa55096bdb3cb873794 Author: Joann Mõndresku <joann.mondresku(a)gmail.com> AuthorDate: Sat Apr 14 21:19:39 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 14 21:10:59 2018 +0200 [TRANSLATION][ZIPFLDR] Added Estonian translation --- dll/shellext/zipfldr/lang/et-EE.rc | 71 ++++++++++++++++++++++++++++++++++++++ dll/shellext/zipfldr/zipfldr.rc | 3 ++ 2 files changed, 74 insertions(+) diff --git a/dll/shellext/zipfldr/lang/et-EE.rc b/dll/shellext/zipfldr/lang/et-EE.rc new file mode 100644 index 0000000000..1cd5431a37 --- /dev/null +++ b/dll/shellext/zipfldr/lang/et-EE.rc @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Estonian resource translation + * TRANSLATOR: 2018 Joann Mõndresku (joann dot mondresku at gmail dot com) + */ + +LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT + +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vali sihtkoht" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Vali sihtkoha kaust",IDC_STATIC,6,12,174,8 + EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL + PUSHBUTTON "Sirvi...",IDC_BROWSE,174,42,54,14 + PUSHBUTTON "Parool",IDC_PASSWORD,174,66,54,14 + LTEXT "Ekstraktimine...",IDC_STATIC,6,114,42,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 +END + +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ekstraktimine valmis" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Failid on ekstraktitud kausta:",IDC_STATIC,6,12,222,18 + LTEXT "Sihtkoha kataloog",IDC_DESTDIR,6,36,222,8 + CONTROL "Näita ekstraktitud faile",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 + LTEXT "Vajuta lõpeta jätkamiseks.",IDC_STATIC,6,84,174,8 +END + +IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Kinnita faili ülekirjutus" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Jah",IDYES,6,36,62,14 + PUSHBUTTON "Loobu",IDCANCEL,204,36,62,14 + PUSHBUTTON "Jah &kõigile",IDYESALL,72,36,62,14 + PUSHBUTTON "&Ei",IDNO,138,36,62,14 + ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 + LTEXT "",IDC_MESSAGE,36,6,228,24 +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Nimi" + IDS_COL_TYPE "Tüüp" + IDS_COL_COMPRSIZE "Tihendatud suurus" + IDS_COL_PASSWORD "Parool" + IDS_COL_SIZE "Suurus" + IDS_COL_RATIO "Suhe" + IDS_COL_DATE_MOD "Kuupäeval muudetud" + IDS_YES "Jah" + IDS_NO "Ei" + + IDS_WIZ_TITLE "Ekstraktimise visard" + IDS_WIZ_DEST_TITLE "Vali sihtkoht" + IDS_WIZ_DEST_SUBTITLE "Zip arhiivis olevad failid ekstraktitakse täpsustatud sihtkohta." + IDS_WIZ_COMPL_TITLE "Ekstraktimine valmis" + IDS_WIZ_COMPL_SUBTITLE "Zip arhiivis olevad failid on ekstraktitud." + IDS_WIZ_BROWSE_TITLE "Vali koht kuhu soovid ekstraktida valitud üksused." + + IDS_OVERWRITEFILE_TEXT "See kaust juba sisaldab faili nimega '%1'.\nKas tahad seda asendada?" + + IDS_MENUITEM "Ekstrakti &kõik..." + IDS_HELPTEXT "Ekstraktib kausta sisu" + IDS_FRIENDLYNAME "Tihendatud (zippitud) kaust" +END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index 4a9fc79862..e87ed1a921 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -21,6 +21,9 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_ET_EE + #include "lang/et-EE.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif

1 0

04/04: [ZIPFLDR] Implement Romanian resource translation
by Bișoc George 14 Apr '18

14 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5de33195482011ec934d… commit e5de33195482011ec934d2a2c2bf79e006b41116 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Apr 8 20:28:28 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 14 19:29:40 2018 +0200 [ZIPFLDR] Implement Romanian resource translation --- dll/shellext/zipfldr/lang/ro-RO.rc | 71 ++++++++++++++++++++++++++++++++++++++ dll/shellext/zipfldr/zipfldr.rc | 3 ++ 2 files changed, 74 insertions(+) diff --git a/dll/shellext/zipfldr/lang/ro-RO.rc b/dll/shellext/zipfldr/lang/ro-RO.rc new file mode 100644 index 0000000000..a41744d48c --- /dev/null +++ b/dll/shellext/zipfldr/lang/ro-RO.rc @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Romanian resource translation + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Selectați o Destinație" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Selectați folderul de destinație",IDC_STATIC,6,12,174,8 + EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL + PUSHBUTTON "Răsfoiți...",IDC_BROWSE,174,42,54,14 + PUSHBUTTON "Parolă",IDC_PASSWORD,174,66,54,14 + LTEXT "Extragere...",IDC_STATIC,6,114,42,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 +END + +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extragere Completă" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Fișierele au fost extrase în folderul respectiv:",IDC_STATIC,6,12,222,18 + LTEXT "Ținta folder",IDC_DESTDIR,6,36,222,8 + CONTROL "Afișează fișierele extrase",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 + LTEXT "Apăsați Termină pentru a continua.",IDC_STATIC,6,84,174,8 +END + +IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Confirmați Înlocuirea Fișier" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Da",IDYES,6,36,62,14 + PUSHBUTTON "Anulează",IDCANCEL,204,36,62,14 + PUSHBUTTON "Da &Toți",IDYESALL,72,36,62,14 + PUSHBUTTON "&Nu",IDNO,138,36,62,14 + ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 + LTEXT "",IDC_MESSAGE,36,6,228,24 +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Nume" + IDS_COL_TYPE "Tip" + IDS_COL_COMPRSIZE "Dimensiune comprimată" + IDS_COL_PASSWORD "Parolă" + IDS_COL_SIZE "Dimensiune" + IDS_COL_RATIO "Raport" + IDS_COL_DATE_MOD "Data modificată" + IDS_YES "Da" + IDS_NO "Nu" + + IDS_WIZ_TITLE "Asistent de extracție" + IDS_WIZ_DEST_TITLE "Selectați o Destinație" + IDS_WIZ_DEST_SUBTITLE "Fișierele din arhiva zip vor fi extrase în destinația specificată." + IDS_WIZ_COMPL_TITLE "Extragere Completă" + IDS_WIZ_COMPL_SUBTITLE "Fișierele din arhiva zip au fost extrase." + IDS_WIZ_BROWSE_TITLE "Selectați destinația unde doriți să extrageți elementele selectate." + + IDS_OVERWRITEFILE_TEXT "Acest folder deja conține un fișier numit '%1'.\nDoriți să o înlocuiți?" + + IDS_MENUITEM "Extrage &Tot..." + IDS_HELPTEXT "Extrage conținutul folderului" + IDS_FRIENDLYNAME "Folder comprimat (zip)" +END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index 3086ff727a..4a9fc79862 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -24,3 +24,6 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
25
Older →

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 April 2018