Ros-diffs May 2019

ros-diffs@reactos.org

17 participants
165 discussions

[reactos] 02/09: [NTOS:IO] Avoid a fixed-length buffer in IopGetDriverObject. CORE-15882

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1b20681f53e3ea098eaa… commit e1b20681f53e3ea098eaa75ef95443d1316c0b95 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 24 14:47:59 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun May 5 10:39:01 2019 +0200 [NTOS:IO] Avoid a fixed-length buffer in IopGetDriverObject. CORE-15882 --- ntoskrnl/io/iomgr/driver.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 9bbbb2cda7..49422e003a 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -108,7 +108,7 @@ IopGetDriverObject( BOOLEAN FileSystem) { PDRIVER_OBJECT Object; - WCHAR NameBuffer[MAX_PATH]; + UNICODE_STRING Prefix; UNICODE_STRING DriverName; NTSTATUS Status; @@ -123,14 +123,20 @@ IopGetDriverObject( /* We don't know which DriverObject we have to open */ return STATUS_INVALID_PARAMETER_2; - DriverName.Buffer = NameBuffer; - DriverName.Length = 0; - DriverName.MaximumLength = sizeof(NameBuffer); - if (FileSystem != FALSE) - RtlAppendUnicodeToString(&DriverName, FILESYSTEM_ROOT_NAME); + RtlInitUnicodeString(&Prefix, FILESYSTEM_ROOT_NAME); else - RtlAppendUnicodeToString(&DriverName, DRIVER_ROOT_NAME); + RtlInitUnicodeString(&Prefix, DRIVER_ROOT_NAME); + + DriverName.Length = 0; + DriverName.MaximumLength = Prefix.Length + ServiceName->Length + sizeof(UNICODE_NULL); + ASSERT(DriverName.MaximumLength > ServiceName->Length); + DriverName.Buffer = ExAllocatePoolWithTag(PagedPool, DriverName.MaximumLength, TAG_IO); + if (DriverName.Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlAppendUnicodeStringToString(&DriverName, &Prefix); RtlAppendUnicodeStringToString(&DriverName, ServiceName); DPRINT("Driver name: '%wZ'\n", &DriverName); @@ -144,6 +150,7 @@ IopGetDriverObject( KernelMode, NULL, /* ParseContext */ (PVOID*)&Object); + ExFreePoolWithTag(DriverName.Buffer, TAG_IO); if (!NT_SUCCESS(Status)) { DPRINT("Failed to reference driver object, status=0x%08x\n", Status);

5 years, 7 months

[reactos] 01/09: [NTOS:KDBG] Avoid use of MAX_PATH. CORE-15882

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6fdff1f97053ec6b8d469… commit 6fdff1f97053ec6b8d4697ae0219d644ed1f69f3 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 24 10:44:46 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun May 5 10:38:10 2019 +0200 [NTOS:KDBG] Avoid use of MAX_PATH. CORE-15882 --- ntoskrnl/ex/handle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ex/handle.c b/ntoskrnl/ex/handle.c index 1851d56b09..061e51b888 100644 --- a/ntoskrnl/ex/handle.c +++ b/ntoskrnl/ex/handle.c @@ -1292,7 +1292,7 @@ BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]) EXHANDLE ExHandle; PLIST_ENTRY Entry; PEPROCESS Process; - WCHAR KeyPath[MAX_PATH]; + WCHAR KeyPath[256]; PFILE_OBJECT FileObject; PHANDLE_TABLE HandleTable; POBJECT_HEADER ObjectHeader; @@ -1418,7 +1418,7 @@ BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]) CurrentKcb = CurrentKcb->ParentKcb; } - if (NeededLength < MAX_PATH * sizeof(WCHAR)) + if (NeededLength < sizeof(KeyPath)) { CurrentKcb = Kcb;

5 years, 7 months

[reactos] 02/02: [KERNEL32] Reduce QueryDosDeviceA memory footprint

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d128aa4415c4df5e6e3e… commit 8d128aa4415c4df5e6e3e27d9395ac2c5192c5dc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun May 5 10:12:59 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun May 5 10:17:16 2019 +0200 [KERNEL32] Reduce QueryDosDeviceA memory footprint by using TEB static unicode string (which is already preallocated). Also, properly handle RtlUnicodeStringToAnsiString failures. Finally, make sure output buffer is properly 0 terminated. --- dll/win32/kernel32/client/dosdev.c | 124 ++++++++++++++++++++++++++----------- 1 file changed, 87 insertions(+), 37 deletions(-) diff --git a/dll/win32/kernel32/client/dosdev.c b/dll/win32/kernel32/client/dosdev.c index f077b5b3b3..b32d434195 100644 --- a/dll/win32/kernel32/client/dosdev.c +++ b/dll/win32/kernel32/client/dosdev.c @@ -261,62 +261,112 @@ QueryDosDeviceA( DWORD ucchMax ) { - UNICODE_STRING DeviceNameU; + NTSTATUS Status; + USHORT CurrentPosition; + ANSI_STRING AnsiString; UNICODE_STRING TargetPathU; - ANSI_STRING TargetPathA; - DWORD Length; - DWORD CurrentLength; - PWCHAR Buffer; + PUNICODE_STRING DeviceNameU; + DWORD RetLength, CurrentLength, Length; + PWSTR DeviceNameBuffer, TargetPathBuffer; - if (lpDeviceName) + /* If we want a specific device name, convert it */ + if (lpDeviceName != NULL) { - if (!RtlCreateUnicodeStringFromAsciiz(&DeviceNameU, - (LPSTR)lpDeviceName)) + /* Convert DeviceName using static unicode string */ + RtlInitAnsiString(&AnsiString, lpDeviceName); + DeviceNameU = &NtCurrentTeb()->StaticUnicodeString; + Status = RtlAnsiStringToUnicodeString(DeviceNameU, &AnsiString, FALSE); + if (!NT_SUCCESS(Status)) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; + /* + * If the static unicode string is too small, + * it's because the name is too long... + * so, return appropriate status! + */ + if (Status == STATUS_BUFFER_OVERFLOW) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return FALSE; + } + + BaseSetLastNTError(Status); + return FALSE; } + + DeviceNameBuffer = DeviceNameU->Buffer; + } + else + { + DeviceNameBuffer = NULL; } - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, ucchMax * sizeof(WCHAR)); - if (Buffer == NULL) + + /* Allocate the output buffer for W call */ + TargetPathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, ucchMax * sizeof(WCHAR)); + if (TargetPathBuffer == NULL) { - if (lpDeviceName) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, DeviceNameU.Buffer); - } SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; } - Length = QueryDosDeviceW(lpDeviceName ? DeviceNameU.Buffer : NULL, - Buffer, ucchMax); - if (Length != 0) + /* Call W */ + Length = QueryDosDeviceW(DeviceNameBuffer, TargetPathBuffer, ucchMax); + /* We'll return that length in case of a success */ + RetLength = Length; + + /* Handle the case where we would fill output buffer completly */ + if (Length != 0 && Length == ucchMax) { - TargetPathA.Buffer = lpTargetPath; - TargetPathU.Buffer = Buffer; - ucchMax = Length; + /* This will be our work length (but not the one we return) */ + --Length; + /* Already 0 the last char */ + lpTargetPath[Length] = ANSI_NULL; + } - while (ucchMax) + /* If we had an output, start the convert loop */ + if (Length != 0) + { + /* + * We'll have to loop because TargetPathBuffer may contain + * several strings (NULL separated) + * We'll start at position 0 + */ + CurrentPosition = 0; + while (CurrentPosition < Length) { - CurrentLength = min(ucchMax, MAXUSHORT / 2); - TargetPathU.MaximumLength = TargetPathU.Length = (USHORT)CurrentLength * sizeof(WCHAR); + /* Get the maximum length */ + CurrentLength = min(Length - CurrentPosition, MAXUSHORT / 2); - TargetPathA.Length = 0; - TargetPathA.MaximumLength = (USHORT)CurrentLength; + /* Initialize our output string */ + AnsiString.Length = 0; + AnsiString.MaximumLength = CurrentLength + sizeof(ANSI_NULL); + AnsiString.Buffer = &lpTargetPath[CurrentPosition]; - RtlUnicodeStringToAnsiString(&TargetPathA, &TargetPathU, FALSE); - ucchMax -= CurrentLength; - TargetPathA.Buffer += TargetPathA.Length; - TargetPathU.Buffer += TargetPathU.Length / sizeof(WCHAR); + /* Initialize input string that will be converted */ + TargetPathU.Length = CurrentLength * sizeof(WCHAR); + TargetPathU.MaximumLength = CurrentLength * sizeof(WCHAR) + sizeof(UNICODE_NULL); + TargetPathU.Buffer = &TargetPathBuffer[CurrentPosition]; + + /* Convert to ANSI */ + Status = RtlUnicodeStringToAnsiString(&AnsiString, &TargetPathU, FALSE); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + /* In case of a failure, forget about everything */ + RetLength = 0; + + goto Leave; + } + + /* Move to the next string */ + CurrentPosition += CurrentLength; } } - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - if (lpDeviceName) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, DeviceNameU.Buffer); - } - return Length; +Leave: + /* Free our intermediate buffer and leave */ + RtlFreeHeap(RtlGetProcessHeap(), 0, TargetPathBuffer); + + return RetLength; }

5 years, 7 months

[reactos] 01/02: [KERNEL32] Reduce DefineDosDeviceA memory footprint

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ed7f27466c8fdd707795… commit 1ed7f27466c8fdd70779504d93b2383a5764a495 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun May 5 09:25:34 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun May 5 10:17:16 2019 +0200 [KERNEL32] Reduce DefineDosDeviceA memory footprint by using TEB static unicode string (which is already preallocated). --- dll/win32/kernel32/client/dosdev.c | 60 +++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/dll/win32/kernel32/client/dosdev.c b/dll/win32/kernel32/client/dosdev.c index 5352e57f06..f077b5b3b3 100644 --- a/dll/win32/kernel32/client/dosdev.c +++ b/dll/win32/kernel32/client/dosdev.c @@ -30,41 +30,61 @@ DefineDosDeviceA( LPCSTR lpTargetPath ) { - UNICODE_STRING DeviceNameU = {0}; - UNICODE_STRING TargetPathU = {0}; BOOL Result; + NTSTATUS Status; + ANSI_STRING AnsiString; + PWSTR TargetPathBuffer; + UNICODE_STRING TargetPathU; + PUNICODE_STRING DeviceNameU; - if (lpDeviceName && - !RtlCreateUnicodeStringFromAsciiz(&DeviceNameU, lpDeviceName)) + /* Convert DeviceName using static unicode string */ + RtlInitAnsiString(&AnsiString, lpDeviceName); + DeviceNameU = &NtCurrentTeb()->StaticUnicodeString; + Status = RtlAnsiStringToUnicodeString(DeviceNameU, &AnsiString, FALSE); + if (!NT_SUCCESS(Status)) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; + /* + * If the static unicode string is too small, + * it's because the name is too long... + * so, return appropriate status! + */ + if (Status == STATUS_BUFFER_OVERFLOW) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return FALSE; + } + + BaseSetLastNTError(Status); + return FALSE; } - if (lpTargetPath && - !RtlCreateUnicodeStringFromAsciiz(&TargetPathU, lpTargetPath)) + /* Convert target path if existing */ + if (lpTargetPath != NULL) { - if (DeviceNameU.Buffer) + RtlInitAnsiString(&AnsiString, lpTargetPath); + Status = RtlAnsiStringToUnicodeString(&TargetPathU, &AnsiString, TRUE); + if (!NT_SUCCESS(Status)) { - RtlFreeUnicodeString(&DeviceNameU); + BaseSetLastNTError(Status); + return FALSE; } - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; + + TargetPathBuffer = TargetPathU.Buffer; + } + else + { + TargetPathBuffer = NULL; } - Result = DefineDosDeviceW(dwFlags, - DeviceNameU.Buffer, - TargetPathU.Buffer); + /* Call W */ + Result = DefineDosDeviceW(dwFlags, DeviceNameU->Buffer, TargetPathBuffer); - if (TargetPathU.Buffer) + /* Free target path if allocated */ + if (TargetPathBuffer != NULL) { RtlFreeUnicodeString(&TargetPathU); } - if (DeviceNameU.Buffer) - { - RtlFreeUnicodeString(&DeviceNameU); - } return Result; }

5 years, 7 months

[reactos] 01/01: [CONSOLE.CPL] Fix the console screen preview when selecting TrueType fonts. CORE-13182 CORE-13196

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ebda0e3d0e583ee6d24b… commit 2ebda0e3d0e583ee6d24b04132923aaa6a1c0e1a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 5 01:10:39 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 5 01:20:19 2019 +0200 [CONSOLE.CPL] Fix the console screen preview when selecting TrueType fonts. CORE-13182 CORE-13196 - Use the correct character height & width. - Additions: use StringCch*() when initializing the dialog title. [CONSRV:CONCFG] Minor fixes. - When retrieving font characteristics in ConCfgReadUserSettings(), check for NULL/zero values that indicate that we should use default ones instead. - Rename 'dwNumSubKeys' into 'dwNumValues'. --- dll/cpl/console/console.c | 25 +++++++++-------------- dll/cpl/console/console.h | 9 ++++++++- dll/cpl/console/font.c | 28 ++++++++++++-------------- dll/cpl/console/layout.c | 6 +++--- win32ss/user/winsrv/concfg/settings.c | 38 +++++++++++++++++++++++------------ 5 files changed, 59 insertions(+), 47 deletions(-) diff --git a/dll/cpl/console/console.c b/dll/cpl/console/console.c index d39253a0c6..89e9ac57fb 100644 --- a/dll/cpl/console/console.c +++ b/dll/cpl/console/console.c @@ -228,25 +228,20 @@ InitApplet(HANDLE hSectionOrWnd) } /* Initialize the font support */ - hCurrentFont = CreateConsoleFont(ConInfo); - if (hCurrentFont == NULL) - DPRINT1("InitApplet: CreateConsoleFont failed\n"); + FontPreview.hFont = CreateConsoleFont(ConInfo); + if (FontPreview.hFont == NULL) + DPRINT1("InitApplet: CreateConsoleFont() failed\n"); + GetFontCellSize(NULL, FontPreview.hFont, &FontPreview.CharHeight, &FontPreview.CharWidth); /* Initialize the property sheet structure */ ZeroMemory(&psh, sizeof(psh)); psh.dwSize = sizeof(psh); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE | /* PSH_USEHICON */ PSH_USEICONID | PSH_NOAPPLYNOW | PSH_USECALLBACK; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE | /* PSH_USEHICON | */ PSH_USEICONID | PSH_NOAPPLYNOW | PSH_USECALLBACK; if (ConInfo->ConsoleTitle[0] != UNICODE_NULL) - { - wcsncpy(szTitle, L"\"", MAX_PATH); - wcsncat(szTitle, ConInfo->ConsoleTitle, MAX_PATH - wcslen(szTitle)); - wcsncat(szTitle, L"\"", MAX_PATH - wcslen(szTitle)); - } + StringCchPrintfW(szTitle, ARRAYSIZE(szTitle), L"\"%s\"", ConInfo->ConsoleTitle); else - { - wcscpy(szTitle, L"ReactOS Console"); - } + StringCchCopyW(szTitle, ARRAYSIZE(szTitle), L"ReactOS Console"); psh.pszCaption = szTitle; if (pSharedInfo != NULL) @@ -278,9 +273,9 @@ InitApplet(HANDLE hSectionOrWnd) Result = PropertySheetW(&psh); UnRegisterWinPrevClass(hApplet); - /* First cleanup */ - if (hCurrentFont) DeleteObject(hCurrentFont); - hCurrentFont = NULL; + /* Clear the font support */ + if (FontPreview.hFont) DeleteObject(FontPreview.hFont); + FontPreview.hFont = NULL; /* Save the console settings */ if (SetConsoleInfo) diff --git a/dll/cpl/console/console.h b/dll/cpl/console/console.h index 04508bf063..0f7b592494 100644 --- a/dll/cpl/console/console.h +++ b/dll/cpl/console/console.h @@ -35,10 +35,17 @@ typedef enum _TEXT_TYPE Popup } TEXT_TYPE; +typedef struct _FONT_PREVIEW +{ + HFONT hFont; + UINT CharWidth; + UINT CharHeight; +} FONT_PREVIEW; + /* Globals */ extern HINSTANCE hApplet; extern PCONSOLE_STATE_INFO ConInfo; -extern HFONT hCurrentFont; +extern FONT_PREVIEW FontPreview; VOID ApplyConsoleInfo(HWND hwndDlg); diff --git a/dll/cpl/console/font.c b/dll/cpl/console/font.c index 45a2612b39..66c9cc6a41 100644 --- a/dll/cpl/console/font.c +++ b/dll/cpl/console/font.c @@ -18,7 +18,7 @@ * Current active font, corresponding to the active console font, * and used for painting the text samples. */ -HFONT hCurrentFont = NULL; +FONT_PREVIEW FontPreview = {NULL, 0, 0}; /* @@ -597,8 +597,7 @@ FontSizeChange( IN PFONTSIZE_LIST_CTL SizeList, IN OUT PCONSOLE_STATE_INFO pConInfo) { - HDC hDC; - LONG CharWidth, CharHeight, FontSize; + LONG FontSize, CharWidth, CharHeight; WCHAR szFontSize[100]; /* @@ -614,33 +613,32 @@ FontSizeChange( CharHeight = (SizeList->UseRasterOrTTList ? (LONG)HIWORD(FontSize) : FontSize); CharWidth = (SizeList->UseRasterOrTTList ? (LONG)LOWORD(FontSize) : 0); - if (hCurrentFont) DeleteObject(hCurrentFont); - hCurrentFont = CreateConsoleFont2(CharHeight, CharWidth, pConInfo); - if (hCurrentFont == NULL) - DPRINT1("FontSizeChange: CreateConsoleFont2 failed\n"); + if (FontPreview.hFont) DeleteObject(FontPreview.hFont); + FontPreview.hFont = CreateConsoleFont2(CharHeight, CharWidth, pConInfo); + if (FontPreview.hFont == NULL) + DPRINT1("FontSizeChange: CreateConsoleFont2() failed\n"); /* Retrieve the real character size in pixels */ - hDC = GetDC(NULL); - GetFontCellSize(hDC, hCurrentFont, (PUINT)&CharHeight, (PUINT)&CharWidth); - ReleaseDC(NULL, hDC); + GetFontCellSize(NULL, FontPreview.hFont, &FontPreview.CharHeight, &FontPreview.CharWidth); /* * Format: * Width = FontSize.X = LOWORD(FontSize); * Height = FontSize.Y = HIWORD(FontSize); */ - pConInfo->FontSize.X = (SHORT)(SizeList->UseRasterOrTTList ? CharWidth : 0); - pConInfo->FontSize.Y = (SHORT)CharHeight; + pConInfo->FontSize.X = (SHORT)(SizeList->UseRasterOrTTList ? FontPreview.CharWidth : 0); + pConInfo->FontSize.Y = (SHORT)FontPreview.CharHeight; DPRINT1("pConInfo->FontSize = (%d x %d) ; (CharWidth x CharHeight) = (%d x %d)\n", - pConInfo->FontSize.X, pConInfo->FontSize.Y, CharWidth, CharHeight); + pConInfo->FontSize.X, pConInfo->FontSize.Y, + FontPreview.CharWidth, FontPreview.CharHeight); InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_FONT_WINDOW_PREVIEW), NULL, TRUE); InvalidateRect(GetDlgItem(hDlg, IDC_STATIC_SELECT_FONT_PREVIEW), NULL, TRUE); - StringCchPrintfW(szFontSize, ARRAYSIZE(szFontSize), L"%d", CharWidth); + StringCchPrintfW(szFontSize, ARRAYSIZE(szFontSize), L"%d", FontPreview.CharWidth); SetDlgItemText(hDlg, IDC_FONT_SIZE_X, szFontSize); - StringCchPrintfW(szFontSize, ARRAYSIZE(szFontSize), L"%d", CharHeight); + StringCchPrintfW(szFontSize, ARRAYSIZE(szFontSize), L"%d", FontPreview.CharHeight); SetDlgItemText(hDlg, IDC_FONT_SIZE_Y, szFontSize); return TRUE; diff --git a/dll/cpl/console/layout.c b/dll/cpl/console/layout.c index 9123a1fca7..f8d998625c 100644 --- a/dll/cpl/console/layout.c +++ b/dll/cpl/console/layout.c @@ -205,8 +205,8 @@ WinPrev_OnDraw( /* We start with the console client area, rescaled for the preview */ SetRect(&rcWin, 0, 0, - pConInfo->WindowSize.X * pConInfo->FontSize.X, - pConInfo->WindowSize.Y * pConInfo->FontSize.Y); + pConInfo->WindowSize.X * FontPreview.CharWidth, + pConInfo->WindowSize.Y * FontPreview.CharHeight); RescaleRect(pData, rcWin); /* Add the scrollbars if needed (does not account for any frame) */ @@ -489,7 +489,7 @@ PaintText( hBrush = CreateSolidBrush(nbkColor); if (!hBrush) return; - hOldFont = SelectObject(drawItem->hDC, hCurrentFont); + hOldFont = SelectObject(drawItem->hDC, FontPreview.hFont); //if (hOldFont == NULL) //{ // DeleteObject(hBrush); diff --git a/win32ss/user/winsrv/concfg/settings.c b/win32ss/user/winsrv/concfg/settings.c index fcc66d82af..2c7624f74a 100644 --- a/win32ss/user/winsrv/concfg/settings.c +++ b/win32ss/user/winsrv/concfg/settings.c @@ -120,7 +120,7 @@ ConCfgOpenUserSettings( Status = RtlOpenCurrentUser(/*samDesired*/MAXIMUM_ALLOWED, (PHANDLE)&/*CurrentUserKeyHandle*/hKey); if (!NT_SUCCESS(Status)) { - DPRINT1("RtlOpenCurrentUser failed, Status = 0x%08lx\n", Status); + DPRINT1("RtlOpenCurrentUser() failed, Status = 0x%08lx\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -170,7 +170,7 @@ ConCfgReadUserSettings( { BOOLEAN Success = FALSE; HKEY hKey; - DWORD dwNumSubKeys = 0; + DWORD dwNumValues = 0; DWORD dwIndex; DWORD dwColorIndex = 0; DWORD dwType; @@ -183,21 +183,21 @@ ConCfgReadUserSettings( if (!ConCfgOpenUserSettings(DefaultSettings ? L"" : ConsoleInfo->ConsoleTitle, &hKey, KEY_READ, FALSE)) { - DPRINT("ConCfgOpenUserSettings failed\n"); + DPRINT("ConCfgOpenUserSettings() failed\n"); return FALSE; } if (RegQueryInfoKeyW(hKey, NULL, NULL, NULL, NULL, NULL, NULL, - &dwNumSubKeys, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + &dwNumValues, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) { - DPRINT("ConCfgReadUserSettings: RegQueryInfoKeyW failed\n"); + DPRINT("ConCfgReadUserSettings: RegQueryInfoKeyW() failed\n"); RegCloseKey(hKey); return FALSE; } - DPRINT("ConCfgReadUserSettings entered dwNumSubKeys %d\n", dwNumSubKeys); + DPRINT("ConCfgReadUserSettings() entered, dwNumValues %d\n", dwNumValues); - for (dwIndex = 0; dwIndex < dwNumSubKeys; dwIndex++) + for (dwIndex = 0; dwIndex < dwNumValues; dwIndex++) { dwValue = sizeof(Value); dwValueName = ARRAYSIZE(szValueName); @@ -238,24 +238,36 @@ ConCfgReadUserSettings( } else if (!wcscmp(szValueName, L"FaceName")) { - StringCchCopyNW(ConsoleInfo->FaceName, ARRAYSIZE(ConsoleInfo->FaceName), - szValue, ARRAYSIZE(szValue)); + /* A NULL value means that the defaults should be used instead */ + if (*szValue) + { + StringCchCopyNW(ConsoleInfo->FaceName, ARRAYSIZE(ConsoleInfo->FaceName), + szValue, ARRAYSIZE(szValue)); + } Success = TRUE; } else if (!wcscmp(szValueName, L"FontFamily")) { - ConsoleInfo->FontFamily = Value; + /* A zero value means that the defaults should be used instead */ + if (Value) + ConsoleInfo->FontFamily = Value; Success = TRUE; } else if (!wcscmp(szValueName, L"FontSize")) { - ConsoleInfo->FontSize.X = LOWORD(Value); // Width - ConsoleInfo->FontSize.Y = HIWORD(Value); // Height + /* A zero value means that the defaults should be used instead */ + if (Value) + { + ConsoleInfo->FontSize.X = LOWORD(Value); // Width + ConsoleInfo->FontSize.Y = HIWORD(Value); // Height + } Success = TRUE; } else if (!wcscmp(szValueName, L"FontWeight")) { - ConsoleInfo->FontWeight = Value; + /* A zero value means that the defaults should be used instead */ + if (Value) + ConsoleInfo->FontWeight = Value; Success = TRUE; } else if (!wcscmp(szValueName, L"HistoryBufferSize"))

5 years, 7 months

[reactos] 01/01: [MC] Add message tranlations. Supplement to 3acec58f.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa63416d87a874a5f6817… commit fa63416d87a874a5f6817b472ac352c22b128a2f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 4 23:13:28 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 4 23:13:28 2019 +0200 [MC] Add message tranlations. Supplement to 3acec58f. --- sdk/include/reactos/mc/netmsgmsg.mc | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 907db0989c..3a90d20850 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -35166,25 +35166,25 @@ Language=English PRIMARY%0. . Language=Polish -PRIMARY%0. +Serwer podstawowy%0. . Language=Romanian -PRIMARY%0. +Server primar%0. . Language=Russian -PRIMARY%0. +Основной сервер%0. . Language=Spanish -PRIMARY%0. +Servidor primario%0. . Language=Turkish -PRIMARY%0. +Birinci sunucu%0. . Language=Chinese -PRIMARY%0. +主服务器%0. . Language=Taiwanese -PRIMARY%0. +主伺服器%0. . MessageId=5071 @@ -35195,25 +35195,25 @@ Language=English BACKUP%0. . Language=Polish -BACKUP%0. +Serwer zapasowy%0. . Language=Romanian -BACKUP%0. +Server de rezervă%0. . Language=Russian -BACKUP%0. +Резервный сервер%0. . Language=Spanish -BACKUP%0. +Servidor de respaldo%0. . Language=Turkish -BACKUP%0. +Yedekleme sunucusu%0. . Language=Chinese -BACKUP%0. +备份服务器%0. . Language=Taiwanese -BACKUP%0. +備份伺服器%0. . MessageId=5072 @@ -35224,25 +35224,25 @@ Language=English WORKSTATION%0. . Language=Polish -WORKSTATION%0. +Stacja robocza%0. . Language=Romanian -WORKSTATION%0. +Stație de lucru%0. . Language=Russian -WORKSTATION%0. +Рабочая станция%0. . Language=Spanish -WORKSTATION%0. +Estación de trabajo%0. . Language=Turkish -WORKSTATION%0. +İş istasyonu%0. . Language=Chinese -WORKSTATION%0. +工作站%0. . Language=Taiwanese -WORKSTATION%0. +工作站%0. . MessageId=5073 @@ -35253,25 +35253,25 @@ Language=English SERVER%0. . Language=Polish -SERVER%0. +Serwer autonomiczny%0. . Language=Romanian -SERVER%0. +Server de sine stătător%0. . Language=Russian -SERVER%0. +Автономный сервер%0. . Language=Spanish -SERVER%0. +Servidor independiente%0. . Language=Turkish -SERVER%0. +Bağımsız sunucu%0. . Language=Chinese -SERVER%0. +独立服务器%0. . Language=Taiwanese -SERVER%0. +獨立伺服器%0. . MessageId=5080

5 years, 7 months

[reactos] 01/01: [NET] Replace remaining strings of the NET ACCOUNTS command by messages

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3acec58fb5e7a8af2c8b9… commit 3acec58fb5e7a8af2c8b949d3b16e3fedc2f0e49 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 4 21:08:27 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 4 21:12:09 2019 +0200 [NET] Replace remaining strings of the NET ACCOUNTS command by messages --- base/applications/network/net/cmdAccounts.c | 12 ++++++------ base/applications/network/net/lang/en-US.rc | 7 ------- base/applications/network/net/lang/es-ES.rc | 7 ------- base/applications/network/net/lang/pl-PL.rc | 7 ------- base/applications/network/net/lang/ro-RO.rc | 7 ------- base/applications/network/net/lang/ru-RU.rc | 7 ------- base/applications/network/net/lang/tr-TR.rc | 7 ------- base/applications/network/net/lang/zh-CN.rc | 7 ------- base/applications/network/net/lang/zh-TW.rc | 7 ------- base/applications/network/net/resource.h | 9 --------- 10 files changed, 6 insertions(+), 71 deletions(-) diff --git a/base/applications/network/net/cmdAccounts.c b/base/applications/network/net/cmdAccounts.c index 55586c4962..7fad061c5c 100644 --- a/base/applications/network/net/cmdAccounts.c +++ b/base/applications/network/net/cmdAccounts.c @@ -174,11 +174,11 @@ cmdAccounts( RtlGetNtProductType(&ProductType); - PrintPaddedResourceString(IDS_ACCOUNTS_FORCE_LOGOFF, nPaddedLength); + PrintPaddedMessageString(4570, nPaddedLength); if (Info0->usrmod0_force_logoff == TIMEQ_FOREVER) PrintMessageString(4305); else - ConResPrintf(StdOut, IDS_ACCOUNTS_LOGOFF_SECONDS, Info0->usrmod0_force_logoff); + ConPrintf(StdOut, L"%lu", Info0->usrmod0_force_logoff); ConPuts(StdOut, L"\n"); PrintPaddedMessageString(4572, nPaddedLength); @@ -215,20 +215,20 @@ cmdAccounts( { if (ProductType == NtProductLanManNt) { - ConResPuts(StdOut, IDS_ACCOUNTS_PRIMARY_SERVER); + PrintMessageString(5070); } else if (ProductType == NtProductServer) { - ConResPuts(StdOut, IDS_ACCOUNTS_STANDALONE_SERVER); + PrintMessageString(5073); } else { - ConResPuts(StdOut, IDS_ACCOUNTS_WORKSTATION); + PrintMessageString(5072); } } else { - ConResPuts(StdOut, IDS_ACCOUNTS_BACKUP_SERVER); + PrintMessageString(5071); } ConPuts(StdOut, L"\n"); } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 11b0a59e8c..38ae6cab44 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -2,12 +2,5 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "Force logoff after" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu seconds" - IDS_ACCOUNTS_PRIMARY_SERVER "Primary server" - IDS_ACCOUNTS_BACKUP_SERVER "Backup server" - IDS_ACCOUNTS_STANDALONE_SERVER "Standalone server" - IDS_ACCOUNTS_WORKSTATION "Workstation" - IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" END diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 1e6c9cb4c5..dbafe64de6 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -5,12 +5,5 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "Forzar cierre de sesión tras" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu segundos" - IDS_ACCOUNTS_PRIMARY_SERVER "Servidor primario" - IDS_ACCOUNTS_BACKUP_SERVER "Servidor de respaldo" - IDS_ACCOUNTS_STANDALONE_SERVER "Servidor independiente" - IDS_ACCOUNTS_WORKSTATION "Estación de trabajo" - IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" END diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index 31ce03a706..8a09e17ef9 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -1,12 +1,5 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "Wymuś wylogowanie po upływie" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu sekund" - IDS_ACCOUNTS_PRIMARY_SERVER "Serwer podstawowy" - IDS_ACCOUNTS_BACKUP_SERVER "Serwer zapasowy" - IDS_ACCOUNTS_STANDALONE_SERVER "Serwer autonomiczny" - IDS_ACCOUNTS_WORKSTATION "Stacja robocza" - IDS_USE_NOW_CONNECTED "%s jest obecnie podłączony do %s\n" END diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 7379b9175e..094ecb1fec 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -8,12 +8,5 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "Forțează deautentificarea după" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu secunde" - IDS_ACCOUNTS_PRIMARY_SERVER "Server primar" - IDS_ACCOUNTS_BACKUP_SERVER "Server de rezervă" - IDS_ACCOUNTS_STANDALONE_SERVER "Server de sine stătător" - IDS_ACCOUNTS_WORKSTATION "Stație de lucru" - IDS_USE_NOW_CONNECTED "Conectarea %s la %s a fost realizată.\n" END diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index cc81e5a17e..453eade937 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -4,12 +4,5 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "Принудительный выход через" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu секунд" - IDS_ACCOUNTS_PRIMARY_SERVER "Основной сервер" - IDS_ACCOUNTS_BACKUP_SERVER "Резервный сервер" - IDS_ACCOUNTS_STANDALONE_SERVER "Автономный сервер" - IDS_ACCOUNTS_WORKSTATION "Рабочая станция" - IDS_USE_NOW_CONNECTED "%s сейчас подключен к %s\n" END diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index e0a083033f..d2e8689ca1 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -4,12 +4,5 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "Sonra oturum kapatmaya zorla" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu sâniye" - IDS_ACCOUNTS_PRIMARY_SERVER "Birinci sunucu" - IDS_ACCOUNTS_BACKUP_SERVER "Yedekleme sunucusu" - IDS_ACCOUNTS_STANDALONE_SERVER "Bağımsız sunucu" - IDS_ACCOUNTS_WORKSTATION "İş istasyonu" - IDS_USE_NOW_CONNECTED "%s şuna bağlandı: %s\n" END diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 4f6ab0ea00..7b04b492c6 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -4,12 +4,5 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "强制注销后" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu 秒" - IDS_ACCOUNTS_PRIMARY_SERVER "主服务器" - IDS_ACCOUNTS_BACKUP_SERVER "备份服务器" - IDS_ACCOUNTS_STANDALONE_SERVER "独立服务器" - IDS_ACCOUNTS_WORKSTATION "工作站" - IDS_USE_NOW_CONNECTED "%s 现在连接到 %s\n" END diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 648d849efb..51fddd57f9 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -4,12 +4,5 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN - IDS_ACCOUNTS_FORCE_LOGOFF "強制登出後" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu 秒" - IDS_ACCOUNTS_PRIMARY_SERVER "主伺服器" - IDS_ACCOUNTS_BACKUP_SERVER "備份伺服器" - IDS_ACCOUNTS_STANDALONE_SERVER "獨立伺服器" - IDS_ACCOUNTS_WORKSTATION "工作站" - IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" END diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index fc178baa3b..6ce6880835 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -1,12 +1,3 @@ #pragma once -#define IDS_ACCOUNTS_FORCE_LOGOFF 200 -#define IDS_ACCOUNTS_LOGOFF_SECONDS 201 -#define IDS_ACCOUNTS_PRIMARY_SERVER 210 -#define IDS_ACCOUNTS_BACKUP_SERVER 211 -#define IDS_ACCOUNTS_STANDALONE_SERVER 212 -#define IDS_ACCOUNTS_WORKSTATION 213 - #define IDS_USE_NOW_CONNECTED 500 - -

5 years, 7 months

[reactos] 01/01: [ROSAUTOTEST] Don't disallow buffering for journal file

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83d8fbf434e8c0b7c4ae5… commit 83d8fbf434e8c0b7c4ae550ce72e2f09c47020e5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri May 3 12:13:51 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat May 4 11:54:39 2019 +0200 [ROSAUTOTEST] Don't disallow buffering for journal file This fixes back journal in ReactOS "at low costs". Indeed, because write are improperly aligned right now, journaling just fails. With that patch, Cc will take care of aligning writes and journal will be written again. Because flush operations happen at each and every write to the journal, we expect changes to land on disk quickly (not as quickly as if they were directly written). But that's a good trade off between over engineering and fixing a broken feature. CORE-15973 --- modules/rostests/rosautotest/CJournaledTestList.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/rosautotest/CJournaledTestList.cpp b/modules/rostests/rosautotest/CJournaledTestList.cpp index cd3c9a87c1..925a408b71 100644 --- a/modules/rostests/rosautotest/CJournaledTestList.cpp +++ b/modules/rostests/rosautotest/CJournaledTestList.cpp @@ -70,7 +70,7 @@ CJournaledTestList::OpenJournal(DWORD DesiredAccess, bool CreateNew) 0, NULL, (CreateNew ? CREATE_ALWAYS : OPEN_EXISTING), - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING | FILE_FLAG_WRITE_THROUGH, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH, NULL );

5 years, 7 months

[reactos] 01/01: [AUTOCHK] Don't check any volume on boot

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab69736a1d9c76260c500… commit ab69736a1d9c76260c500b11491328244d027893 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat May 4 10:57:33 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat May 4 11:02:29 2019 +0200 [AUTOCHK] Don't check any volume on boot This will avoid triggering a FAT repair on unclean FAT volumes. If dosfstools.fsck works fine in Linux, its usage on ReactOS triggers worse corruption than unclean shutdown. Given I've no time for debugging this, I kill it off. CORE-14638 --- boot/bootdata/hivesys.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 966a1ea21c..68d23cff00 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1437,7 +1437,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","SCSI Miniport", 0x000000 ; Session Manager stuff HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute", 0x00010000, \ - "autocheck autochk *" + "autocheck autochk" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","GlobalFlag", 0x00010003, 0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \ "\Windows", \

5 years, 7 months

[reactos] 01/01: [WIN32SS][NTGDI] Correctly get/update ptlCurrent about TA_UPDATECP

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=262f712810cd7db20fe67… commit 262f712810cd7db20fe67decc2cde1bb4e5a7c83 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat May 4 10:07:24 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat May 4 10:07:24 2019 +0900 [WIN32SS][NTGDI] Correctly get/update ptlCurrent about TA_UPDATECP --- win32ss/gdi/ntgdi/freetype.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 0f04a3a5d1..f73c1c0902 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5667,9 +5667,10 @@ IntExtTextOutW( if (pdcattr->flTextAlign & TA_UPDATECP) { - Start.x = pdcattr->ptlCurrent.x; - Start.y = pdcattr->ptlCurrent.y; - } else { + IntGetCurrentPositionEx(dc, &Start); + } + else + { Start.x = XStart; Start.y = YStart; } @@ -6311,6 +6312,8 @@ IntExtTextOutW( pdcattr->ptlCurrent.x = vecs[2].x - dc->ptlDCOrig.x; pdcattr->ptlCurrent.y = vecs[2].y - dc->ptlDCOrig.y; IntDPtoLP(dc, &pdcattr->ptlCurrent, 1); + pdcattr->ulDirty_ &= ~DIRTY_PTLCURRENT; + pdcattr->ulDirty_ |= (DIRTY_PTFXCURRENT | DIRTY_STYLESTATE); } IntUnLockFreeType();

5 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2019