Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/02: [EVENTVWR] Code style only.
by Hermès Bélusca-Maïto 17 Apr '18

17 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c32666852296e312ccd8… commit 0c32666852296e312ccd85f5d4b3b3a01401dfb0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Apr 17 22:43:47 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Apr 17 23:17:44 2018 +0200 [EVENTVWR] Code style only. --- base/applications/mscutils/eventvwr/eventvwr.c | 194 ++++++++++++------------ base/applications/mscutils/eventvwr/evtdetctl.c | 2 +- 2 files changed, 102 insertions(+), 94 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index f7e89d3207..318e5dea5a 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -37,8 +37,8 @@ #define LVM_PROGRESS (WM_APP + 1) // Used by the subclassed ListView -static const LPCWSTR szWindowClass = L"EVENTVWR"; /* The main window class name */ -static const WCHAR EVENTLOG_BASE_KEY[] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; +static const LPCWSTR EVENTVWR_WNDCLASS = L"EVENTVWR"; /* The main window class name */ +static const LPCWSTR EVENTLOG_BASE_KEY = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; /* The 3 system logs that should always exist in the user's system */ static const LPCWSTR SystemLogs[] = @@ -442,6 +442,7 @@ wWinMain(HINSTANCE hInstance, } } + /* Stop the enumerator thread */ SetEvent(hStartStopEnumEvent); WaitForSingleObject(hThread, INFINITE); CloseHandle(hThread); @@ -1217,7 +1218,7 @@ GetEventMessageFileDLL(IN LPCWSTR lpLogName, { BOOL Success = FALSE; LONG Result; - DWORD Type, dwSize; + DWORD dwType, dwSize; WCHAR szModuleName[MAX_PATH]; WCHAR szKeyName[MAX_PATH]; HKEY hLogKey = NULL; @@ -1249,10 +1250,10 @@ GetEventMessageFileDLL(IN LPCWSTR lpLogName, Result = RegQueryValueExW(hSourceKey, EntryName, NULL, - &Type, + &dwType, (LPBYTE)szModuleName, &dwSize); - if ((Result != ERROR_SUCCESS) || (Type != REG_EXPAND_SZ && Type != REG_SZ)) + if ((Result != ERROR_SUCCESS) || (dwType != REG_EXPAND_SZ && dwType != REG_SZ)) { szModuleName[0] = UNICODE_NULL; } @@ -1829,7 +1830,7 @@ EnumEventsThread(IN LPVOID lpParameter) } else if (!bResult) { - /* exit on other errors (ERROR_HANDLE_EOF) */ + /* Exit on other errors (ERROR_HANDLE_EOF) */ break; } @@ -2378,7 +2379,7 @@ MyRegisterClass(HINSTANCE hInstance) wcex.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_ARROW)); wcex.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); // COLOR_WINDOW + 1 wcex.lpszMenuName = MAKEINTRESOURCEW(IDM_EVENTVWR); - wcex.lpszClassName = szWindowClass; + wcex.lpszClassName = EVENTVWR_WNDCLASS; wcex.hIconSm = (HICON)LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_EVENTVWR), IMAGE_ICON, @@ -2400,7 +2401,7 @@ GetDisplayNameFileAndID(IN LPCWSTR lpLogName, HKEY hLogKey; WCHAR *KeyPath; SIZE_T cbKeyPath; - DWORD Type, cbData; + DWORD dwType, cbData; DWORD dwMessageID = 0; WCHAR szModuleName[MAX_PATH]; @@ -2424,10 +2425,10 @@ GetDisplayNameFileAndID(IN LPCWSTR lpLogName, Result = RegQueryValueExW(hLogKey, L"DisplayNameFile", NULL, - &Type, + &dwType, (LPBYTE)szModuleName, &cbData); - if ((Result != ERROR_SUCCESS) || (Type != REG_EXPAND_SZ && Type != REG_SZ)) + if ((Result != ERROR_SUCCESS) || (dwType != REG_EXPAND_SZ && dwType != REG_SZ)) { szModuleName[0] = UNICODE_NULL; } @@ -2449,10 +2450,10 @@ GetDisplayNameFileAndID(IN LPCWSTR lpLogName, Result = RegQueryValueExW(hLogKey, L"DisplayNameID", NULL, - &Type, + &dwType, (LPBYTE)&dwMessageID, &cbData); - if ((Result != ERROR_SUCCESS) || (Type != REG_DWORD)) + if ((Result != ERROR_SUCCESS) || (dwType != REG_DWORD)) dwMessageID = 0; *pdwMessageID = dwMessageID; @@ -2471,7 +2472,7 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName) HKEY hEventLogKey, hLogKey; DWORD dwNumLogs = 0; DWORD dwIndex, dwMaxKeyLength; - DWORD Type; + DWORD dwType; PEVENTLOG EventLog; PEVENTLOGFILTER EventLogFilter; LPWSTR LogName = NULL; @@ -2554,10 +2555,10 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName) Result = RegQueryValueExW(hLogKey, L"File", NULL, - &Type, + &dwType, NULL, &lpcName); - if ((Result != ERROR_SUCCESS) || (Type != REG_EXPAND_SZ && Type != REG_SZ)) + if ((Result != ERROR_SUCCESS) || (dwType != REG_EXPAND_SZ && dwType != REG_SZ)) { // Windows' EventLog uses some kind of default value, we do not. EventLog->FileName = NULL; @@ -2571,7 +2572,7 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName) Result = RegQueryValueExW(hLogKey, L"File", NULL, - &Type, + &dwType, (LPBYTE)EventLog->FileName, &lpcName); if (Result != ERROR_SUCCESS) @@ -2698,7 +2699,7 @@ InitInstance(HINSTANCE hInstance, WCHAR szTemp[256]; /* Create the main window */ - hwndMainWindow = CreateWindowW(szWindowClass, + hwndMainWindow = CreateWindowW(EVENTVWR_WNDCLASS, szTitle, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, @@ -2731,7 +2732,7 @@ InitInstance(HINSTANCE hInstance, NULL, // no text WS_CHILD | PBS_SMOOTH, // styles rs.left, rs.top, // x, y - rs.right-rs.left, rs.bottom-rs.top, // cx, cy + rs.right - rs.left, rs.bottom - rs.top, // cx, cy hwndStatus, // parent window NULL, // window ID hInstance, // instance @@ -3053,7 +3054,7 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { LPWSTR pszText = item.pszText; - /* Trim all whitespace */ + /* Trim leading whitespace */ while (*pszText && iswspace(*pszText)) ++pszText; @@ -3234,41 +3235,44 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } case WM_SETCURSOR: - if (LOWORD(lParam) == HTCLIENT) - { - POINT pt; - GetCursorPos(&pt); - ScreenToClient(hWnd, &pt); + { + POINT pt; + + if (LOWORD(lParam) != HTCLIENT) + goto Default; - /* Set the cursor for the vertical splitter */ - if (pt.x >= nVSplitPos - SPLIT_WIDTH/2 && pt.x < nVSplitPos + SPLIT_WIDTH/2 + 1) + GetCursorPos(&pt); + ScreenToClient(hWnd, &pt); + + /* Set the cursor for the vertical splitter */ + if (pt.x >= nVSplitPos - SPLIT_WIDTH/2 && pt.x < nVSplitPos + SPLIT_WIDTH/2 + 1) + { + RECT rs; + GetClientRect(hWnd, &rect); + GetWindowRect(hwndStatus, &rs); + if (pt.y >= rect.top && pt.y < rect.bottom - (rs.bottom - rs.top)) { - RECT rs; - GetClientRect(hWnd, &rect); - GetWindowRect(hwndStatus, &rs); - if (pt.y >= rect.top && pt.y < rect.bottom - (rs.bottom - rs.top)) - { - SetCursor(LoadCursorW(NULL, IDC_SIZEWE)); - return TRUE; - } + SetCursor(LoadCursorW(NULL, IDC_SIZEWE)); + return TRUE; } - else - /* Set the cursor for the horizontal splitter, if the Event details pane is displayed */ - if (hwndEventDetails && - (pt.y >= nHSplitPos - SPLIT_WIDTH/2 && pt.y < nHSplitPos + SPLIT_WIDTH/2 + 1)) + } + else + /* Set the cursor for the horizontal splitter, if the Event details pane is displayed */ + if (hwndEventDetails && + (pt.y >= nHSplitPos - SPLIT_WIDTH/2 && pt.y < nHSplitPos + SPLIT_WIDTH/2 + 1)) + { + // RECT rs; + GetClientRect(hWnd, &rect); + // GetWindowRect(hwndStatus, &rs); + if (pt.x >= nVSplitPos + SPLIT_WIDTH/2 + 1 /* rect.left + (rs.bottom - rs.top) */ && + pt.x < rect.right) { - // RECT rs; - GetClientRect(hWnd, &rect); - // GetWindowRect(hwndStatus, &rs); - if (pt.x >= nVSplitPos + SPLIT_WIDTH/2 + 1 /* rect.left + (rs.bottom - rs.top) */ && - pt.x < rect.right) - { - SetCursor(LoadCursorW(NULL, IDC_SIZENS)); - return TRUE; - } + SetCursor(LoadCursorW(NULL, IDC_SIZENS)); + return TRUE; } } goto Default; + } case WM_LBUTTONDOWN: { @@ -3297,62 +3301,66 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_LBUTTONUP: case WM_RBUTTONDOWN: - if (GetCapture() == hWnd) - { - /* Adjust the correct splitter position */ - if (bSplit == 1) - nVSplitPos = GET_X_LPARAM(lParam); - else if (bSplit == 2) - nHSplitPos = GET_Y_LPARAM(lParam); - - /* If we are splitting, resize the windows */ - if (bSplit != 0) - { - GetClientRect(hWnd, &rect); - ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); - } + { + if (GetCapture() != hWnd) + break; - /* Reset the splitter state */ - bSplit = 0; + /* Adjust the correct splitter position */ + if (bSplit == 1) + nVSplitPos = GET_X_LPARAM(lParam); + else if (bSplit == 2) + nHSplitPos = GET_Y_LPARAM(lParam); - ReleaseCapture(); + /* If we are splitting, resize the windows */ + if (bSplit != 0) + { + GetClientRect(hWnd, &rect); + ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); } + + /* Reset the splitter state */ + bSplit = 0; + + ReleaseCapture(); break; + } case WM_MOUSEMOVE: - if (GetCapture() == hWnd) + { + if (GetCapture() != hWnd) + break; + + /* Move the correct splitter */ + if (bSplit == 1) { - /* Move the correct splitter */ - if (bSplit == 1) - { - INT x = GET_X_LPARAM(lParam); + INT x = GET_X_LPARAM(lParam); - GetClientRect(hWnd, &rect); + GetClientRect(hWnd, &rect); - x = min(max(x, SPLIT_WIDTH/2), rect.right - rect.left - SPLIT_WIDTH/2); - if (nVSplitPos != x) - { - nVSplitPos = x; - ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); - } - } - else if (bSplit == 2) + x = min(max(x, SPLIT_WIDTH/2), rect.right - rect.left - SPLIT_WIDTH/2); + if (nVSplitPos != x) { - RECT rs; - INT y = GET_Y_LPARAM(lParam); + nVSplitPos = x; + ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); + } + } + else if (bSplit == 2) + { + RECT rs; + INT y = GET_Y_LPARAM(lParam); - GetClientRect(hWnd, &rect); - GetWindowRect(hwndStatus, &rs); + GetClientRect(hWnd, &rect); + GetWindowRect(hwndStatus, &rs); - y = min(max(y, SPLIT_WIDTH/2), rect.bottom - rect.top - SPLIT_WIDTH/2 - (rs.bottom - rs.top)); - if (nHSplitPos != y) - { - nHSplitPos = y; - ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); - } + y = min(max(y, SPLIT_WIDTH/2), rect.bottom - rect.top - SPLIT_WIDTH/2 - (rs.bottom - rs.top)); + if (nHSplitPos != y) + { + nHSplitPos = y; + ResizeWnd(rect.right - rect.left, rect.bottom - rect.top); } } break; + } case WM_SIZE: { @@ -3379,7 +3387,7 @@ InitPropertiesDlg(HWND hDlg, PEVENTLOG EventLog) { LPWSTR lpLogName = EventLog->LogName; - DWORD Result, Type; + DWORD Result, dwType; DWORD dwMaxSize = 0, dwRetention = 0; BOOL Success; WIN32_FIND_DATAW FileInfo; // WIN32_FILE_ATTRIBUTE_DATA @@ -3418,10 +3426,10 @@ InitPropertiesDlg(HWND hDlg, PEVENTLOG EventLog) Result = RegQueryValueExW(hLogKey, L"MaxSize", NULL, - &Type, + &dwType, (LPBYTE)&dwMaxSize, &cbData); - if ((Result != ERROR_SUCCESS) || (Type != REG_DWORD)) + if ((Result != ERROR_SUCCESS) || (dwType != REG_DWORD)) { // dwMaxSize = 512 * 1024; /* 512 kBytes */ dwMaxSize = 0; @@ -3433,10 +3441,10 @@ InitPropertiesDlg(HWND hDlg, PEVENTLOG EventLog) Result = RegQueryValueExW(hLogKey, L"Retention", NULL, - &Type, + &dwType, (LPBYTE)&dwRetention, &cbData); - if ((Result != ERROR_SUCCESS) || (Type != REG_DWORD)) + if ((Result != ERROR_SUCCESS) || (dwType != REG_DWORD)) { /* On Windows 2003 it is 604800 (secs) == 7 days */ dwRetention = 0; diff --git a/base/applications/mscutils/eventvwr/evtdetctl.c b/base/applications/mscutils/eventvwr/evtdetctl.c index e25ad077d9..5a685855b0 100644 --- a/base/applications/mscutils/eventvwr/evtdetctl.c +++ b/base/applications/mscutils/eventvwr/evtdetctl.c @@ -730,7 +730,7 @@ InitDetailsDlgCtrl(HWND hDlg, PDETAILDATA pData) */ SendDlgItemMessageW(hDlg, IDC_EVENTTEXTEDIT, EM_AUTOURLDETECT, AURL_ENABLEURL /* | AURL_ENABLEEAURLS */, 0); - /* Note that the RichEdit control never gets themed under WinXP+. One would have to write code to simulate Edit-control theming */ + /* Note that the RichEdit control never gets themed under WinXP+; one would have to write code to simulate Edit-control theming */ SendDlgItemMessageW(hDlg, pData->bDisplayWords ? IDC_WORDRADIO : IDC_BYTESRADIO, BM_SETCHECK, BST_CHECKED, 0); SendDlgItemMessageW(hDlg, IDC_EVENTDATAEDIT, WM_SETFONT, (WPARAM)pData->hMonospaceFont, (LPARAM)TRUE);

1 0

05/05: [NTOSKRNL] Properly reset VACB on free
by Pierre Schweitzer 15 Apr '18

15 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd3a6c1089f8eb315bf1a… commit fd3a6c1089f8eb315bf1ab1dea85b44894938a05 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Apr 14 11:13:12 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 15 22:52:53 2018 +0200 [NTOSKRNL] Properly reset VACB on free CID 1434271 --- ntoskrnl/cc/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 11062095f5..bd2f4887d4 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -978,7 +978,7 @@ CcRosInternalFreeVacb ( ASSERT(IsListEmpty(&Vacb->CacheMapVacbListEntry)); ASSERT(IsListEmpty(&Vacb->DirtyVacbListEntry)); ASSERT(IsListEmpty(&Vacb->VacbLruListEntry)); - RtlFillMemory(Vacb, sizeof(Vacb), 0xfd); + RtlFillMemory(Vacb, sizeof(*Vacb), 0xfd); ExFreeToNPagedLookasideList(&VacbLookasideList, Vacb); return STATUS_SUCCESS; }

1 0

04/05: [NTOSKRNL] Drop the VACB lock. This has have several benefits for ReactOS Cc: - It helps reducing potential deadlocks situations in Cc - It speeds up ReactOS by reducing locks - It gets us a bit closer to Windows VACB
by Pierre Schweitzer 15 Apr '18

15 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=953dc72dad7117d681120… commit 953dc72dad7117d681120e6c2423431dab824ffe Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 8 19:09:36 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 15 22:52:53 2018 +0200 [NTOSKRNL] Drop the VACB lock. This has have several benefits for ReactOS Cc: - It helps reducing potential deadlocks situations in Cc - It speeds up ReactOS by reducing locks - It gets us a bit closer to Windows VACB CORE-14349 --- ntoskrnl/cc/fs.c | 6 +++-- ntoskrnl/cc/pin.c | 5 ----- ntoskrnl/cc/view.c | 50 +++++++++++++++--------------------------- ntoskrnl/include/internal/cc.h | 41 ++++++++++++++-------------------- 4 files changed, 38 insertions(+), 64 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index 31b7ec6bac..cb98eed153 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -251,12 +251,14 @@ CcPurgeCacheSection ( while (!IsListEmpty(&FreeList)) { + ULONG Refs; + Vacb = CONTAINING_RECORD(RemoveHeadList(&FreeList), ROS_VACB, CacheMapVacbListEntry); InitializeListHead(&Vacb->CacheMapVacbListEntry); - CcRosVacbDecRefCount(Vacb); - CcRosInternalFreeVacb(Vacb); + Refs = CcRosVacbDecRefCount(Vacb); + ASSERT(Refs == 0); } return Success; diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index c9167834c0..d81f09d470 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -215,7 +215,6 @@ CcPinRead ( iBcb->Pinned = TRUE; iBcb->Vacb->PinCount++; - CcRosReleaseVacbLock(iBcb->Vacb); if (Flags & PIN_EXCLUSIVE) { @@ -308,7 +307,6 @@ CcUnpinDataForThread ( { ExReleaseResourceForThreadLite(&iBcb->Lock, ResourceThreadId); iBcb->Pinned = FALSE; - CcRosAcquireVacbLock(iBcb->Vacb, NULL); iBcb->Vacb->PinCount--; } @@ -360,7 +358,6 @@ CcUnpinRepinnedBcb ( IoStatus->Information = 0; if (WriteThrough) { - CcRosAcquireVacbLock(iBcb->Vacb, NULL); if (iBcb->Vacb->Dirty) { IoStatus->Status = CcRosFlushVacb(iBcb->Vacb); @@ -369,7 +366,6 @@ CcUnpinRepinnedBcb ( { IoStatus->Status = STATUS_SUCCESS; } - CcRosReleaseVacbLock(iBcb->Vacb); } else { @@ -380,7 +376,6 @@ CcUnpinRepinnedBcb ( { ExReleaseResourceLite(&iBcb->Lock); iBcb->Pinned = FALSE; - CcRosAcquireVacbLock(iBcb->Vacb, NULL); iBcb->Vacb->PinCount--; ASSERT(iBcb->Vacb->PinCount == 0); } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index cde1c2d6fa..11062095f5 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -90,6 +90,11 @@ ULONG CcRosVacbDecRefCount_(PROS_VACB vacb, PCSTR file, INT line) file, line, vacb, Refs, vacb->Dirty, vacb->PageOut); } + if (Refs == 0) + { + CcRosInternalFreeVacb(vacb); + } + return Refs; } ULONG CcRosVacbGetRefCount_(PROS_VACB vacb, PCSTR file, INT line) @@ -107,9 +112,6 @@ ULONG CcRosVacbGetRefCount_(PROS_VACB vacb, PCSTR file, INT line) } #endif -NTSTATUS -CcRosInternalFreeVacb(PROS_VACB Vacb); - /* FUNCTIONS *****************************************************************/ @@ -187,12 +189,10 @@ CcRosFlushDirtyPages ( PROS_VACB current; BOOLEAN Locked; NTSTATUS Status; - LARGE_INTEGER ZeroTimeout; DPRINT("CcRosFlushDirtyPages(Target %lu)\n", Target); (*Count) = 0; - ZeroTimeout.QuadPart = 0; KeEnterCriticalRegion(); KeAcquireGuardedMutex(&ViewLock); @@ -228,22 +228,11 @@ CcRosFlushDirtyPages ( continue; } - Status = CcRosAcquireVacbLock(current, - Wait ? NULL : &ZeroTimeout); - if (Status != STATUS_SUCCESS) - { - current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( - current->SharedCacheMap->LazyWriteContext); - CcRosVacbDecRefCount(current); - continue; - } - ASSERT(current->Dirty); /* One reference is added above */ if (CcRosVacbGetRefCount(current) > 2) { - CcRosReleaseVacbLock(current); current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( current->SharedCacheMap->LazyWriteContext); CcRosVacbDecRefCount(current); @@ -254,7 +243,6 @@ CcRosFlushDirtyPages ( Status = CcRosFlushVacb(current); - CcRosReleaseVacbLock(current); current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( current->SharedCacheMap->LazyWriteContext); @@ -410,13 +398,15 @@ retry: while (!IsListEmpty(&FreeList)) { + ULONG Refs; + current_entry = RemoveHeadList(&FreeList); current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); InitializeListHead(&current->CacheMapVacbListEntry); - CcRosVacbDecRefCount(current); - CcRosInternalFreeVacb(current); + Refs = CcRosVacbDecRefCount(current); + ASSERT(Refs == 0); } DPRINT("Evicted %lu cache pages\n", (*NrFreed)); @@ -457,8 +447,6 @@ CcRosReleaseVacb ( Refs = CcRosVacbDecRefCount(Vacb); ASSERT(Refs > 0); - CcRosReleaseVacbLock(Vacb); - return STATUS_SUCCESS; } @@ -494,7 +482,6 @@ CcRosLookupVacb ( CcRosVacbIncRefCount(current); KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - CcRosAcquireVacbLock(current, NULL); return current; } if (current->FileOffset.QuadPart > FileOffset) @@ -718,6 +705,7 @@ CcRosCreateVacb ( PLIST_ENTRY current_entry; NTSTATUS Status; KIRQL oldIrql; + ULONG Refs; ASSERT(SharedCacheMap); @@ -745,7 +733,6 @@ CcRosCreateVacb ( current->MappedCount = 0; current->ReferenceCount = 0; current->PinCount = 0; - KeInitializeMutex(&current->Mutex, 0); InitializeListHead(&current->CacheMapVacbListEntry); InitializeListHead(&current->DirtyVacbListEntry); InitializeListHead(&current->VacbLruListEntry); @@ -760,7 +747,6 @@ CcRosCreateVacb ( return Status; } - CcRosAcquireVacbLock(current, NULL); KeAcquireGuardedMutex(&ViewLock); *Vacb = current; @@ -792,12 +778,12 @@ CcRosCreateVacb ( current); } #endif - CcRosVacbDecRefCount(*Vacb); - CcRosReleaseVacbLock(*Vacb); KeReleaseGuardedMutex(&ViewLock); - CcRosInternalFreeVacb(*Vacb); + + Refs = CcRosVacbDecRefCount(*Vacb); + ASSERT(Refs == 0); + *Vacb = current; - CcRosAcquireVacbLock(current, NULL); return STATUS_SUCCESS; } if (current->FileOffset.QuadPart < FileOffset) @@ -1111,7 +1097,6 @@ CcRosDeleteFileCache ( KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); - CcRosAcquireVacbLock(current, NULL); RemoveEntryList(&current->VacbLruListEntry); InitializeListHead(&current->VacbLruListEntry); if (current->Dirty) @@ -1122,7 +1107,6 @@ CcRosDeleteFileCache ( DPRINT1("Freeing dirty VACB\n"); } InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); - CcRosReleaseVacbLock(current); KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); } @@ -1136,11 +1120,13 @@ CcRosDeleteFileCache ( while (!IsListEmpty(&FreeList)) { + ULONG Refs; + current_entry = RemoveTailList(&FreeList); current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); InitializeListHead(&current->CacheMapVacbListEntry); - CcRosVacbDecRefCount(current); - CcRosInternalFreeVacb(current); + Refs = CcRosVacbDecRefCount(current); + ASSERT(Refs == 0); } OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index e3c279b6f8..0dcea16f43 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -217,12 +217,9 @@ typedef struct _ROS_VACB LIST_ENTRY VacbLruListEntry; /* Offset in the file which this view maps. */ LARGE_INTEGER FileOffset; - /* Mutex */ - KMUTEX Mutex; /* Number of references. */ volatile ULONG ReferenceCount; /* How many times was it pinned? */ - _Guarded_by_(Mutex) LONG PinCount; /* Pointer to the shared cache map for the file which this view maps data for. */ PROS_SHARED_CACHE_MAP SharedCacheMap; @@ -470,28 +467,9 @@ VOID CcPerformReadAhead( IN PFILE_OBJECT FileObject); -FORCEINLINE NTSTATUS -CcRosAcquireVacbLock( - _Inout_ PROS_VACB Vacb, - _In_ PLARGE_INTEGER Timeout) -{ - NTSTATUS Status; - Status = KeWaitForSingleObject(&Vacb->Mutex, - Executive, - KernelMode, - FALSE, - Timeout); - return Status; -} - -FORCEINLINE -VOID -CcRosReleaseVacbLock( - _Inout_ PROS_VACB Vacb) -{ - KeReleaseMutex(&Vacb->Mutex, FALSE); -} +CcRosInternalFreeVacb( + IN PROS_VACB Vacb); FORCEINLINE BOOLEAN @@ -545,6 +523,19 @@ CcRosVacbGetRefCount_( #else #define CcRosVacbIncRefCount(vacb) InterlockedIncrement((PLONG)&(vacb)->ReferenceCount) -#define CcRosVacbDecRefCount(vacb) InterlockedDecrement((PLONG)&(vacb)->ReferenceCount) +FORCEINLINE +ULONG +CcRosVacbDecRefCount( + PROS_VACB vacb) +{ + ULONG Refs; + + Refs = InterlockedDecrement((PLONG)&vacb->ReferenceCount); + if (Refs == 0) + { + CcRosInternalFreeVacb(vacb); + } + return Refs; +} #define CcRosVacbGetRefCount(vacb) InterlockedCompareExchange((PLONG)&(vacb)->ReferenceCount, 0, 0) #endif

1 0

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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs