Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/03: [TIMEDATE.CPL][SYSSETUP][TZLIB] Introduce a small static library "tzlib": "TimeZone Utilities Library", and use it in timedate.cpl and syssetup.dll.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c3e96a26a15de8930cdd… commit 7c3e96a26a15de8930cddf670d43bbf50c16bfad Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 19 17:48:25 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 22 00:58:32 2020 +0200 [TIMEDATE.CPL][SYSSETUP][TZLIB] Introduce a small static library "tzlib": "TimeZone Utilities Library", and use it in timedate.cpl and syssetup.dll. This small win32 library provides time-zone utility wrappers around Win32 functions, that are used by different ReactOS modules such as timedate.cpl, syssetup.dll, and a possible future 'tzutil' tool. The code has been extracted from the common code found in both timedate.cpl and syssetup.dll. --- dll/cpl/timedate/CMakeLists.txt | 3 + dll/cpl/timedate/timezone.c | 296 ++++++---------------- dll/win32/syssetup/CMakeLists.txt | 4 +- dll/win32/syssetup/wizard.c | 362 +++++++-------------------- sdk/include/reactos/libs/syssetup/syssetup.h | 25 +- sdk/lib/CMakeLists.txt | 1 + sdk/lib/tzlib/CMakeLists.txt | 3 + sdk/lib/tzlib/tzlib.c | 352 ++++++++++++++++++++++++++ sdk/lib/tzlib/tzlib.h | 56 +++++ 9 files changed, 584 insertions(+), 518 deletions(-) diff --git a/dll/cpl/timedate/CMakeLists.txt b/dll/cpl/timedate/CMakeLists.txt index 20f0d62d59c..fcf2fd2d03b 100644 --- a/dll/cpl/timedate/CMakeLists.txt +++ b/dll/cpl/timedate/CMakeLists.txt @@ -1,4 +1,6 @@ +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/tzlib) + spec2def(timedate.cpl timedate.spec) list(APPEND SOURCE @@ -19,6 +21,7 @@ add_library(timedate MODULE ${CMAKE_CURRENT_BINARY_DIR}/timedate.def) set_module_type(timedate cpl UNICODE) +target_link_libraries(timedate tzlib) add_importlibs(timedate w32time advapi32 user32 gdi32 comctl32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(timedate timedate.h SOURCE) add_cd_file(TARGET timedate DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/timedate/timezone.c b/dll/cpl/timedate/timezone.c index 95a4e33220e..9dd79e1d01a 100644 --- a/dll/cpl/timedate/timezone.c +++ b/dll/cpl/timedate/timezone.c @@ -10,25 +10,16 @@ */ #include "timedate.h" - -// See also sdk/include/reactos/libs/syssetup/syssetup.h -typedef struct _TZ_INFO -{ - LONG Bias; - LONG StandardBias; - LONG DaylightBias; - SYSTEMTIME StandardDate; - SYSTEMTIME DaylightDate; -} TZ_INFO, *PTZ_INFO; +#include <tzlib.h> typedef struct _TIMEZONE_ENTRY { struct _TIMEZONE_ENTRY *Prev; struct _TIMEZONE_ENTRY *Next; - WCHAR Description[128]; /* 'Display' */ - WCHAR StandardName[33]; /* 'Std' */ - WCHAR DaylightName[33]; /* 'Dlt' */ - TZ_INFO TimezoneInfo; /* 'TZI' */ + WCHAR Description[128]; /* 'Display' */ + WCHAR StandardName[33]; /* 'Std' */ + WCHAR DaylightName[33]; /* 'Dlt' */ + REG_TZI_FORMAT TimezoneInfo; /* 'TZI' */ } TIMEZONE_ENTRY, *PTIMEZONE_ENTRY; @@ -64,159 +55,91 @@ GetLargerTimeZoneEntry( return NULL; } - -static -LONG -QueryTimezoneData( - HKEY hZoneKey, - PTIMEZONE_ENTRY Entry) -{ - DWORD dwValueSize; - LONG lError; - - dwValueSize = sizeof(Entry->Description); - lError = RegQueryValueExW(hZoneKey, - L"Display", - NULL, - NULL, - (LPBYTE)&Entry->Description, - &dwValueSize); - if (lError != ERROR_SUCCESS) - return lError; - - dwValueSize = sizeof(Entry->StandardName); - lError = RegQueryValueExW(hZoneKey, - L"Std", - NULL, - NULL, - (LPBYTE)&Entry->StandardName, - &dwValueSize); - if (lError != ERROR_SUCCESS) - return lError; - - dwValueSize = sizeof(Entry->DaylightName); - lError = RegQueryValueExW(hZoneKey, - L"Dlt", - NULL, - NULL, - (LPBYTE)&Entry->DaylightName, - &dwValueSize); - if (lError != ERROR_SUCCESS) - return lError; - - dwValueSize = sizeof(Entry->TimezoneInfo); - lError = RegQueryValueExW(hZoneKey, - L"TZI", - NULL, - NULL, - (LPBYTE)&Entry->TimezoneInfo, - &dwValueSize); - return lError; -} - - -static VOID -CreateTimeZoneList(VOID) +static LONG +RetrieveTimeZone( + IN HKEY hZoneKey, + IN PVOID Context) { - WCHAR szKeyName[256]; - DWORD dwIndex; - DWORD dwNameSize; LONG lError; - HKEY hZonesKey; - HKEY hZoneKey; PTIMEZONE_ENTRY Entry; PTIMEZONE_ENTRY Current; + ULONG DescriptionSize; + ULONG StandardNameSize; + ULONG DaylightNameSize; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", - 0, - KEY_ENUMERATE_SUB_KEYS, - &hZonesKey)) - return; - - for (dwIndex = 0; ; dwIndex++) + Entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TIMEZONE_ENTRY)); + if (Entry == NULL) { - dwNameSize = sizeof(szKeyName); - lError = RegEnumKeyExW(hZonesKey, - dwIndex, - szKeyName, - &dwNameSize, - NULL, - NULL, - NULL, - NULL); - if (lError == ERROR_NO_MORE_ITEMS) - break; - - if (RegOpenKeyEx (hZonesKey, - szKeyName, - 0, - KEY_QUERY_VALUE, - &hZoneKey)) - break; - - Entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TIMEZONE_ENTRY)); - if (Entry == NULL) - { - RegCloseKey(hZoneKey); - break; - } - - lError = QueryTimezoneData(hZoneKey, - Entry); + return ERROR_NOT_ENOUGH_MEMORY; + } - RegCloseKey(hZoneKey); + DescriptionSize = sizeof(Entry->Description); + StandardNameSize = sizeof(Entry->StandardName); + DaylightNameSize = sizeof(Entry->DaylightName); - if (lError != ERROR_SUCCESS) - { - HeapFree(GetProcessHeap(), 0, Entry); - break; - } + lError = QueryTimeZoneData(hZoneKey, + NULL, + &Entry->TimezoneInfo, + Entry->Description, + &DescriptionSize, + Entry->StandardName, + &StandardNameSize, + Entry->DaylightName, + &DaylightNameSize); + if (lError != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, Entry); + return lError; + } - if (TimeZoneListHead == NULL && - TimeZoneListTail == NULL) - { - Entry->Prev = NULL; - Entry->Next = NULL; - TimeZoneListHead = Entry; - TimeZoneListTail = Entry; - } - else + if (TimeZoneListHead == NULL && + TimeZoneListTail == NULL) + { + Entry->Prev = NULL; + Entry->Next = NULL; + TimeZoneListHead = Entry; + TimeZoneListTail = Entry; + } + else + { + Current = GetLargerTimeZoneEntry(Entry->TimezoneInfo.Bias, Entry->Description); + if (Current != NULL) { - Current = GetLargerTimeZoneEntry(Entry->TimezoneInfo.Bias, Entry->Description); - if (Current != NULL) + if (Current == TimeZoneListHead) { - if (Current == TimeZoneListHead) - { - /* Prepend to head */ - Entry->Prev = NULL; - Entry->Next = TimeZoneListHead; - TimeZoneListHead->Prev = Entry; - TimeZoneListHead = Entry; - } - else - { - /* Insert before current */ - Entry->Prev = Current->Prev; - Entry->Next = Current; - Current->Prev->Next = Entry; - Current->Prev = Entry; - } + /* Prepend to head */ + Entry->Prev = NULL; + Entry->Next = TimeZoneListHead; + TimeZoneListHead->Prev = Entry; + TimeZoneListHead = Entry; } else { - /* Append to tail */ - Entry->Prev = TimeZoneListTail; - Entry->Next = NULL; - TimeZoneListTail->Next = Entry; - TimeZoneListTail = Entry; + /* Insert before current */ + Entry->Prev = Current->Prev; + Entry->Next = Current; + Current->Prev->Next = Entry; + Current->Prev = Entry; } } + else + { + /* Append to tail */ + Entry->Prev = TimeZoneListTail; + Entry->Next = NULL; + TimeZoneListTail->Next = Entry; + TimeZoneListTail = Entry; + } } - RegCloseKey(hZonesKey); + return ERROR_SUCCESS; } +static VOID +CreateTimeZoneList(VOID) +{ + EnumerateTimeZoneList(RetrieveTimeZone, NULL); +} static VOID DestroyTimeZoneList(VOID) @@ -299,9 +222,9 @@ SetLocalTimeZone(HWND hwnd) } wcscpy(TimeZoneInformation.StandardName, - Entry->StandardName); + Entry->StandardName); wcscpy(TimeZoneInformation.DaylightName, - Entry->DaylightName); + Entry->DaylightName); TimeZoneInformation.Bias = Entry->TimezoneInfo.Bias; TimeZoneInformation.StandardBias = Entry->TimezoneInfo.StandardBias; @@ -319,71 +242,6 @@ SetLocalTimeZone(HWND hwnd) } -static VOID -GetAutoDaylightInfo(HWND hwnd) -{ - HKEY hKey; - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", - 0, - KEY_QUERY_VALUE, - &hKey)) - return; - - /* If the call fails (non zero), the reg value isn't available, - * which means it shouldn't be disabled, so we should check the button. - */ - if (RegQueryValueExW(hKey, - L"DisableAutoDaylightTimeSet", - NULL, - NULL, - NULL, - NULL)) - { - SendMessageW(hwnd, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - } - else - { - SendMessageW(hwnd, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - } - - RegCloseKey(hKey); -} - - -static VOID -SetAutoDaylightInfo(HWND hwnd) -{ - HKEY hKey; - DWORD dwValue = 1; - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", - 0, - KEY_SET_VALUE, - &hKey)) - return; - - if (SendMessageW(hwnd, BM_GETCHECK, 0, 0) == BST_UNCHECKED) - { - RegSetValueExW(hKey, - L"DisableAutoDaylightTimeSet", - 0, - REG_DWORD, - (LPBYTE)&dwValue, - sizeof(dwValue)); - } - else - { - RegDeleteValueW(hKey, - L"DisableAutoDaylightTimeSet"); - } - - RegCloseKey(hKey); -} - - /* Property page dialog callback */ INT_PTR CALLBACK TimeZonePageProc(HWND hwndDlg, @@ -396,9 +254,13 @@ TimeZonePageProc(HWND hwndDlg, switch (uMsg) { case WM_INITDIALOG: + { CreateTimeZoneList(); ShowTimeZoneList(GetDlgItem(hwndDlg, IDC_TIMEZONELIST)); - GetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT)); + + SendDlgItemMessage(hwndDlg, IDC_AUTODAYLIGHT, BM_SETCHECK, + (WPARAM)(GetAutoDaylight() ? BST_CHECKED : BST_UNCHECKED), 0); + hBitmap = LoadImageW(hApplet, MAKEINTRESOURCEW(IDC_WORLD), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); if (hBitmap != NULL) { @@ -408,6 +270,7 @@ TimeZonePageProc(HWND hwndDlg, cySource = bitmap.bmHeight; } break; + } case WM_DRAWITEM: { @@ -452,7 +315,8 @@ TimeZonePageProc(HWND hwndDlg, { case PSN_APPLY: { - SetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT)); + SetAutoDaylight(SendDlgItemMessage(hwndDlg, IDC_AUTODAYLIGHT, + BM_GETCHECK, 0, 0) != BST_UNCHECKED); SetLocalTimeZone(GetDlgItem(hwndDlg, IDC_TIMEZONELIST)); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR); return TRUE; diff --git a/dll/win32/syssetup/CMakeLists.txt b/dll/win32/syssetup/CMakeLists.txt index e3b44d1e6b7..703c1d411c6 100644 --- a/dll/win32/syssetup/CMakeLists.txt +++ b/dll/win32/syssetup/CMakeLists.txt @@ -1,4 +1,6 @@ +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/tzlib) + spec2def(syssetup.dll syssetup.spec) list(APPEND SOURCE @@ -20,6 +22,6 @@ add_library(syssetup MODULE add_pch(syssetup precomp.h SOURCE) set_module_type(syssetup win32dll UNICODE) -target_link_libraries(syssetup uuid wine ${PSEH_LIB}) +target_link_libraries(syssetup uuid wine tzlib ${PSEH_LIB}) add_importlibs(syssetup advapi32 gdi32 user32 samlib userenv comctl32 setupapi rpcrt4 ole32 shell32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET syssetup DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 589a6101ab6..386b04bf356 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -19,6 +19,8 @@ #include <wincon.h> #include <shlobj.h> +#include <tzlib.h> + #define NDEBUG #include <debug.h> @@ -45,6 +47,17 @@ typedef struct _REGISTRATIONDATA PVOID DefaultContext; } REGISTRATIONDATA, *PREGISTRATIONDATA; +typedef struct _TIMEZONE_ENTRY +{ + struct _TIMEZONE_ENTRY *Prev; + struct _TIMEZONE_ENTRY *Next; + WCHAR Description[128]; /* 'Display' */ + WCHAR StandardName[32]; /* 'Std' */ + WCHAR DaylightName[32]; /* 'Dlt' */ + REG_TZI_FORMAT TimezoneInfo; /* 'TZI' */ + ULONG Index; +} TIMEZONE_ENTRY, *PTIMEZONE_ENTRY; + /* FUNCTIONS ****************************************************************/ @@ -1237,165 +1250,92 @@ GetLargerTimeZoneEntry(PSETUPDATA SetupData, DWORD Index) return NULL; } - -static VOID -CreateTimeZoneList(PSETUPDATA SetupData) +static LONG +RetrieveTimeZone( + IN HKEY hZoneKey, + IN PVOID Context) { - WCHAR szKeyName[256]; - DWORD dwIndex; - DWORD dwNameSize; - DWORD dwValueSize; LONG lError; - HKEY hZonesKey; - HKEY hZoneKey; - + PSETUPDATA SetupData = (PSETUPDATA)Context; PTIMEZONE_ENTRY Entry; PTIMEZONE_ENTRY Current; + ULONG DescriptionSize; + ULONG StandardNameSize; + ULONG DaylightNameSize; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", - 0, - KEY_ALL_ACCESS, - &hZonesKey)) - return; - - dwIndex = 0; - while (TRUE) - { - dwNameSize = 256 * sizeof(WCHAR); - lError = RegEnumKeyExW(hZonesKey, - dwIndex, - szKeyName, - &dwNameSize, - NULL, - NULL, - NULL, - NULL); - if (lError != ERROR_SUCCESS && lError != ERROR_MORE_DATA) - break; - - if (RegOpenKeyExW(hZonesKey, - szKeyName, - 0, - KEY_ALL_ACCESS, - &hZoneKey)) - break; - - Entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TIMEZONE_ENTRY)); - if (Entry == NULL) - { - RegCloseKey(hZoneKey); - break; - } - - dwValueSize = 64 * sizeof(WCHAR); - if (RegQueryValueExW(hZoneKey, - L"Display", - NULL, - NULL, - (LPBYTE)&Entry->Description, - &dwValueSize)) - { - RegCloseKey(hZoneKey); - break; - } - - dwValueSize = 32 * sizeof(WCHAR); - if (RegQueryValueExW(hZoneKey, - L"Std", - NULL, - NULL, - (LPBYTE)&Entry->StandardName, - &dwValueSize)) - { - RegCloseKey(hZoneKey); - break; - } - - dwValueSize = 32 * sizeof(WCHAR); - if (RegQueryValueExW(hZoneKey, - L"Dlt", - NULL, - NULL, - (LPBYTE)&Entry->DaylightName, - &dwValueSize)) - { - RegCloseKey(hZoneKey); - break; - } + Entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TIMEZONE_ENTRY)); + if (Entry == NULL) + { + return ERROR_NOT_ENOUGH_MEMORY; + } - dwValueSize = sizeof(DWORD); - if (RegQueryValueExW(hZoneKey, - L"Index", - NULL, - NULL, - (LPBYTE)&Entry->Index, - &dwValueSize)) - { - RegCloseKey(hZoneKey); - break; - } + DescriptionSize = sizeof(Entry->Description); + StandardNameSize = sizeof(Entry->StandardName); + DaylightNameSize = sizeof(Entry->DaylightName); - dwValueSize = sizeof(TZ_INFO); - if (RegQueryValueExW(hZoneKey, - L"TZI", - NULL, - NULL, - (LPBYTE)&Entry->TimezoneInfo, - &dwValueSize)) - { - RegCloseKey(hZoneKey); - break; - } - - RegCloseKey(hZoneKey); + lError = QueryTimeZoneData(hZoneKey, + &Entry->Index, + &Entry->TimezoneInfo, + Entry->Description, + &DescriptionSize, + Entry->StandardName, + &StandardNameSize, + Entry->DaylightName, + &DaylightNameSize); + if (lError != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, Entry); + return lError; + } - if (SetupData->TimeZoneListHead == NULL && - SetupData->TimeZoneListTail == NULL) - { - Entry->Prev = NULL; - Entry->Next = NULL; - SetupData->TimeZoneListHead = Entry; - SetupData->TimeZoneListTail = Entry; - } - else + if (SetupData->TimeZoneListHead == NULL && + SetupData->TimeZoneListTail == NULL) + { + Entry->Prev = NULL; + Entry->Next = NULL; + SetupData->TimeZoneListHead = Entry; + SetupData->TimeZoneListTail = Entry; + } + else + { + Current = GetLargerTimeZoneEntry(SetupData, Entry->Index); + if (Current != NULL) { - Current = GetLargerTimeZoneEntry(SetupData, Entry->Index); - if (Current != NULL) + if (Current == SetupData->TimeZoneListHead) { - if (Current == SetupData->TimeZoneListHead) - { - /* Prepend to head */ - Entry->Prev = NULL; - Entry->Next = SetupData->TimeZoneListHead; - SetupData->TimeZoneListHead->Prev = Entry; - SetupData->TimeZoneListHead = Entry; - } - else - { - /* Insert before current */ - Entry->Prev = Current->Prev; - Entry->Next = Current; - Current->Prev->Next = Entry; - Current->Prev = Entry; - } + /* Prepend to head */ + Entry->Prev = NULL; + Entry->Next = SetupData->TimeZoneListHead; + SetupData->TimeZoneListHead->Prev = Entry; + SetupData->TimeZoneListHead = Entry; } else { - /* Append to tail */ - Entry->Prev = SetupData->TimeZoneListTail; - Entry->Next = NULL; - SetupData->TimeZoneListTail->Next = Entry; - SetupData->TimeZoneListTail = Entry; + /* Insert before current */ + Entry->Prev = Current->Prev; + Entry->Next = Current; + Current->Prev->Next = Entry; + Current->Prev = Entry; } } - - dwIndex++; + else + { + /* Append to tail */ + Entry->Prev = SetupData->TimeZoneListTail; + Entry->Next = NULL; + SetupData->TimeZoneListTail->Next = Entry; + SetupData->TimeZoneListTail = Entry; + } } - RegCloseKey(hZonesKey); + return ERROR_SUCCESS; } +static VOID +CreateTimeZoneList(PSETUPDATA SetupData) +{ + EnumerateTimeZoneList(RetrieveTimeZone, SetupData); +} static VOID DestroyTimeZoneList(PSETUPDATA SetupData) @@ -1418,117 +1358,6 @@ DestroyTimeZoneList(PSETUPDATA SetupData) SetupData->TimeZoneListTail = NULL; } -static BOOL -GetTimeZoneListIndex(LPDWORD lpIndex) -{ - WCHAR szLanguageIdString[9]; - HKEY hKey; - DWORD dwValueSize; - DWORD Length; - LPWSTR Buffer; - LPWSTR Ptr; - LPWSTR End; - BOOL bFound = FALSE; - unsigned long iLanguageID; - - if (*lpIndex == -1) - { - *lpIndex = 85; /* fallback to GMT time zone */ - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", - 0, - KEY_ALL_ACCESS, - &hKey)) - return FALSE; - - dwValueSize = 9 * sizeof(WCHAR); - if (RegQueryValueExW(hKey, - L"Default", - NULL, - NULL, - (LPBYTE)szLanguageIdString, - &dwValueSize)) - { - RegCloseKey(hKey); - return FALSE; - } - - iLanguageID = wcstoul(szLanguageIdString, NULL, 16); - RegCloseKey(hKey); - } - else - { - iLanguageID = *lpIndex; - } - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", - 0, - KEY_ALL_ACCESS, - &hKey)) - return FALSE; - - dwValueSize = 0; - if (RegQueryValueExW(hKey, - L"IndexMapping", - NULL, - NULL, - NULL, - &dwValueSize)) - { - RegCloseKey(hKey); - return FALSE; - } - - Buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwValueSize); - if (Buffer == NULL) - { - RegCloseKey(hKey); - return FALSE; - } - - if (RegQueryValueExW(hKey, - L"IndexMapping", - NULL, - NULL, - (LPBYTE)Buffer, - &dwValueSize)) - { - HeapFree(GetProcessHeap(), 0, Buffer); - RegCloseKey(hKey); - return FALSE; - } - - RegCloseKey(hKey); - - Ptr = Buffer; - while (*Ptr != 0) - { - Length = wcslen(Ptr); - if (wcstoul(Ptr, NULL, 16) == iLanguageID) - bFound = TRUE; - - Ptr = Ptr + Length + 1; - if (*Ptr == 0) - break; - - if (bFound) - { - *lpIndex = wcstoul(Ptr, &End, 10); - HeapFree(GetProcessHeap(), 0, Buffer); - return TRUE; - } - - Length = wcslen(Ptr); - Ptr = Ptr + Length + 1; - } - - HeapFree(GetProcessHeap(), 0, Buffer); - - return FALSE; -} - static VOID ShowTimeZoneList(HWND hwnd, PSETUPDATA SetupData, DWORD dwEntryIndex) @@ -1634,32 +1463,6 @@ GetLocalSystemTime(HWND hwnd, PSETUPDATA SetupData) } -static VOID -SetAutoDaylightInfo(HWND hwnd) -{ - HKEY hKey; - DWORD dwValue = 1; - - if (SendMessage(hwnd, BM_GETCHECK, 0, 0) == BST_UNCHECKED) - { - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", - 0, - KEY_SET_VALUE, - &hKey)) - return; - - RegSetValueExW(hKey, - L"DisableAutoDaylightTimeSet", - 0, - REG_DWORD, - (LPBYTE)&dwValue, - sizeof(DWORD)); - RegCloseKey(hKey); - } -} - - static BOOL SetSystemLocalTime(HWND hwnd, PSETUPDATA SetupData) { @@ -1696,7 +1499,8 @@ WriteDateTimeSettings(HWND hwndDlg, PSETUPDATA SetupData) SetLocalTimeZone(GetDlgItem(hwndDlg, IDC_TIMEZONELIST), SetupData); - SetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT)); + SetAutoDaylight(SendDlgItemMessage(hwndDlg, IDC_AUTODAYLIGHT, + BM_GETCHECK, 0, 0) != BST_UNCHECKED); if (!SetSystemLocalTime(hwndDlg, SetupData)) { if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, ARRAYSIZE(Title))) @@ -1730,6 +1534,7 @@ DateTimePageDlgProc(HWND hwndDlg, switch (uMsg) { case WM_INITDIALOG: + { /* Save pointer to the global setup data */ SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)SetupData); @@ -1754,6 +1559,7 @@ DateTimePageDlgProc(HWND hwndDlg, SendDlgItemMessage(hwndDlg, IDC_AUTODAYLIGHT, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); } break; + } case WM_TIMER: UpdateLocalSystemTime(hwndDlg); diff --git a/sdk/include/reactos/libs/syssetup/syssetup.h b/sdk/include/reactos/libs/syssetup/syssetup.h index d22ad08ac79..adb924e390d 100644 --- a/sdk/include/reactos/libs/syssetup/syssetup.h +++ b/sdk/include/reactos/libs/syssetup/syssetup.h @@ -23,27 +23,6 @@ #ifndef __SYSSETUP_H_INCLUDED__ #define __SYSSETUP_H_INCLUDED__ -// See also dll/cpl/timedate/timezone.c -typedef struct _TZ_INFO -{ - LONG Bias; - LONG StandardBias; - LONG DaylightBias; - SYSTEMTIME StandardDate; - SYSTEMTIME DaylightDate; -} TZ_INFO, *PTZ_INFO; - -typedef struct _TIMEZONE_ENTRY -{ - struct _TIMEZONE_ENTRY *Prev; - struct _TIMEZONE_ENTRY *Next; - WCHAR Description[64]; /* 'Display' */ - WCHAR StandardName[32]; /* 'Std' */ - WCHAR DaylightName[32]; /* 'Dlt' */ - TZ_INFO TimezoneInfo; /* 'TZI' */ - ULONG Index; -} TIMEZONE_ENTRY, *PTIMEZONE_ENTRY; - typedef enum _PRODUCT_OPTION { PRODUCT_OPTION_SERVER, @@ -67,8 +46,8 @@ typedef struct _SETUPDATA BOOL DisableGeckoInst; SYSTEMTIME SystemTime; - PTIMEZONE_ENTRY TimeZoneListHead; - PTIMEZONE_ENTRY TimeZoneListTail; + struct _TIMEZONE_ENTRY* TimeZoneListHead; + struct _TIMEZONE_ENTRY* TimeZoneListTail; DWORD TimeZoneIndex; DWORD DisableAutoDaylightTimeSet; LCID LocaleID; diff --git a/sdk/lib/CMakeLists.txt b/sdk/lib/CMakeLists.txt index c9f4e396049..60b2844566b 100644 --- a/sdk/lib/CMakeLists.txt +++ b/sdk/lib/CMakeLists.txt @@ -46,6 +46,7 @@ add_subdirectory(skiplist) add_subdirectory(strmiids) add_subdirectory(smlib) add_subdirectory(tdilib) +add_subdirectory(tzlib) add_subdirectory(udmihelp) add_subdirectory(uuid) add_subdirectory(wdmguid) diff --git a/sdk/lib/tzlib/CMakeLists.txt b/sdk/lib/tzlib/CMakeLists.txt new file mode 100644 index 00000000000..a4606afe5df --- /dev/null +++ b/sdk/lib/tzlib/CMakeLists.txt @@ -0,0 +1,3 @@ + +add_library(tzlib tzlib.c) +add_dependencies(tzlib xdk) diff --git a/sdk/lib/tzlib/tzlib.c b/sdk/lib/tzlib/tzlib.c new file mode 100644 index 00000000000..93c33a3fb3a --- /dev/null +++ b/sdk/lib/tzlib/tzlib.c @@ -0,0 +1,352 @@ +/* + * PROJECT: ReactOS TimeZone Utilities Library + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: Provides time-zone utility wrappers around Win32 functions, + * that are used by different ReactOS modules such as + * timedate.cpl, syssetup.dll. + * COPYRIGHT: Copyright 2004-2005 Eric Kohl + * Copyright 2016 Carlo Bramini + * Copyright 2020 Hermes Belusca-Maito + */ + +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> + +#include "tzlib.h" + +BOOL +GetTimeZoneListIndex( + IN OUT PULONG pIndex) +{ + LONG lError; + HKEY hKey; + DWORD dwType; + DWORD dwValueSize; + DWORD Length; + LPWSTR Buffer; + LPWSTR Ptr, End; + BOOL bFound = FALSE; + unsigned long iLanguageID; + WCHAR szLanguageIdString[9]; + + if (*pIndex == -1) + { + *pIndex = 85; /* fallback to GMT time zone */ + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", + 0, + KEY_QUERY_VALUE, + &hKey); + if (lError != ERROR_SUCCESS) + { + return FALSE; + } + + dwValueSize = sizeof(szLanguageIdString); + lError = RegQueryValueExW(hKey, + L"Default", + NULL, + NULL, + (LPBYTE)szLanguageIdString, + &dwValueSize); + if (lError != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + iLanguageID = wcstoul(szLanguageIdString, NULL, 16); + RegCloseKey(hKey); + } + else + { + iLanguageID = *pIndex; + } + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", + 0, + KEY_QUERY_VALUE, + &hKey); + if (lError != ERROR_SUCCESS) + { + return FALSE; + } + + dwValueSize = 0; + lError = RegQueryValueExW(hKey, + L"IndexMapping", + NULL, + &dwType, + NULL, + &dwValueSize); + if ((lError != ERROR_SUCCESS) || (dwType != REG_MULTI_SZ)) + { + RegCloseKey(hKey); + return FALSE; + } + + Buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwValueSize); + if (Buffer == NULL) + { + RegCloseKey(hKey); + return FALSE; + } + + lError = RegQueryValueExW(hKey, + L"IndexMapping", + NULL, + &dwType, + (LPBYTE)Buffer, + &dwValueSize); + + RegCloseKey(hKey); + + if ((lError != ERROR_SUCCESS) || (dwType != REG_MULTI_SZ)) + { + HeapFree(GetProcessHeap(), 0, Buffer); + return FALSE; + } + + Ptr = Buffer; + while (*Ptr != 0) + { + Length = wcslen(Ptr); + if (wcstoul(Ptr, NULL, 16) == iLanguageID) + bFound = TRUE; + + Ptr = Ptr + Length + 1; + if (*Ptr == 0) + break; + + if (bFound) + { + *pIndex = wcstoul(Ptr, &End, 10); + HeapFree(GetProcessHeap(), 0, Buffer); + return TRUE; + } + + Length = wcslen(Ptr); + Ptr = Ptr + Length + 1; + } + + HeapFree(GetProcessHeap(), 0, Buffer); + return FALSE; +} + +LONG +QueryTimeZoneData( + IN HKEY hZoneKey, + OUT PULONG Index OPTIONAL, + OUT PREG_TZI_FORMAT TimeZoneInfo, + OUT PWCHAR Description OPTIONAL, + IN OUT PULONG DescriptionSize OPTIONAL, + OUT PWCHAR StandardName OPTIONAL, + IN OUT PULONG StandardNameSize OPTIONAL, + OUT PWCHAR DaylightName OPTIONAL, + IN OUT PULONG DaylightNameSize OPTIONAL) +{ + LONG lError; + DWORD dwValueSize; + + if (Description && DescriptionSize && *DescriptionSize > 0) + { + lError = RegQueryValueExW(hZoneKey, + L"Display", + NULL, + NULL, + (LPBYTE)Description, + DescriptionSize); + if (lError != ERROR_SUCCESS) + return lError; + } + + if (StandardName && StandardNameSize && *StandardNameSize > 0) + { + lError = RegQueryValueExW(hZoneKey, + L"Std", + NULL, + NULL, + (LPBYTE)StandardName, + StandardNameSize); + if (lError != ERROR_SUCCESS) + return lError; + } + + if (DaylightName && DaylightNameSize && *DaylightNameSize > 0) + { + lError = RegQueryValueExW(hZoneKey, + L"Dlt", + NULL, + NULL, + (LPBYTE)DaylightName, + DaylightNameSize); + if (lError != ERROR_SUCCESS) + return lError; + } + + if (Index) + { + dwValueSize = sizeof(*Index); + lError = RegQueryValueExW(hZoneKey, + L"Index", + NULL, + NULL, + (LPBYTE)Index, + &dwValueSize); + if (lError != ERROR_SUCCESS) + return lError; + } + + dwValueSize = sizeof(*TimeZoneInfo); + lError = RegQueryValueExW(hZoneKey, + L"TZI", + NULL, + NULL, + (LPBYTE)TimeZoneInfo, + &dwValueSize); + return lError; +} + +// +// NOTE: Very similar to the EnumDynamicTimeZoneInformation() function +// introduced in Windows 8. +// +VOID +EnumerateTimeZoneList( + IN PENUM_TIMEZONE_CALLBACK Callback, + IN PVOID Context OPTIONAL) +{ + LONG lError; + HKEY hZonesKey; + HKEY hZoneKey; + DWORD dwIndex; + DWORD dwNameSize; + WCHAR szKeyName[256]; + + /* Open the registry key containing the list of time zones */ + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", + 0, + KEY_ENUMERATE_SUB_KEYS, + &hZonesKey); + if (lError != ERROR_SUCCESS) + return; + + /* Enumerate it */ + for (dwIndex = 0; ; dwIndex++) + { + dwNameSize = sizeof(szKeyName); + lError = RegEnumKeyExW(hZonesKey, + dwIndex, + szKeyName, + &dwNameSize, + NULL, + NULL, + NULL, + NULL); + // if (lError != ERROR_SUCCESS && lError != ERROR_MORE_DATA) + if (lError == ERROR_NO_MORE_ITEMS) + break; + + /* Open the time zone sub-key */ + if (RegOpenKeyExW(hZonesKey, + szKeyName, + 0, + KEY_QUERY_VALUE, + &hZoneKey)) + { + /* We failed, continue with another sub-key */ + continue; + } + + /* Call the user-provided callback */ + lError = Callback(hZoneKey, Context); + // lError = QueryTimeZoneData(hZoneKey, Context); + + RegCloseKey(hZoneKey); + } + + RegCloseKey(hZonesKey); +} + +// Returns TRUE if AutoDaylight is ON. +// Returns FALSE if AutoDaylight is OFF. +BOOL +GetAutoDaylight(VOID) +{ + LONG lError; + HKEY hKey; + DWORD dwType; + DWORD dwDisabled; + DWORD dwValueSize; + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", + 0, + KEY_QUERY_VALUE, + &hKey); + if (lError != ERROR_SUCCESS) + return FALSE; + + // NOTE: On Vista+: REG_DWORD "DynamicDaylightTimeDisabled" + dwValueSize = sizeof(dwDisabled); + lError = RegQueryValueExW(hKey, + L"DisableAutoDaylightTimeSet", + NULL, + &dwType, + (LPBYTE)&dwDisabled, + &dwValueSize); + + RegCloseKey(hKey); + + if ((lError != ERROR_SUCCESS) || (dwType != REG_DWORD) || (dwValueSize != sizeof(dwDisabled))) + { + /* + * The call failed (non zero) because the registry value isn't available, + * which means auto-daylight shouldn't be disabled. + */ + dwDisabled = FALSE; + } + + return !dwDisabled; +} + +VOID +SetAutoDaylight( + IN BOOL EnableAutoDaylightTime) +{ + LONG lError; + HKEY hKey; + DWORD dwDisabled = TRUE; + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", + 0, + KEY_SET_VALUE, + &hKey); + if (lError != ERROR_SUCCESS) + return; + + if (!EnableAutoDaylightTime) + { + /* Auto-Daylight disabled: set the value to TRUE */ + // NOTE: On Vista+: REG_DWORD "DynamicDaylightTimeDisabled" + RegSetValueExW(hKey, + L"DisableAutoDaylightTimeSet", + 0, + REG_DWORD, + (LPBYTE)&dwDisabled, + sizeof(dwDisabled)); + } + else + { + /* Auto-Daylight enabled: just delete the value */ + RegDeleteValueW(hKey, L"DisableAutoDaylightTimeSet"); + } + + RegCloseKey(hKey); +} diff --git a/sdk/lib/tzlib/tzlib.h b/sdk/lib/tzlib/tzlib.h new file mode 100644 index 00000000000..9938c5ab473 --- /dev/null +++ b/sdk/lib/tzlib/tzlib.h @@ -0,0 +1,56 @@ +/* + * PROJECT: ReactOS TimeZone Utilities Library + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: Provides time-zone utility wrappers around Win32 functions, + * that are used by different ReactOS modules such as + * timedate.cpl, syssetup.dll. + * COPYRIGHT: Copyright 2004-2005 Eric Kohl + * Copyright 2016 Carlo Bramini + * Copyright 2020 Hermes Belusca-Maito + */ + +#pragma once + +typedef struct _REG_TZI_FORMAT +{ + LONG Bias; + LONG StandardBias; + LONG DaylightBias; + SYSTEMTIME StandardDate; + SYSTEMTIME DaylightDate; +} REG_TZI_FORMAT, *PREG_TZI_FORMAT; + +typedef LONG +(*PENUM_TIMEZONE_CALLBACK)( + IN HKEY hZoneKey, + IN PVOID Context OPTIONAL); + +BOOL +GetTimeZoneListIndex( + IN OUT PULONG pIndex); + +LONG +QueryTimeZoneData( + IN HKEY hZoneKey, + OUT PULONG Index OPTIONAL, + OUT PREG_TZI_FORMAT TimeZoneInfo, + OUT PWCHAR Description OPTIONAL, + IN OUT PULONG DescriptionSize OPTIONAL, + OUT PWCHAR StandardName OPTIONAL, + IN OUT PULONG StandardNameSize OPTIONAL, + OUT PWCHAR DaylightName OPTIONAL, + IN OUT PULONG DaylightNameSize OPTIONAL); + +VOID +EnumerateTimeZoneList( + IN PENUM_TIMEZONE_CALLBACK Callback, + IN PVOID Context OPTIONAL); + +// Returns TRUE if AutoDaylight is ON. +// Returns FALSE if AutoDaylight is OFF. +BOOL +GetAutoDaylight(VOID); + +VOID +SetAutoDaylight( + IN BOOL EnableAutoDaylightTime);

4 years, 8 months

[reactos] 01/01: [WIN32SS] CORE-16738 Comment an assert

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87f6c82d854583f715468… commit 87f6c82d854583f71546841f4432f57e4a2d6c99 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Apr 21 23:26:47 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Apr 21 23:26:47 2020 +0200 [WIN32SS] CORE-16738 Comment an assert It popped up 2-3 times for me during several months of ros usage and I could continue without noticing any side effects. Giannis who once added it, was ok with commenting it. His words: This assertion isn't something fatal, the worst thing that can happen from continuing on it would be to make the thread get awake more times than it should. --- win32ss/user/ntuser/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 99066d90fda..72706fa7f84 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -724,8 +724,8 @@ void UserDbgAssertThreadInfo(BOOL showCaller) ASSERT(pci->ulClientDelta == DesktopHeapGetUserDelta()); if (pti->pcti && pci->pDeskInfo) ASSERT(pci->pClientThreadInfo == (PVOID)((ULONG_PTR)pti->pcti - pci->ulClientDelta)); - if (pti->pcti && IsListEmpty(&pti->SentMessagesListHead)) - ASSERT((pti->pcti->fsChangeBits & QS_SENDMESSAGE) == 0); + //if (pti->pcti && IsListEmpty(&pti->SentMessagesListHead)) + // ASSERT((pti->pcti->fsChangeBits & QS_SENDMESSAGE) == 0); if (pti->KeyboardLayout) ASSERT(pci->hKL == pti->KeyboardLayout->hkl); if(pti->rpdesk != NULL)

4 years, 8 months

[reactos] 01/01: [KDCOM][NTOS:INBV][FREELDR] Decrease default baud rate for PC-98 target (#2601)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4501bbac8fd742b11b3a5… commit 4501bbac8fd742b11b3a5ca704b13f010744b484 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Wed Apr 22 02:22:42 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 21 23:22:42 2020 +0300 [KDCOM][NTOS:INBV][FREELDR] Decrease default baud rate for PC-98 target (#2601) According to PC-9801 Bible p. 50, divisor for PIT will become unsupported in some cases after having removed the fractional part. Replace 19200 value with 9600 which is supported by both 10 MHz and 8 MHz machines. --- boot/bootdata/floppy_pc98.ini | 2 +- boot/freeldr/freeldr/lib/comm/rs232.c | 4 ++++ boot/freeldr/freeldr/lib/debug.c | 7 ++++++- boot/freeldr/freeldr/ntldr/headless.c | 7 +++++-- drivers/base/kdcom/kdcom.c | 17 ++++++++++++----- drivers/base/kdgdb/kdcom.c | 21 ++++++++++++++------- ntoskrnl/inbv/inbvport.c | 7 +++++-- ntoskrnl/kd/i386/kdbg.c | 5 ++++- 8 files changed, 51 insertions(+), 19 deletions(-) diff --git a/boot/bootdata/floppy_pc98.ini b/boot/bootdata/floppy_pc98.ini index 0466754d765..a46489687e4 100644 --- a/boot/bootdata/floppy_pc98.ini +++ b/boot/bootdata/floppy_pc98.ini @@ -39,7 +39,7 @@ Options=/MININT [LiveCD_Debug] BootType=Windows2003 SystemPath=multi(0)disk(0)cdrom(0)\reactos -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT +Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=9600 /SOS /MININT [LiveCD_Screen] BootType=Windows2003 diff --git a/boot/freeldr/freeldr/lib/comm/rs232.c b/boot/freeldr/freeldr/lib/comm/rs232.c index 10d0b0bedb8..61309fcd39b 100644 --- a/boot/freeldr/freeldr/lib/comm/rs232.c +++ b/boot/freeldr/freeldr/lib/comm/rs232.c @@ -30,7 +30,11 @@ /* STATIC VARIABLES ***********************************************************/ +#if defined(SARCH_PC98) +#define DEFAULT_BAUD_RATE 9600 +#else #define DEFAULT_BAUD_RATE 19200 +#endif #if defined(_M_IX86) || defined(_M_AMD64) #if defined(SARCH_PC98) diff --git a/boot/freeldr/freeldr/lib/debug.c b/boot/freeldr/freeldr/lib/debug.c index 24c074ddc69..abc2545f7ea 100644 --- a/boot/freeldr/freeldr/lib/debug.c +++ b/boot/freeldr/freeldr/lib/debug.c @@ -43,8 +43,13 @@ static UCHAR DbgChannels[DBG_CHANNELS_COUNT]; ULONG DebugPort = RS232; /* Serial debug connection */ -ULONG ComPort = 0; // The COM port initializer chooses the first available port starting from COM4 down to COM1. +#if defined(SARCH_PC98) +ULONG BaudRate = 9600; +#else ULONG BaudRate = 115200; +#endif + +ULONG ComPort = 0; // The COM port initializer chooses the first available port starting from COM4 down to COM1. ULONG PortIrq = 0; // Not used at the moment. BOOLEAN DebugStartOfLine = TRUE; diff --git a/boot/freeldr/freeldr/ntldr/headless.c b/boot/freeldr/freeldr/ntldr/headless.c index 35af2e39daf..64fd04adb7b 100644 --- a/boot/freeldr/freeldr/ntldr/headless.c +++ b/boot/freeldr/freeldr/ntldr/headless.c @@ -67,10 +67,10 @@ WinLdrPortInitialize(IN ULONG BaudRate, IN BOOLEAN TerminalConnected, OUT PULONG PortId) { +#if defined(SARCH_PC98) /* Set default baud rate */ - if (BaudRate == 0) BaudRate = 19200; + if (BaudRate == 0) BaudRate = 9600; -#if defined(SARCH_PC98) /* Check if port or address given */ if (PortNumber) { @@ -106,6 +106,9 @@ WinLdrPortInitialize(IN ULONG BaudRate, } } #else + /* Set default baud rate */ + if (BaudRate == 0) BaudRate = 19200; + /* Check if port or address given */ if (PortNumber) { diff --git a/drivers/base/kdcom/kdcom.c b/drivers/base/kdcom/kdcom.c index eb62aa4e551..c4cfa39e177 100644 --- a/drivers/base/kdcom/kdcom.c +++ b/drivers/base/kdcom/kdcom.c @@ -15,12 +15,19 @@ #include <ndk/halfuncs.h> /* Serial debug connection */ +#if defined(SARCH_PC98) #define DEFAULT_DEBUG_PORT 2 /* COM2 */ -#define DEFAULT_DEBUG_COM1_IRQ 4 /* COM1 IRQ */ -#define DEFAULT_DEBUG_COM2_IRQ 3 /* COM2 IRQ */ -#define DEFAULT_DEBUG_BAUD_RATE 115200 /* 115200 Baud */ - -#define DEFAULT_BAUD_RATE 19200 +#define DEFAULT_DEBUG_COM1_IRQ 4 +#define DEFAULT_DEBUG_COM2_IRQ 5 +#define DEFAULT_DEBUG_BAUD_RATE 9600 +#define DEFAULT_BAUD_RATE 9600 +#else +#define DEFAULT_DEBUG_PORT 2 /* COM2 */ +#define DEFAULT_DEBUG_COM1_IRQ 4 +#define DEFAULT_DEBUG_COM2_IRQ 3 +#define DEFAULT_DEBUG_BAUD_RATE 115200 +#define DEFAULT_BAUD_RATE 19200 +#endif #if defined(_M_IX86) || defined(_M_AMD64) #if defined(SARCH_PC98) diff --git a/drivers/base/kdgdb/kdcom.c b/drivers/base/kdgdb/kdcom.c index af9ec39829c..18710247680 100644 --- a/drivers/base/kdgdb/kdcom.c +++ b/drivers/base/kdgdb/kdcom.c @@ -13,12 +13,19 @@ #include <ndk/halfuncs.h> /* Serial debug connection */ +#if defined(SARCH_PC98) #define DEFAULT_DEBUG_PORT 2 /* COM2 */ -#define DEFAULT_DEBUG_COM1_IRQ 4 /* COM1 IRQ */ -#define DEFAULT_DEBUG_COM2_IRQ 3 /* COM2 IRQ */ -#define DEFAULT_DEBUG_BAUD_RATE 115200 /* 115200 Baud */ - -#define DEFAULT_BAUD_RATE 19200 +#define DEFAULT_DEBUG_COM1_IRQ 4 +#define DEFAULT_DEBUG_COM2_IRQ 5 +#define DEFAULT_DEBUG_BAUD_RATE 9600 +#define DEFAULT_BAUD_RATE 9600 +#else +#define DEFAULT_DEBUG_PORT 2 /* COM2 */ +#define DEFAULT_DEBUG_COM1_IRQ 4 +#define DEFAULT_DEBUG_COM2_IRQ 3 +#define DEFAULT_DEBUG_BAUD_RATE 115200 +#define DEFAULT_BAUD_RATE 19200 +#endif #if defined(_M_IX86) || defined(_M_AMD64) #if defined(SARCH_PC98) @@ -299,12 +306,12 @@ NTAPI KdpReceiveByte(_Out_ PUCHAR OutByte) { USHORT CpStatus; - + do { CpStatus = CpGetByte(&KdComPort, OutByte, TRUE, FALSE); } while (CpStatus == CP_GET_NODATA); - + /* Get the byte */ if (CpStatus == CP_GET_SUCCESS) { diff --git a/ntoskrnl/inbv/inbvport.c b/ntoskrnl/inbv/inbvport.c index 526383a4771..269c8f962be 100644 --- a/ntoskrnl/inbv/inbvport.c +++ b/ntoskrnl/inbv/inbvport.c @@ -79,10 +79,10 @@ InbvPortInitialize(IN ULONG BaudRate, /* Not yet supported */ ASSERT(IsMMIODevice == FALSE); +#if defined(SARCH_PC98) /* Set default baud rate */ - if (BaudRate == 0) BaudRate = 19200; + if (BaudRate == 0) BaudRate = 9600; -#if defined(SARCH_PC98) /* Check if port or address given */ if (PortNumber) { @@ -118,6 +118,9 @@ InbvPortInitialize(IN ULONG BaudRate, } } #else + /* Set default baud rate */ + if (BaudRate == 0) BaudRate = 19200; + /* Check if port or address given */ if (PortNumber) { diff --git a/ntoskrnl/kd/i386/kdbg.c b/ntoskrnl/kd/i386/kdbg.c index 9277e019b2a..44bd7629e38 100644 --- a/ntoskrnl/kd/i386/kdbg.c +++ b/ntoskrnl/kd/i386/kdbg.c @@ -13,8 +13,11 @@ #define NDEBUG #include <debug.h> - +#if defined(SARCH_PC98) +#define DEFAULT_BAUD_RATE 9600 +#else #define DEFAULT_BAUD_RATE 19200 +#endif #if defined(_M_IX86) || defined(_M_AMD64) #if defined(SARCH_PC98)

4 years, 8 months

[reactos] 01/01: [SHELL32] Fix grammar mistake in portuguese translation (#2605)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=181ed94e2225e3b3a00b8… commit 181ed94e2225e3b3a00b8e2533596fe2e8972e50 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue Apr 21 14:38:23 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 21 16:38:23 2020 +0300 [SHELL32] Fix grammar mistake in portuguese translation (#2605) --- dll/win32/shell32/lang/pt-PT.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 2dd69f85cd6..1eb2a024814 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -400,7 +400,7 @@ BEGIN LTEXT "Ficheiro: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programas", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "Sempre &use este programa para abrir esse tipo de ficheiros", 14003, 16, 193, 232, 10 + AUTOCHECKBOX "&Utilizar sempre este programa para abrir este tipo de ficheiro", 14003, 16, 193, 232, 10 PUSHBUTTON "&Seleccionar...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14

4 years, 8 months

[reactos] 01/01: [SHIMGVW] Improve Japanese translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0950ae26d3edf7881e0f6… commit 0950ae26d3edf7881e0f628023f2818d551df828 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Apr 21 19:11:58 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Apr 21 19:11:58 2020 +0900 [SHIMGVW] Improve Japanese translation --- dll/win32/shimgvw/lang/ja-JP.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/shimgvw/lang/ja-JP.rc b/dll/win32/shimgvw/lang/ja-JP.rc index 2a7e13fe837..6c4395cfe00 100644 --- a/dll/win32/shimgvw/lang/ja-JP.rc +++ b/dll/win32/shimgvw/lang/ja-JP.rc @@ -4,7 +4,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS画像とFAXビュアー" IDS_SETASDESKBG "デスクトップの背景に設定する" - IDS_NOPREVIEW "No preview available." + IDS_NOPREVIEW "プレビューは利用できません。" IDS_PREVIEW "プレビュー" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "次の画像" @@ -19,11 +19,11 @@ END STRINGTABLE BEGIN - IDS_EMF_FILE "EMF画像" - IDS_GIF_FILE "GIF画像" - IDS_JPG_FILE "JPEG画像" - IDS_BMP_FILE "Bitmap画像" - IDS_PNG_FILE "PNG画像" - IDS_TIF_FILE "TIF画像" - IDS_WMF_FILE "WMF画像" + IDS_EMF_FILE "EMF 画像" + IDS_GIF_FILE "GIF 画像" + IDS_JPG_FILE "JPEG 画像" + IDS_BMP_FILE "ビットマップ画像" + IDS_PNG_FILE "PNG 画像" + IDS_TIF_FILE "TIFF 画像" + IDS_WMF_FILE "WMF 画像" END

4 years, 8 months

[reactos] 01/01: [MEDIA][FONTS] Fix French glyphs of Tahoma font (#2607)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30fae1a2df24939da1073… commit 30fae1a2df24939da1073b3af411cab00fe0653e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Apr 21 15:32:19 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 21 15:32:19 2020 +0900 [MEDIA][FONTS] Fix French glyphs of Tahoma font (#2607) Fix French glyphs (U+00EC, U+00EE, and U+00EF) of Tahoma font. Version 0.018 khmz CORE-16899 --- media/fonts/tahoma.ttf | Bin 155384 -> 154488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index ae36726fca0..ec8dd3bc82a 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ

4 years, 8 months

[reactos] 01/01: [README] Replace IRC with our official chat

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4da4a76d60f6121d55c98… commit 4da4a76d60f6121d55c987d6667f0255ec1587de Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Apr 21 04:04:46 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Apr 21 04:04:46 2020 +0300 [README] Replace IRC with our official chat Also improve contributing section. --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7b37ab9b11c..af6a476a985 100644 --- a/README.md +++ b/README.md @@ -88,12 +88,16 @@ If you discover a bug in ReactOS search on JIRA first - it might be reported alr See ["File Bugs"](https://reactos.org/wiki/File_Bugs) for a guide. -__NOTE:__ The bug tracker is _not_ for discussions. Please use `#reactos` Freenode IRC channel or our [forum](https://reactos.org/forum/). +__NOTE:__ The bug tracker is _not_ for discussions. Please use our [official chat](https://chat.reactos.org/) or our [forum](https://reactos.org/forum/). -## Contributing [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#ht… • ![prwelcome.badge] +## Contributing [![prwelcome.badge]](https://reactos.org/wiki/Commiting_Changes) We are always looking for developers! Check [how to contribute](CONTRIBUTING.md) if you are willing to participate. +Try out cloud-based ReactOS development using Gitpod and Docker: + +[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#ht… + You can also support ReactOS by [donating](https://reactos.org/donate/)! We rely on our backers to maintain our servers and accelerate development by [hiring full-time devs](https://reactos.org/contributing/#paid-jobs). ## More information

4 years, 8 months

[reactos] 01/01: [REACTOS] Update now-redirected 'http' and 'www.reactos.org' urls (#2583)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3636e13046a216443cc6… commit d3636e13046a216443cc66b3c47bd1bf142f21e2 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Apr 21 02:38:54 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 21 03:38:54 2020 +0300 [REACTOS] Update now-redirected 'http' and 'www.reactos.org' urls (#2583) And improve/fix some urls. --- .github/FUNDING.yml | 2 +- CONTRIBUTING.md | 6 +++--- INSTALL | 6 +++--- README.md | 38 +++++++++++++++++++------------------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 1ed5207b427..7f376a5f477 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,2 @@ -custom: ['https://reactos.org/donating', 'https://paypal.me/ReactOS'] +custom: ['https://reactos.org/donate/', 'https://paypal.me/ReactOS'] liberapay: ReactOS diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fc1f21b1883..1f3657733c8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -77,7 +77,7 @@ To amend your commit with your name and e-mail (in any case you've forgot to set Finding a good project to start with can be a challenge, because when starting out you are (usually) not aware of all the possibilities. To help you find a project, here are some ideas to try: -- Find a test that fails, and try to make it succeed: <https://www.reactos.org/testman/> +- Find a test that fails, and try to make it succeed: <https://reactos.org/testman/> - Look around in JIRA, and if you have problems finding nice projects to start with, there is a label for this: <https://jira.reactos.org/issues/?jql=labels%20%3D%20starter-project> - Ask for help on [IRC] - Additionally, there are some tests that cause crashes/hangs, but these might be slightly harder: <https://jira.reactos.org/browse/ROSTESTS-125> @@ -86,8 +86,8 @@ Finding a good project to start with can be a challenge, because when starting o [debug]: https://reactos.org/wiki/Debugging [JIRA]: https://jira.reactos.org/ [filing a bug report]: https://reactos.org/wiki/File_Bugs - [testman]: https://www.reactos.org/testman/ - [migration to GitHub]: https://www.reactos.org/project-news/reactos-repository-migrated-github + [testman]: https://reactos.org/testman/ + [migration to GitHub]: https://reactos.org/project-news/reactos-repository-migrated-github/ [humans are terrible at tracking large amount of information]: https://www.eurekalert.org/pub_releases/2005-03/aps-hmc030805.php [Pull requests]: https://help.github.com/articles/about-pull-requests/ [tips for reviewing patches]: https://drupal.org/patch/review diff --git a/INSTALL b/INSTALL index fd4409ddde3..997812d640e 100644 --- a/INSTALL +++ b/INSTALL @@ -3,7 +3,7 @@ To build the system it is strongly advised to use the ReactOS Build Environment (RosBE). Up-to-date versions for Windows and for Unix/GNU-Linux are available -from our download page at: http://www.reactos.org/wiki/Build_Environment/ +from our download page at: https://reactos.org/wiki/Build_Environment Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+, together with separate installations of CMake and the Ninja build utility. @@ -13,7 +13,7 @@ with separate installations of CMake and the Ninja build utility. ------------------- A throughout guide for how to build ReactOS can be found at: - http://www.reactos.org/wiki/Building_ReactOS + https://reactos.org/wiki/Building_ReactOS In the following we only make a quick overview. @@ -92,6 +92,6 @@ visit the address below. Mailing lists are available for a variety of topics, bugs should be submitted to JIRA and general chat takes place in the forums, or #reactos on freenode. -http://www.reactos.org/ +https://reactos.org/ ReactOS Development Team diff --git a/README.md b/README.md index becb3fbabbf..7b37ab9b11c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ <p align=center> - <a href="https://reactos.org"> + <a href="https://reactos.org/"> <img alt="ReactOS" src="https://reactos.org/wiki/images/0/02/ReactOS_logo.png"> </a> </p> @@ -7,10 +7,10 @@ --- <p align=center> - <a href="https://reactos.org/project-news/reactos-0413-released"> + <a href="https://reactos.org/project-news/reactos-0413-released/"> <img alt="ReactOS 0.4.13 Release" src="https://img.shields.io/badge/release-0.4.13-0688CB.svg"> </a> - <a href="https://reactos.org/download"> + <a href="https://reactos.org/download/"> <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg"> </a> <a href="https://sourceforge.net/projects/reactos"> @@ -19,7 +19,7 @@ <a href="https://github.com/reactos/reactos/blob/master/COPYING"> <img alt="License" src="https://img.shields.io/badge/license-GNU_GPL_2.0-0688CB.svg"> </a> - <a href="https://reactos.org/donating"> + <a href="https://reactos.org/donate/"> <img alt="Donate" src="https://img.shields.io/badge/%24-donate-E44E4A.svg"> </a> <a href="https://twitter.com/reactos"> @@ -28,12 +28,12 @@ </p> ## Quick Links -[Website](https://reactos.org) • -[Official chat](https://chat.reactos.org) • -[Wiki](https://reactos.org/wiki) • -[Forum](https://reactos.org/forum) • -[JIRA Bug Tracker](https://jira.reactos.org/issues) • -[ReactOS Git mirror](https://git.reactos.org) • +[Website](https://reactos.org/) • +[Official chat](https://chat.reactos.org/) • +[Wiki](https://reactos.org/wiki/) • +[Forum](https://reactos.org/forum/) • +[JIRA Bug Tracker](https://jira.reactos.org/issues/) • +[ReactOS Git mirror](https://git.reactos.org/) • [Testman](https://reactos.org/testman/) ## What is ReactOS? @@ -51,9 +51,9 @@ The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/r [![appveyor.badge]][appveyor.link] [![travis.badge]][travis.link] [![rosbewin.badge]][rosbewin.link] [![rosbeunix.badge]][rosbeunix.link] [![coverity.badge]][coverity.link] To build the system it is strongly advised to use the _ReactOS Build Environment (RosBE)._ -Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: ["Build Environment"](http://www.reactos.org/wiki/Build_Environment). +Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: ["Build Environment"](https://reactos.org/wiki/Build_Environment). -Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://www.reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B). +Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B). ### Binaries @@ -64,9 +64,9 @@ To build ReactOS you must run the `configure` script in the directory you want t To build a bootable CD image run `ninja bootcd` from the build directory. This will create a CD image with a filename `bootcd.iso`. -See ["Building ReactOS"](http://www.reactos.org/wiki/Building_ReactOS) for more details. +See ["Building ReactOS"](https://reactos.org/wiki/Building_ReactOS) for more details. -You can always download fresh binary builds of bootable images from the ["Daily builds"](https://www.reactos.org/getbuilds/) page. +You can always download fresh binary builds of bootable images from the ["Daily builds"](https://reactos.org/getbuilds/) page. ## Installing @@ -80,21 +80,21 @@ FAT setup may be observed. To install ReactOS from the bootable CD distribution, extract the archive contents. Then burn the CD image, boot from it, and follow the instructions. -See ["Installing ReactOS"](https://www.reactos.org/wiki/Installing_ReactOS) Wiki page or [INSTALL](INSTALL) for more details. +See ["Installing ReactOS"](https://reactos.org/wiki/Installing_ReactOS) Wiki page or [INSTALL](INSTALL) for more details. ## Testing If you discover a bug in ReactOS search on JIRA first - it might be reported already. If not report the bug providing logs and as much information as possible. -See ["File Bugs"](https://www.reactos.org/wiki/File_Bugs) for a guide. +See ["File Bugs"](https://reactos.org/wiki/File_Bugs) for a guide. -__NOTE:__ The bug tracker is _not_ for discussions. Please use `#reactos` Freenode IRC channel or our [forum](https://reactos.org/forum). +__NOTE:__ The bug tracker is _not_ for discussions. Please use `#reactos` Freenode IRC channel or our [forum](https://reactos.org/forum/). ## Contributing [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#ht… • ![prwelcome.badge] We are always looking for developers! Check [how to contribute](CONTRIBUTING.md) if you are willing to participate. -You can also support ReactOS by [donating](https://reactos.org/donating)! We rely on our backers to maintain our servers and accelerate development by [hiring full-time devs](https://reactos.org/node/785). +You can also support ReactOS by [donating](https://reactos.org/donate/)! We rely on our backers to maintain our servers and accelerate development by [hiring full-time devs](https://reactos.org/contributing/#paid-jobs). ## More information @@ -105,7 +105,7 @@ It is not another wrapper built on Linux, like WINE. It does not attempt or plan ReactOS is also not "yet another OS". It does not attempt to be a third player like any other alternative OS out there. People are not meant to uninstall Linux and use ReactOS instead; ReactOS is a replacement for Windows users who want a Windows replacement that behaves just like Windows. -More information is available at: [reactos.org](https://www.reactos.org). +More information is available at: [reactos.org](https://reactos.org/). Also see the [media/doc](/media/doc/) subdirectory for some sparse notes.

4 years, 8 months

[reactos] 01/01: [SHIMGVW] Update French translation (#2610)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd0f498c01af6a22a43f9… commit dd0f498c01af6a22a43f92fb1608608b50ef73fd Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Tue Apr 21 02:18:55 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 21 03:18:55 2020 +0300 [SHIMGVW] Update French translation (#2610) Addendum to 3926e9b. CORE-16911 --- dll/win32/shimgvw/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shimgvw/lang/fr-FR.rc b/dll/win32/shimgvw/lang/fr-FR.rc index 6c7862600b1..89a6f99c415 100644 --- a/dll/win32/shimgvw/lang/fr-FR.rc +++ b/dll/win32/shimgvw/lang/fr-FR.rc @@ -4,7 +4,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "Visionneuse d'Images et Fax de ReactOS" IDS_SETASDESKBG "Définir comme Arrière-plan du Bureau" - IDS_NOPREVIEW "No preview available." + IDS_NOPREVIEW "Aucun aperçu n'est disponible." IDS_PREVIEW "Aperçu" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Image Suivante"

4 years, 8 months

[reactos] 01/01: [REGEDIT] Improve Russian translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc7c8ed45b570e52c3a9c… commit bc7c8ed45b570e52c3a9c651387a9b3e6c356f44 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Apr 21 02:30:21 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Apr 21 02:30:21 2020 +0300 [REGEDIT] Improve Russian translation Also fix minor issues in other translations. CORE-16914 --- base/applications/regedit/lang/en-US.rc | 2 +- base/applications/regedit/lang/es-ES.rc | 2 +- base/applications/regedit/lang/hu-HU.rc | 2 +- base/applications/regedit/lang/id-ID.rc | 2 +- base/applications/regedit/lang/it-IT.rc | 2 +- base/applications/regedit/lang/no-NO.rc | 2 +- base/applications/regedit/lang/ru-RU.rc | 82 ++++++++++++++++----------------- base/applications/regedit/lang/sq-AL.rc | 2 +- 8 files changed, 48 insertions(+), 48 deletions(-) diff --git a/base/applications/regedit/lang/en-US.rc b/base/applications/regedit/lang/en-US.rc index 1305b911625..0d1e55b426b 100644 --- a/base/applications/regedit/lang/en-US.rc +++ b/base/applications/regedit/lang/en-US.rc @@ -28,7 +28,7 @@ IDR_REGEDIT_MENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "&Import ...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Import...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Export...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED diff --git a/base/applications/regedit/lang/es-ES.rc b/base/applications/regedit/lang/es-ES.rc index 3172a48f176..865985598c3 100644 --- a/base/applications/regedit/lang/es-ES.rc +++ b/base/applications/regedit/lang/es-ES.rc @@ -29,7 +29,7 @@ END IDR_REGEDIT_MENU MENU BEGIN - POPUP "&Registro" + POPUP "&Archivo" BEGIN MENUITEM "&Importar archivo...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Exportar archivo...", ID_REGISTRY_EXPORTREGISTRYFILE diff --git a/base/applications/regedit/lang/hu-HU.rc b/base/applications/regedit/lang/hu-HU.rc index 1f545b28cd6..8994d0c3df5 100644 --- a/base/applications/regedit/lang/hu-HU.rc +++ b/base/applications/regedit/lang/hu-HU.rc @@ -26,7 +26,7 @@ END IDR_REGEDIT_MENU MENU BEGIN - POPUP "&Registry" + POPUP "&File" BEGIN MENUITEM "&Import Registry File...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Export Registry File...", ID_REGISTRY_EXPORTREGISTRYFILE diff --git a/base/applications/regedit/lang/id-ID.rc b/base/applications/regedit/lang/id-ID.rc index edb3f60fb59..b7a4627196a 100644 --- a/base/applications/regedit/lang/id-ID.rc +++ b/base/applications/regedit/lang/id-ID.rc @@ -28,7 +28,7 @@ IDR_REGEDIT_MENU MENU BEGIN POPUP "Be&rkas" BEGIN - MENUITEM "&Impor ...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Impor...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Ekspor...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR MENUITEM "Muat Hive...", ID_REGISTRY_LOADHIVE, GRAYED diff --git a/base/applications/regedit/lang/it-IT.rc b/base/applications/regedit/lang/it-IT.rc index 045ffcaa7a7..729bfcea216 100644 --- a/base/applications/regedit/lang/it-IT.rc +++ b/base/applications/regedit/lang/it-IT.rc @@ -26,7 +26,7 @@ END IDR_REGEDIT_MENU MENU BEGIN - POPUP "&Registro" + POPUP "&File" BEGIN MENUITEM "&Importa...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Esporta...", ID_REGISTRY_EXPORTREGISTRYFILE diff --git a/base/applications/regedit/lang/no-NO.rc b/base/applications/regedit/lang/no-NO.rc index 2c9cbea4c25..66172ed2e7b 100644 --- a/base/applications/regedit/lang/no-NO.rc +++ b/base/applications/regedit/lang/no-NO.rc @@ -28,7 +28,7 @@ IDR_REGEDIT_MENU MENU BEGIN POPUP "&Fil" BEGIN - MENUITEM "&Import ...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Import...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Eksport...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR MENUITEM "Last inn struktur...", ID_REGISTRY_LOADHIVE, GRAYED diff --git a/base/applications/regedit/lang/ru-RU.rc b/base/applications/regedit/lang/ru-RU.rc index 9c35be78be1..8a773e025a1 100644 --- a/base/applications/regedit/lang/ru-RU.rc +++ b/base/applications/regedit/lang/ru-RU.rc @@ -26,13 +26,13 @@ END IDR_REGEDIT_MENU MENU BEGIN - POPUP "&Реестр" + POPUP "&Файл" BEGIN - MENUITEM "&Импортировать файл реестра...", ID_REGISTRY_IMPORTREGISTRYFILE - MENUITEM "&Экспортировать файл реестра...", ID_REGISTRY_EXPORTREGISTRYFILE + MENUITEM "&Импортировать из файла...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Экспортировать в файл...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Загрузить куст...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Выгрузить куст...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM "&Загрузить куст...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "&Выгрузить куст...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR MENUITEM "&Подключить сетевой реестр...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&Отключить сетевой реестр...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED @@ -47,7 +47,7 @@ BEGIN MENUITEM SEPARATOR POPUP "Созд&ать" BEGIN - MENUITEM "Кл&юч", ID_EDIT_NEW_KEY + MENUITEM "&Раздел", ID_EDIT_NEW_KEY MENUITEM SEPARATOR MENUITEM "&Строковый параметр", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Двоичный параметр", ID_EDIT_NEW_BINARYVALUE @@ -56,12 +56,12 @@ BEGIN MENUITEM "Рас&ширяемый строковый параметр", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR - MENUITEM "&Права доступа...", ID_EDIT_PERMISSIONS + MENUITEM "Разре&шения...", ID_EDIT_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Удалить\tDel", ID_EDIT_DELETE MENUITEM "&Переименовать", ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "С&копировать имя ключа", ID_EDIT_COPYKEYNAME + MENUITEM "&Копировать имя раздела", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Найти...\tCtrl+F", ID_EDIT_FIND MENUITEM "Найти &далее\tF3", ID_EDIT_FINDNEXT @@ -101,7 +101,7 @@ BEGIN BEGIN POPUP "Созд&ать" BEGIN - MENUITEM "&Ключ", ID_EDIT_NEW_KEY + MENUITEM "&Раздел", ID_EDIT_NEW_KEY MENUITEM SEPARATOR MENUITEM "&Строковый параметр", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Двоичный параметр", ID_EDIT_NEW_BINARYVALUE @@ -115,7 +115,7 @@ BEGIN MENUITEM "Развернуть/Свернуть", ID_TREE_EXPANDBRANCH POPUP "Созд&ать" BEGIN - MENUITEM "&Ключ", ID_EDIT_NEW_KEY + MENUITEM "&Раздел", ID_EDIT_NEW_KEY MENUITEM SEPARATOR MENUITEM "&Строковый параметр", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Двоичный параметр", ID_EDIT_NEW_BINARYVALUE @@ -131,7 +131,7 @@ BEGIN MENUITEM "&Экспорт", ID_TREE_EXPORT MENUITEM "Разре&шения...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR - MENUITEM "&Копировать имя ключа", ID_EDIT_COPYKEYNAME + MENUITEM "&Копировать имя раздела", ID_EDIT_COPYKEYNAME END POPUP "" BEGIN @@ -277,17 +277,17 @@ END STRINGTABLE BEGIN ID_REGISTRY_MENU "Содержит команды для работы с реестром в целом" - ID_EDIT_MENU "Содержит команды для редактирования значений или ключей" + ID_EDIT_MENU "Содержит команды для редактирования разделов или параметров" ID_VIEW_MENU "Содержит команды для настройки окна реестра" - ID_FAVOURITES_MENU "Содержит команды для доступа к часто используемым ключам" + ID_FAVOURITES_MENU "Содержит команды для доступа к часто используемым разделам" ID_HELP_MENU "Содержит команды для отображения справки и информации о редакторе реестра" - ID_EDIT_NEW_MENU "Содержит команды для создания новых ключей или значений" + ID_EDIT_NEW_MENU "Содержит команды для создания новых разделов или параметров" END STRINGTABLE BEGIN ID_EDIT_MODIFY "Изменяет значение" - ID_EDIT_NEW_KEY "Добавляет новый ключ" + ID_EDIT_NEW_KEY "Добавляет новый раздел" ID_EDIT_NEW_STRINGVALUE "Добавляет новое строковое значение" ID_EDIT_NEW_BINARYVALUE "Добавляет новое бинарное значение" ID_EDIT_NEW_DWORDVALUE "Добавляет новое DWORD-значение" @@ -305,15 +305,15 @@ END STRINGTABLE BEGIN ID_REGISTRY_EXIT "Выход из редактора реестра" - ID_FAVOURITES_ADDTOFAVOURITES "Добавить ключ в избранное" - ID_FAVOURITES_REMOVEFAVOURITE "Удалить ключ из избранного" + ID_FAVOURITES_ADDTOFAVOURITES "Добавить раздел в избранное" + ID_FAVOURITES_REMOVEFAVOURITE "Удалить раздел из избранного" ID_VIEW_STATUSBAR "Показать или скрыть строку состояния" ID_VIEW_SPLIT "Изменить позицию разделителя между двумя панелями" ID_VIEW_REFRESH "Обновляет окно" ID_EDIT_DELETE "Удаляет выделение" ID_EDIT_RENAME "Переименовывает выделение" - ID_EDIT_COPYKEYNAME "Копирует имя выделенного ключа в буфер обмена" - ID_EDIT_FIND "Ищет текстовую строку в ключе, значении или данных" + ID_EDIT_COPYKEYNAME "Копирует имя выделенного раздела в буфер обмена" + ID_EDIT_FIND "Ищет текстовую строку в названии раздела, параметра или значения" ID_EDIT_FINDNEXT "Ищет следующее совпадение текста, заданного в предыдущем поиске" END @@ -321,25 +321,25 @@ STRINGTABLE BEGIN IDS_ERROR "Ошибка" IDS_WARNING "Предупреждение" - IDS_BAD_KEY "Не удалось получить ключ '%s'" - IDS_BAD_VALUE "Не удалось получить значение '%s'" - IDS_UNSUPPORTED_TYPE "Невозможно изменить ключи этого типа (%ld)" + IDS_BAD_KEY "Не удалось получить раздел '%s'" + IDS_BAD_VALUE "Не удалось получить параметр '%s'" + IDS_UNSUPPORTED_TYPE "Невозможно изменить значение этого типа (%ld)" IDS_TOO_BIG_VALUE "Значение слишком большое (%ld)" IDS_MULTI_SZ_EMPTY_STRING "Значение типа REG_MULTI_SZ не может содержать пустые строки.\nВсе пустые строки будут удалены." - IDS_QUERY_DELETE_KEY_ONE "Вы действительно хотите удалить этот ключ?" - IDS_QUERY_DELETE_KEY_MORE "Вы действительно хотите удалить эти ключи?" - IDS_QUERY_DELETE_KEY_CONFIRM "Подтверждение удаления ключа" - IDS_QUERY_DELETE_ONE "Вы действительно хотите удалить это значение?" - IDS_QUERY_DELETE_MORE "Вы действительно хотите удалить эти значения?" - IDS_QUERY_DELETE_CONFIRM "Подтверждение удаления значения" - IDS_ERR_DELVAL_CAPTION "Ошибка удаления значения" - IDS_ERR_DELETEVALUE "Невозможно удалить все указанные значения!" - IDS_ERR_RENVAL_CAPTION "Ошибка переименования значения" - IDS_ERR_RENVAL_TOEMPTY "Невозможно переименовать %s. Указанное значение не пустое. Введите другое значение и повторите попытку." + IDS_QUERY_DELETE_KEY_ONE "Вы действительно хотите удалить этот раздел?" + IDS_QUERY_DELETE_KEY_MORE "Вы действительно хотите удалить эти разделы?" + IDS_QUERY_DELETE_KEY_CONFIRM "Подтверждение удаления раздела" + IDS_QUERY_DELETE_ONE "Вы действительно хотите удалить этот параметр?" + IDS_QUERY_DELETE_MORE "Вы действительно хотите удалить эти параметры?" + IDS_QUERY_DELETE_CONFIRM "Подтверждение удаления параметра" + IDS_ERR_DELVAL_CAPTION "Ошибка удаления параметра" + IDS_ERR_DELETEVALUE "Невозможно удалить все указанные параметры!" + IDS_ERR_RENVAL_CAPTION "Ошибка переименования параметра" + IDS_ERR_RENVAL_TOEMPTY "Невозможно переименовать %s. Указанное имя параметра пусто. Введите другое название и повторите попытку." IDS_QUERY_IMPORT_HIVE_CAPTION "Подтвердите восстановление раздела" IDS_QUERY_IMPORT_HIVE_MSG "Раздел будет восстановлен поверх текущего выбранного раздела.\nВсе параметры и подразделы будут удалены.\nПродолжить выполнение операции?" - IDS_NEW_KEY "Новый ключ #%d" - IDS_NEW_VALUE "Новое значение #%d" + IDS_NEW_KEY "Новый раздел #%d" + IDS_NEW_VALUE "Новый параметр #%d" END STRINGTABLE @@ -373,10 +373,10 @@ STRINGTABLE BEGIN IDS_ACCESS_FULLCONTROL "Полный контроль" IDS_ACCESS_READ "Чтение" - IDS_ACCESS_QUERYVALUE "Запрос значений" - IDS_ACCESS_SETVALUE "Установка значений" - IDS_ACCESS_CREATESUBKEY "Создание подключей" - IDS_ACCESS_ENUMERATESUBKEYS "Перечисление подключей" + IDS_ACCESS_QUERYVALUE "Запрос параметров" + IDS_ACCESS_SETVALUE "Изменение параметров" + IDS_ACCESS_CREATESUBKEY "Создание разделов" + IDS_ACCESS_ENUMERATESUBKEYS "Перечисление разделов" IDS_ACCESS_NOTIFY "Уведомление" IDS_ACCESS_CREATELINK "Создание связи" IDS_ACCESS_DELETE "Удаление" @@ -387,9 +387,9 @@ END STRINGTABLE BEGIN - IDS_INHERIT_THISKEYONLY "Только этот ключ" - IDS_INHERIT_THISKEYANDSUBKEYS "Только этот ключ и подключи" - IDS_INHERIT_SUBKEYSONLY "Только подключи" + IDS_INHERIT_THISKEYONLY "Только этот раздел" + IDS_INHERIT_THISKEYANDSUBKEYS "Только этот раздел и подразделы" + IDS_INHERIT_SUBKEYSONLY "Только подразделы" END STRINGTABLE diff --git a/base/applications/regedit/lang/sq-AL.rc b/base/applications/regedit/lang/sq-AL.rc index 6d04be14717..511f1ff8ec0 100644 --- a/base/applications/regedit/lang/sq-AL.rc +++ b/base/applications/regedit/lang/sq-AL.rc @@ -32,7 +32,7 @@ IDR_REGEDIT_MENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "&Importo ...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Importo...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Eksporto...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR MENUITEM "Ngarko koshere...", ID_REGISTRY_LOADHIVE, GRAYED

4 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
40
Older →

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