Ros-diffs December 2018

ros-diffs@reactos.org

26 participants
322 discussions

[reactos] 03/03: [IPHLPAPI_APITEST] Add tests for GetOwnerModuleFromUdpEntry

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8785b1091703db7959a1c… commit 8785b1091703db7959a1c97cdbbb00ea02f5bf92 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 21 19:16:25 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Dec 21 19:17:11 2018 +0100 [IPHLPAPI_APITEST] Add tests for GetOwnerModuleFromUdpEntry --- modules/rostests/apitests/iphlpapi/CMakeLists.txt | 1 + .../apitests/iphlpapi/GetOwnerModuleFromUdpEntry.c | 155 +++++++++++++++++++++ modules/rostests/apitests/iphlpapi/testlist.c | 2 + 3 files changed, 158 insertions(+) diff --git a/modules/rostests/apitests/iphlpapi/CMakeLists.txt b/modules/rostests/apitests/iphlpapi/CMakeLists.txt index 69b44b8efd..8fa7232c90 100644 --- a/modules/rostests/apitests/iphlpapi/CMakeLists.txt +++ b/modules/rostests/apitests/iphlpapi/CMakeLists.txt @@ -5,6 +5,7 @@ list(APPEND SOURCE GetInterfaceName.c GetNetworkParams.c GetOwnerModuleFromTcpEntry.c + GetOwnerModuleFromUdpEntry.c icmp.c SendARP.c testlist.c) diff --git a/modules/rostests/apitests/iphlpapi/GetOwnerModuleFromUdpEntry.c b/modules/rostests/apitests/iphlpapi/GetOwnerModuleFromUdpEntry.c new file mode 100644 index 0000000000..bfe4efea57 --- /dev/null +++ b/modules/rostests/apitests/iphlpapi/GetOwnerModuleFromUdpEntry.c @@ -0,0 +1,155 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for UDP connections owner functions + * COPYRIGHT: Copyright 2018 Pierre Schweitzer + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <iphlpapi.h> +#include <winsock2.h> + +static DWORD GetExtendedUdpTableWithAlloc(PVOID *UdpTable, BOOL Order, DWORD Family, UDP_TABLE_CLASS Class) +{ + DWORD ret; + DWORD Size = 0; + + *UdpTable = NULL; + + ret = GetExtendedUdpTable(*UdpTable, &Size, Order, Family, Class, 0); + if (ret == ERROR_INSUFFICIENT_BUFFER) + { + *UdpTable = HeapAlloc(GetProcessHeap(), 0, Size); + if (*UdpTable == NULL) + { + return ERROR_OUTOFMEMORY; + } + + ret = GetExtendedUdpTable(*UdpTable, &Size, Order, Family, Class, 0); + if (ret != NO_ERROR) + { + HeapFree(GetProcessHeap(), 0, *UdpTable); + *UdpTable = NULL; + } + } + + return ret; +} + +START_TEST(GetOwnerModuleFromUdpEntry) +{ + WSADATA wsaData; + SOCKET sock; + SOCKADDR_IN server; + PMIB_UDPTABLE_OWNER_MODULE UdpTableOwnerMod; + DWORD i; + BOOLEAN Found; + FILETIME Creation; + LARGE_INTEGER CreationTime; + DWORD Pid = GetCurrentProcessId(); + + if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) + { + skip("Failed to init WS2\n"); + return; + } + + GetSystemTimeAsFileTime(&Creation); + CreationTime.LowPart = Creation.dwLowDateTime; + CreationTime.HighPart = Creation.dwHighDateTime; + + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + if (sock == INVALID_SOCKET) + { + skip("Cannot create socket\n"); + goto quit; + } + + ZeroMemory(&server, sizeof(SOCKADDR_IN)); + server.sin_family = AF_INET; + server.sin_addr.s_addr = htonl(INADDR_ANY); + server.sin_port = htons(9876); + + if (bind(sock, (SOCKADDR*)&server, sizeof(SOCKADDR_IN)) == SOCKET_ERROR) + { + skip("Cannot bind socket\n"); + goto quit2; + } + + if (GetExtendedUdpTableWithAlloc((PVOID *)&UdpTableOwnerMod, TRUE, AF_INET, UDP_TABLE_OWNER_MODULE) == ERROR_SUCCESS) + { + ok(UdpTableOwnerMod->dwNumEntries > 0, "No UDP connections?!\n"); + + Found = FALSE; + for (i = 0; i < UdpTableOwnerMod->dwNumEntries; ++i) + { + if (UdpTableOwnerMod->table[i].dwLocalAddr == 0 && + UdpTableOwnerMod->table[i].dwLocalPort == htons(9876)) + { + Found = TRUE; + break; + } + } + + if (!Found) + { + skip("Our socket wasn't found!\n"); + } + else + { + DWORD Size = 0; + PTCPIP_OWNER_MODULE_BASIC_INFO BasicInfo = NULL; + + ok(UdpTableOwnerMod->table[i].dwOwningPid == Pid, "Invalid owner\n"); + + ok(UdpTableOwnerMod->table[i].liCreateTimestamp.QuadPart >= CreationTime.QuadPart, "Invalid time\n"); + ok(UdpTableOwnerMod->table[i].liCreateTimestamp.QuadPart <= CreationTime.QuadPart + 60000000000LL, "Invalid time\n"); + + if (GetOwnerModuleFromUdpEntry(&UdpTableOwnerMod->table[i], TCPIP_OWNER_MODULE_INFO_BASIC, BasicInfo, &Size) == ERROR_INSUFFICIENT_BUFFER) + { + BasicInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Size); + ok(BasicInfo != NULL, "HeapAlloc failed\n"); + + if (GetOwnerModuleFromUdpEntry(&UdpTableOwnerMod->table[i], TCPIP_OWNER_MODULE_INFO_BASIC, BasicInfo, &Size) == ERROR_SUCCESS) + { + WCHAR CurrentModule[MAX_PATH]; + PWSTR FileName; + + if (GetModuleFileNameW(NULL, CurrentModule, MAX_PATH) != 0) + { + FileName = wcsrchr(CurrentModule, L'\\'); + ++FileName; + + ok(_wcsicmp(CurrentModule, BasicInfo->pModulePath) == 0, "Mismatching names (%S, %S)\n", CurrentModule, BasicInfo->pModulePath); + ok(_wcsicmp(FileName, BasicInfo->pModuleName) == 0, "Mismatching names (%S, %S)\n", FileName, BasicInfo->pModuleName); + } + else + { + skip("GetModuleFileNameW failed\n"); + } + } + else + { + skip("GetOwnerModuleFromTcpEntry failed\n"); + } + } + else + { + skip("GetOwnerModuleFromTcpEntry failed\n"); + } + } + + HeapFree(GetProcessHeap(), 0, UdpTableOwnerMod); + } + else + { + skip("GetExtendedUdpTableWithAlloc failure\n"); + } + +quit2: + closesocket(sock); +quit: + WSACleanup(); +} diff --git a/modules/rostests/apitests/iphlpapi/testlist.c b/modules/rostests/apitests/iphlpapi/testlist.c index 6690e3d260..7699e6001a 100644 --- a/modules/rostests/apitests/iphlpapi/testlist.c +++ b/modules/rostests/apitests/iphlpapi/testlist.c @@ -8,6 +8,7 @@ extern void func_GetExtendedUdpTable(void); extern void func_GetInterfaceName(void); extern void func_GetNetworkParams(void); extern void func_GetOwnerModuleFromTcpEntry(void); +extern void func_GetOwnerModuleFromUdpEntry(void); extern void func_icmp(void); extern void func_SendARP(void); @@ -18,6 +19,7 @@ const struct test winetest_testlist[] = { "GetInterfaceName", func_GetInterfaceName }, { "GetNetworkParams", func_GetNetworkParams }, { "GetOwnerModuleFromTcpEntry", func_GetOwnerModuleFromTcpEntry }, + { "GetOwnerModuleFromUdpEntry", func_GetOwnerModuleFromUdpEntry }, { "icmp", func_icmp }, { "SendARP", func_SendARP },

5 years, 9 months

[reactos] 02/03: [SDK] Define GetOwnerModuleFromUdpEntry()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78d703933db8ef29bcf08… commit 78d703933db8ef29bcf08617d2d13d0b45d11a27 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 21 19:15:05 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Dec 21 19:17:11 2018 +0100 [SDK] Define GetOwnerModuleFromUdpEntry() --- sdk/include/psdk/iphlpapi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/psdk/iphlpapi.h b/sdk/include/psdk/iphlpapi.h index ff3d279b0b..92c6d711db 100644 --- a/sdk/include/psdk/iphlpapi.h +++ b/sdk/include/psdk/iphlpapi.h @@ -41,6 +41,7 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS,DWORD); DWORD WINAPI GetNetworkParams(PFIXED_INFO,PULONG); DWORD WINAPI GetNumberOfInterfaces(PDWORD); DWORD WINAPI GetOwnerModuleFromTcpEntry(PMIB_TCPROW_OWNER_MODULE,TCPIP_OWNER_MODULE_INFO_CLASS,PVOID,PDWORD); +DWORD WINAPI GetOwnerModuleFromUdpEntry(PMIB_UDPROW_OWNER_MODULE,TCPIP_OWNER_MODULE_INFO_CLASS,PVOID,PDWORD); DWORD WINAPI GetPerAdapterInfo(ULONG,PIP_PER_ADAPTER_INFO, PULONG); BOOL WINAPI GetRTTAndHopCount(IPAddr,PULONG,ULONG,PULONG); DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS);

5 years, 9 months

[reactos] 01/03: [IPHLPAPI_APITEST] Add tests for GetExtendedUdpTable

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f42a6c16f2565e2c73ab5… commit f42a6c16f2565e2c73ab5c8e3c4ade20098c92c8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 21 19:05:07 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Dec 21 19:17:11 2018 +0100 [IPHLPAPI_APITEST] Add tests for GetExtendedUdpTable --- modules/rostests/apitests/iphlpapi/CMakeLists.txt | 1 + .../apitests/iphlpapi/GetExtendedUdpTable.c | 175 +++++++++++++++++++++ modules/rostests/apitests/iphlpapi/testlist.c | 2 + 3 files changed, 178 insertions(+) diff --git a/modules/rostests/apitests/iphlpapi/CMakeLists.txt b/modules/rostests/apitests/iphlpapi/CMakeLists.txt index 81ca68cae9..69b44b8efd 100644 --- a/modules/rostests/apitests/iphlpapi/CMakeLists.txt +++ b/modules/rostests/apitests/iphlpapi/CMakeLists.txt @@ -1,6 +1,7 @@ list(APPEND SOURCE GetExtendedTcpTable.c + GetExtendedUdpTable.c GetInterfaceName.c GetNetworkParams.c GetOwnerModuleFromTcpEntry.c diff --git a/modules/rostests/apitests/iphlpapi/GetExtendedUdpTable.c b/modules/rostests/apitests/iphlpapi/GetExtendedUdpTable.c new file mode 100644 index 0000000000..ea1c0cb27e --- /dev/null +++ b/modules/rostests/apitests/iphlpapi/GetExtendedUdpTable.c @@ -0,0 +1,175 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for UDP connections enumeration functions + * COPYRIGHT: Copyright 2018 Pierre Schweitzer + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <iphlpapi.h> +#include <winsock2.h> + +static DWORD GetExtendedUdpTableWithAlloc(PVOID *UdpTable, BOOL Order, DWORD Family, UDP_TABLE_CLASS Class) +{ + DWORD ret; + DWORD Size = 0; + + *UdpTable = NULL; + + ret = GetExtendedUdpTable(*UdpTable, &Size, Order, Family, Class, 0); + if (ret == ERROR_INSUFFICIENT_BUFFER) + { + *UdpTable = HeapAlloc(GetProcessHeap(), 0, Size); + if (*UdpTable == NULL) + { + return ERROR_OUTOFMEMORY; + } + + ret = GetExtendedUdpTable(*UdpTable, &Size, Order, Family, Class, 0); + if (ret != NO_ERROR) + { + HeapFree(GetProcessHeap(), 0, *UdpTable); + *UdpTable = NULL; + } + } + + return ret; +} + +START_TEST(GetExtendedUdpTable) +{ + WSADATA wsaData; + SOCKET sock; + SOCKADDR_IN server; + PMIB_UDPTABLE UdpTable; + PMIB_UDPTABLE_OWNER_PID UdpTableOwner; + PMIB_UDPTABLE_OWNER_MODULE UdpTableOwnerMod; + DWORD i; + BOOLEAN Found; + FILETIME Creation; + LARGE_INTEGER CreationTime; + DWORD Pid = GetCurrentProcessId(); + + if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) + { + skip("Failed to init WS2\n"); + return; + } + + GetSystemTimeAsFileTime(&Creation); + CreationTime.LowPart = Creation.dwLowDateTime; + CreationTime.HighPart = Creation.dwHighDateTime; + + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + if (sock == INVALID_SOCKET) + { + skip("Cannot create socket\n"); + goto quit; + } + + ZeroMemory(&server, sizeof(SOCKADDR_IN)); + server.sin_family = AF_INET; + server.sin_addr.s_addr = htonl(INADDR_ANY); + server.sin_port = htons(9876); + + if (bind(sock, (SOCKADDR*)&server, sizeof(SOCKADDR_IN)) == SOCKET_ERROR) + { + skip("Cannot bind socket\n"); + goto quit2; + } + + if (GetExtendedUdpTableWithAlloc((PVOID *)&UdpTable, TRUE, AF_INET, UDP_TABLE_BASIC) == ERROR_SUCCESS) + { + ok(UdpTable->dwNumEntries > 0, "No UDP connections?!\n"); + + Found = FALSE; + for (i = 0; i < UdpTable->dwNumEntries; ++i) + { + if (UdpTable->table[i].dwLocalAddr == 0 && + UdpTable->table[i].dwLocalPort == htons(9876)) + { + Found = TRUE; + break; + } + } + ok(Found, "Our socket wasn't found!\n"); + + HeapFree(GetProcessHeap(), 0, UdpTable); + } + else + { + skip("GetExtendedUdpTableWithAlloc failure\n"); + } + + if (GetExtendedUdpTableWithAlloc((PVOID *)&UdpTableOwner, TRUE, AF_INET, UDP_TABLE_OWNER_PID) == ERROR_SUCCESS) + { + ok(UdpTableOwner->dwNumEntries > 0, "No UDP connections?!\n"); + + Found = FALSE; + for (i = 0; i < UdpTableOwner->dwNumEntries; ++i) + { + if (UdpTableOwner->table[i].dwLocalAddr == 0 && + UdpTableOwner->table[i].dwLocalPort == htons(9876)) + { + Found = TRUE; + break; + } + } + + if (!Found) + { + skip("Our socket wasn't found!\n"); + } + else + { + ok(UdpTableOwner->table[i].dwOwningPid == Pid, "Invalid owner\n"); + } + + HeapFree(GetProcessHeap(), 0, UdpTableOwner); + } + else + { + skip("GetExtendedUdpTableWithAlloc failure\n"); + } + + if (GetExtendedUdpTableWithAlloc((PVOID *)&UdpTableOwnerMod, TRUE, AF_INET, UDP_TABLE_OWNER_MODULE) == ERROR_SUCCESS) + { + ok(UdpTableOwnerMod->dwNumEntries > 0, "No TCP connections?!\n"); + + Found = FALSE; + for (i = 0; i < UdpTableOwnerMod->dwNumEntries; ++i) + { + if (UdpTableOwnerMod->table[i].dwLocalAddr == 0 && + UdpTableOwnerMod->table[i].dwLocalPort == htons(9876)) + { + Found = TRUE; + break; + } + } + + if (!Found) + { + skip("Our socket wasn't found!\n"); + } + else + { + ok(UdpTableOwnerMod->table[i].dwOwningPid == Pid, "Invalid owner\n"); + + ok(UdpTableOwnerMod->table[i].liCreateTimestamp.QuadPart >= CreationTime.QuadPart, "Invalid time\n"); + ok(UdpTableOwnerMod->table[i].liCreateTimestamp.QuadPart <= CreationTime.QuadPart + 60000000000LL, "Invalid time\n"); + } + + HeapFree(GetProcessHeap(), 0, UdpTableOwnerMod); + } + else + { + skip("GetExtendedUdpTableWithAlloc failure\n"); + } + +quit2: + closesocket(sock); +quit: + WSACleanup(); +} diff --git a/modules/rostests/apitests/iphlpapi/testlist.c b/modules/rostests/apitests/iphlpapi/testlist.c index 4f56d9da55..6690e3d260 100644 --- a/modules/rostests/apitests/iphlpapi/testlist.c +++ b/modules/rostests/apitests/iphlpapi/testlist.c @@ -4,6 +4,7 @@ #include <apitest.h> extern void func_GetExtendedTcpTable(void); +extern void func_GetExtendedUdpTable(void); extern void func_GetInterfaceName(void); extern void func_GetNetworkParams(void); extern void func_GetOwnerModuleFromTcpEntry(void); @@ -13,6 +14,7 @@ extern void func_SendARP(void); const struct test winetest_testlist[] = { { "GetExtendedTcpTable", func_GetExtendedTcpTable }, + { "GetExtendedUdpTable", func_GetExtendedUdpTable }, { "GetInterfaceName", func_GetInterfaceName }, { "GetNetworkParams", func_GetNetworkParams }, { "GetOwnerModuleFromTcpEntry", func_GetOwnerModuleFromTcpEntry },

5 years, 9 months

[reactos] 01/01: [COMDLG32] Update Ukrainian translation for NEWFILEOPENV2ORD dialog (#1175)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=637fcbb9bc53eeb72e5c8… commit 637fcbb9bc53eeb72e5c8f56e46c77cc70d68706 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Dec 21 17:49:05 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 21 16:49:05 2018 +0100 [COMDLG32] Update Ukrainian translation for NEWFILEOPENV2ORD dialog (#1175) --- dll/win32/comdlg32/lang/cdlg_Uk.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/comdlg32/lang/cdlg_Uk.rc b/dll/win32/comdlg32/lang/cdlg_Uk.rc index 60eb0c0c32..316ad99578 100644 --- a/dll/win32/comdlg32/lang/cdlg_Uk.rc +++ b/dll/win32/comdlg32/lang/cdlg_Uk.rc @@ -474,28 +474,28 @@ FONT 8, "MS Shell Dlg" NEWFILEOPENV2ORD DIALOG 0, 0, 370, 237 STYLE DS_MODALFRAME | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "Open" +CAPTION "Відкрити" FONT 8, "MS Shell Dlg" { - LTEXT "Look &in:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY + LTEXT "Шукати &в:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY + LTEXT "Ім'я &файлу:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY EDITTEXT IDC_FILENAME, 123, 180, 180, 12, ES_AUTOHSCROLL CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 123, 180, 180, 150 - LTEXT "Files of &type:", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY + LTEXT "Файли &типу:", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY COMBOBOX IDC_FILETYPE, 123, 198, 180, 53, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Open as &read-only", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 + CONTROL "Лише для &читання", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 - DEFPUSHBUTTON "&Open", IDOK, 310, 180, 54, 14 - PUSHBUTTON "Cancel", IDCANCEL, 310, 198, 54, 14 - PUSHBUTTON "&Help", pshHelp, 310, 215, 54, 14 + DEFPUSHBUTTON "&Відкрити", IDOK, 310, 180, 54, 14 + PUSHBUTTON "Скасувати", IDCANCEL, 310, 198, 54, 14 + PUSHBUTTON "&Довідка", pshHelp, 310, 215, 54, 14 } NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300

5 years, 9 months

[reactos] 01/01: [COMDLG32] Update Russian translation for NEWFILEOPENV2ORD dialog (#1174)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d1e8143c2de3a4ac5f27… commit 3d1e8143c2de3a4ac5f2726807a97c0f7ffaea87 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Dec 21 17:48:36 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 21 16:48:36 2018 +0100 [COMDLG32] Update Russian translation for NEWFILEOPENV2ORD dialog (#1174) --- dll/win32/comdlg32/lang/cdlg_Ru.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/comdlg32/lang/cdlg_Ru.rc b/dll/win32/comdlg32/lang/cdlg_Ru.rc index f5e974ed92..d849f22b5e 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ru.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ru.rc @@ -474,28 +474,28 @@ FONT 8, "MS Shell Dlg" NEWFILEOPENV2ORD DIALOG 0, 0, 370, 237 STYLE DS_MODALFRAME | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "Open" +CAPTION "Открыть" FONT 8, "MS Shell Dlg" { - LTEXT "Look &in:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY + LTEXT "Искать &в:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY + LTEXT "Имя &файла:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY EDITTEXT IDC_FILENAME, 123, 180, 180, 12, ES_AUTOHSCROLL CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 123, 180, 180, 150 - LTEXT "Files of &type:", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY + LTEXT "&Тип файлов:", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY COMBOBOX IDC_FILETYPE, 123, 198, 180, 53, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Open as &read-only", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 + CONTROL "Только для &чтения", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 - DEFPUSHBUTTON "&Open", IDOK, 310, 180, 54, 14 - PUSHBUTTON "Cancel", IDCANCEL, 310, 198, 54, 14 - PUSHBUTTON "&Help", pshHelp, 310, 215, 54, 14 + DEFPUSHBUTTON "&Открыть", IDOK, 310, 180, 54, 14 + PUSHBUTTON "Отмена", IDCANCEL, 310, 198, 54, 14 + PUSHBUTTON "&Справка", pshHelp, 310, 215, 54, 14 } NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300

5 years, 9 months

[reactos] 01/01: [NTOSKRNL] Don't call AcquireForLazyWrite with the master lock held

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1435ff95b4a1f369a2575… commit 1435ff95b4a1f369a2575eecafe5981896ba4877 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 21 08:44:14 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Dec 21 08:46:40 2018 +0100 [NTOSKRNL] Don't call AcquireForLazyWrite with the master lock held This incorrect behavior was leading to a call at too high IRQL for paged code. This was triggered by MS FastFAT. ReleaseFromLazyWrite call was already correctly called to that regard. CORE-11819 --- ntoskrnl/cc/view.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 81a1dac801..d64496595f 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -222,18 +222,19 @@ CcRosFlushDirtyPages ( continue; } + ASSERT(current->Dirty); + + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); + Locked = current->SharedCacheMap->Callbacks->AcquireForLazyWrite( current->SharedCacheMap->LazyWriteContext, Wait); if (!Locked) { + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); CcRosVacbDecRefCount(current); continue; } - ASSERT(current->Dirty); - - KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); - Status = CcRosFlushVacb(current); current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite(

5 years, 9 months

[reactos] 01/01: [D3DCOMPILER_43] Fix a MSVC-x64 warning about dxbc_init() (#1173)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85cd2849c0297bed3fe38… commit 85cd2849c0297bed3fe38d859c96979d04abfa6f Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Dec 21 02:53:42 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 21 02:53:42 2018 +0100 [D3DCOMPILER_43] Fix a MSVC-x64 warning about dxbc_init() (#1173) "...\utils.c(561) : warning C4028: formal parameter 2 different from declaration" Cherry-pick: https://source.winehq.org/git/wine.git/commit/ffe9346120ca74f193d8a31d0b6a4… CORE-7538 --- dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h | 2 +- dll/directx/wine/d3dcompiler_43/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h b/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h index 1eea0d242c..68ff962328 100644 --- a/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h +++ b/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h @@ -1214,7 +1214,7 @@ HRESULT dxbc_write_blob(struct dxbc *dxbc, ID3DBlob **blob) DECLSPEC_HIDDEN; void dxbc_destroy(struct dxbc *dxbc) DECLSPEC_HIDDEN; HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) DECLSPEC_HIDDEN; HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD data_size) DECLSPEC_HIDDEN; -HRESULT dxbc_init(struct dxbc *dxbc, DWORD count) DECLSPEC_HIDDEN; +HRESULT dxbc_init(struct dxbc *dxbc, unsigned int size) DECLSPEC_HIDDEN; static inline void read_dword(const char **ptr, DWORD *d) { diff --git a/dll/directx/wine/d3dcompiler_43/utils.c b/dll/directx/wine/d3dcompiler_43/utils.c index 748501f207..be0adbbf2c 100644 --- a/dll/directx/wine/d3dcompiler_43/utils.c +++ b/dll/directx/wine/d3dcompiler_43/utils.c @@ -557,7 +557,7 @@ HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD d return S_OK; } -HRESULT dxbc_init(struct dxbc *dxbc, UINT size) +HRESULT dxbc_init(struct dxbc *dxbc, unsigned int size) { TRACE("dxbc %p, size %u.\n", dxbc, size);

5 years, 9 months

[reactos] 01/01: [THEMEUI][BOOTDATA] Add the Red, White, Blue Classic Color Scheme for Classic Theme, and Localization (#1059)

by Lee Schroeder

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94e4c696e559ca44bc3e8… commit 94e4c696e559ca44bc3e83897d96b59809264ec9 Author: Lee Schroeder <spaceseel(a)gmail.com> AuthorDate: Thu Dec 20 16:38:45 2018 -0700 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 21 00:38:45 2018 +0100 [THEMEUI][BOOTDATA] Add the Red, White, Blue Classic Color Scheme for Classic Theme, and Localization (#1059) Adds the 'Red, White, and Blue' Color Scheme used by the Classic Theme and adds localization for all the color schemes into themeui.dll. Translators, please check the language files for potential copypasta errors. --- boot/bootdata/hivedef.inf | 128 ++++++++++++++++++++++++++++++++++------ dll/win32/themeui/lang/cs-CZ.rc | 35 +++++++++++ dll/win32/themeui/lang/de-DE.rc | 35 +++++++++++ dll/win32/themeui/lang/en-US.rc | 35 +++++++++++ dll/win32/themeui/lang/es-ES.rc | 35 +++++++++++ dll/win32/themeui/lang/it-IT.rc | 35 +++++++++++ dll/win32/themeui/lang/pl-PL.rc | 35 +++++++++++ dll/win32/themeui/lang/ro-RO.rc | 35 +++++++++++ dll/win32/themeui/lang/ru-RU.rc | 35 +++++++++++ dll/win32/themeui/lang/tr-TR.rc | 35 +++++++++++ dll/win32/themeui/lang/uk-UA.rc | 35 +++++++++++ dll/win32/themeui/lang/zh-CN.rc | 35 +++++++++++ dll/win32/themeui/resource.h | 32 ++++++++++ dll/win32/themeui/themeui.rc | 48 +++++++++++++-- 14 files changed, 572 insertions(+), 21 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 259b659ef6..b9411a27cc 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -289,7 +289,7 @@ HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #6",0x000b0001,0c,00 HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Brick -HKCU,"Control Panel\Appearance\New Schemes\1","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\1","DisplayName",0x00020000,"@themeui.dll,-850" HKCU,"Control Panel\Appearance\New Schemes\1","LegacyName",0x00020000,"%DESKTOP_SCHEME_1%" HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -360,7 +360,7 @@ HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #6",0x000b0001,0c,00 HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Eggplant -HKCU,"Control Panel\Appearance\New Schemes\2","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\2","DisplayName",0x00020000,"@themeui.dll,-852" HKCU,"Control Panel\Appearance\New Schemes\2","LegacyName",0x00020000,"%DESKTOP_SCHEME_2%" HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -502,7 +502,7 @@ HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #6",0x000b0001,0c,00 HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; High Contrast 1 -HKCU,"Control Panel\Appearance\New Schemes\4","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\4","DisplayName",0x00020000,"@themeui.dll,-853" HKCU,"Control Panel\Appearance\New Schemes\4","LegacyName",0x00020000,"%DESKTOP_SCHEME_4%" HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -573,7 +573,7 @@ HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #6",0x000b0001,0c,00 HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; High Contrast 2 -HKCU,"Control Panel\Appearance\New Schemes\5","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\5","DisplayName",0x00020000,"@themeui.dll,-856" HKCU,"Control Panel\Appearance\New Schemes\5","LegacyName",0x00020000,"%DESKTOP_SCHEME_5%" HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -644,7 +644,7 @@ HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #6",0x000b0001,0c,00 HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; High Contrast Black -HKCU,"Control Panel\Appearance\New Schemes\6","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\6","DisplayName",0x00020000,"@themeui.dll,-859" HKCU,"Control Panel\Appearance\New Schemes\6\","LegacyName",0x00020000,"%DESKTOP_SCHEME_6%" HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -715,7 +715,7 @@ HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #6",0x000b0001,0c,00 HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; High Contrast White -HKCU,"Control Panel\Appearance\New Schemes\7","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\7","DisplayName",0x00020000,"@themeui.dll,-862" HKCU,"Control Panel\Appearance\New Schemes\7","LegacyName",0x00020000,"%DESKTOP_SCHEME_7%" HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -786,7 +786,7 @@ HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #6",0x000b0001,0c,00 HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Lilac -HKCU,"Control Panel\Appearance\New Schemes\8","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\8","DisplayName",0x00020000,"@themeui.dll,-865" HKCU,"Control Panel\Appearance\New Schemes\8","LegacyName",0x00020000,"%DESKTOP_SCHEME_8%" HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -857,7 +857,7 @@ HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #6",0x000b0001,0c,00 HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Maple -HKCU,"Control Panel\Appearance\New Schemes\9","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\9","DisplayName",0x00020000,"@themeui.dll,-867" HKCU,"Control Panel\Appearance\New Schemes\9","LegacyName",0x00020000,"%DESKTOP_SCHEME_9%" HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -928,7 +928,7 @@ HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #6",0x000b0001,0c,00 HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Marine -HKCU,"Control Panel\Appearance\New Schemes\10","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\10","DisplayName",0x00020000,"@themeui.dll,-868" HKCU,"Control Panel\Appearance\New Schemes\10","LegacyName",0x00020000,"%DESKTOP_SCHEME_10%" HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -1070,7 +1070,7 @@ HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #6",0x000b0001,0c,0 HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Pumpkin -HKCU,"Control Panel\Appearance\New Schemes\12","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\12","DisplayName",0x00020000,"@themeui.dll,-870" HKCU,"Control Panel\Appearance\New Schemes\12","LegacyName",0x00020000,"%DESKTOP_SCHEME_12%" HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -1141,7 +1141,7 @@ HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #6",0x000b0001,0c,0 HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Rainy Day -HKCU,"Control Panel\Appearance\New Schemes\13","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\13","DisplayName",0x00020000,"@themeui.dll,-872" HKCU,"Control Panel\Appearance\New Schemes\13","LegacyName",0x00020000,"%DESKTOP_SCHEME_13%" HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -1283,7 +1283,7 @@ HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #6",0x000b0001,0c,0 HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Rose -HKCU,"Control Panel\Appearance\New Schemes\15","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\15","DisplayName",0x00020000,"@themeui.dll,-874" HKCU,"Control Panel\Appearance\New Schemes\15","LegacyName",0x00020000,"%DESKTOP_SCHEME_15%" HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -1425,7 +1425,7 @@ HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #6",0x000b0001,0c,0 HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Sky (WinXP-like) -HKCU,"Control Panel\Appearance\New Schemes\17","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\17","DisplayName",0x00020000,"@themeui.dll,-884" HKCU,"Control Panel\Appearance\New Schemes\17","LegacyName",0x00020000,"%DESKTOP_SCHEME_17%" HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -1496,7 +1496,7 @@ HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #6",0x000b0001,0c,0 HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Slate -HKCU,"Control Panel\Appearance\New Schemes\18","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\18","DisplayName",0x00020000,"@themeui.dll,-876" HKCU,"Control Panel\Appearance\New Schemes\18","LegacyName",0x00020000,"%DESKTOP_SCHEME_18%" HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -1567,7 +1567,7 @@ HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #6",0x000b0001,0c,0 HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Storm -HKCU,"Control Panel\Appearance\New Schemes\19","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\19","DisplayName",0x00020000,"@themeui.dll,-878" HKCU,"Control Panel\Appearance\New Schemes\19","LegacyName",0x00020000,"%DESKTOP_SCHEME_19%" HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -1638,7 +1638,7 @@ HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #6",0x000b0001,0c,0 HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Teal -HKCU,"Control Panel\Appearance\New Schemes\20","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\20","DisplayName",0x00020000,"@themeui.dll,-879" HKCU,"Control Panel\Appearance\New Schemes\20","LegacyName",0x00020000,"%DESKTOP_SCHEME_20%" HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -1709,7 +1709,7 @@ HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #6",0x000b0001,0c,0 HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Wheat -HKCU,"Control Panel\Appearance\New Schemes\21","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\21","DisplayName",0x00020000,"@themeui.dll,-871" HKCU,"Control Panel\Appearance\New Schemes\21","LegacyName",0x00020000,"%DESKTOP_SCHEME_21%" HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" @@ -1779,6 +1779,77 @@ HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #5",0x000b0001,0c,0 HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 +; Red, White, and Blue +HKCU,"Control Panel\Appearance\New Schemes\22","DisplayName",0x00020000,"@themeui.dll,-873" +HKCU,"Control Panel\Appearance\New Schemes\22","LegacyName",0x00020000,"%DESKTOP_SCHEME_22%" +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Flat Menus",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Font #1",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Font #2",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Font #3",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Font #4",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Font #5",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #0",0x00010001,0x02c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #1",0x00010001,0x00420000 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #2",0x00010001,0x00000080 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #3",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #4",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #5",0x00010001,0x02ffffff +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #6",0x00010001,0x02000000 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #7",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #8",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #9",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #10",0x00010001,0x02c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #11",0x00010001,0x02c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #12",0x00010001,0x02ffffff +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #13",0x00010001,0x00000080 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #14",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #15",0x00010001,0x02c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #16",0x00010001,0x02808080 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #17",0x00010001,0x02808080 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #18",0x00010001,0x02000000 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #19",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #20",0x00010001,0x02ffffff +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #21",0x00010001,0x02000000 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #22",0x00010001,0x02c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #23",0x00010001,0x00800000 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #24",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #25",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #26",0x00010001,0x02000080 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #27",0x00010001,0x00a81000 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #28",0x00010001,0x00c9beba +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #29",0x00010001,0x00000080 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Color #30",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Sound","Beep",2,"yes" HKCU,"Control Panel\Sound","ExtendedSounds",2,"yes" @@ -2092,6 +2163,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2137,6 +2209,7 @@ DESKTOP_SCHEME_18="Břidlice" DESKTOP_SCHEME_19="Bouře" DESKTOP_SCHEME_20="Modrozelená" DESKTOP_SCHEME_21="Pšenice" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Výchozí velikost" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2177,6 +2250,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Lokale Indstillinger\Temp" @@ -2217,6 +2291,7 @@ DESKTOP_SCHEME_18="Schiefer" DESKTOP_SCHEME_19="Sturm" DESKTOP_SCHEME_20="Türkis" DESKTOP_SCHEME_21="Gelbbraun" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Standardgröße" TEMP_DIR="%USERPROFILE%\Lokale Einstellungen\Temp" @@ -2257,6 +2332,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2297,6 +2373,7 @@ DESKTOP_SCHEME_18="Pizarra" DESKTOP_SCHEME_19="Tormenta" DESKTOP_SCHEME_20="Verde turquesa" DESKTOP_SCHEME_21="Trigo" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Tamaño predeterminado" TEMP_DIR="%USERPROFILE%\Configuración local\Temp" @@ -2337,6 +2414,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Paikalliset Asetukset\Temp" @@ -2377,6 +2455,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Taille par défaut" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2417,6 +2496,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2457,6 +2537,7 @@ DESKTOP_SCHEME_18="Lavagna" DESKTOP_SCHEME_19="Tempesta" DESKTOP_SCHEME_20="Verde acqua" DESKTOP_SCHEME_21="Tabacco" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Impostazioni locali\Temp" @@ -2497,6 +2578,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2537,6 +2619,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2577,6 +2660,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Lokale innstillinger\Midlertidig" @@ -2617,6 +2701,7 @@ DESKTOP_SCHEME_18="Łupek" DESKTOP_SCHEME_19="Burza" DESKTOP_SCHEME_20="Morska Zieleń" DESKTOP_SCHEME_21="Pszenica" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Domyślny rozmiar" TEMP_DIR="%USERPROFILE%\Ustawienia lokalne\Temp" @@ -2662,6 +2747,7 @@ DESKTOP_SCHEME_18="Ardezie" DESKTOP_SCHEME_19="Furtună" DESKTOP_SCHEME_20="Turcoaz" DESKTOP_SCHEME_21="Grâu" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Dimensiune implicită" TEMP_DIR="%USERPROFILE%\Preferințe locale\Temp" @@ -2702,6 +2788,7 @@ DESKTOP_SCHEME_18="Шифер" DESKTOP_SCHEME_19="Шторм" DESKTOP_SCHEME_20="Зеленовато-голубая" DESKTOP_SCHEME_21="Пшеница" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2742,6 +2829,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2782,6 +2870,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Lokala inställningar\Temp" @@ -2827,6 +2916,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2867,6 +2957,7 @@ DESKTOP_SCHEME_18="Шифер" DESKTOP_SCHEME_19="Шторм" DESKTOP_SCHEME_20="Зеленовато-блакитна" DESKTOP_SCHEME_21="Пшениця" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2907,6 +2998,7 @@ DESKTOP_SCHEME_18="Slate" DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2946,6 +3038,7 @@ DESKTOP_SCHEME_18="Kayağan Taş" DESKTOP_SCHEME_19="Fırtına" DESKTOP_SCHEME_20="Çamurcun" DESKTOP_SCHEME_21="Buğday" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Ön Tanımlı Büyüklük" TEMP_DIR="%USERPROFILE%\Yerli Ayarlar\Geçici" @@ -2985,6 +3078,7 @@ DESKTOP_SCHEME_18="石板" DESKTOP_SCHEME_19="风暴" DESKTOP_SCHEME_20="青色" DESKTOP_SCHEME_21="麦色" +DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="默认大小" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" diff --git a/dll/win32/themeui/lang/cs-CZ.rc b/dll/win32/themeui/lang/cs-CZ.rc new file mode 100644 index 0000000000..b91527d664 --- /dev/null +++ b/dll/win32/themeui/lang/cs-CZ.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_BRICK "Cihla" + IDS_EGGPLANT "Lilek" + IDS_GOLIVE "Zelená oliva" //Spruce + IDS_HCONTRAST_1 "Vysoký kontrast 1" + IDS_HCONTRAST_2 "Vysoký kontrast 2" + IDS_HCONTRAST_BLACK "Vysoký kontrast černá" + IDS_HCONTRAST_WHITE "Vysoký kontrast bílá" + IDS_LILAC "Šeřík" + IDS_MAPLE "Javor" + IDS_MARINE "Námořní" + IDS_PLUM "Švestka" + IDS_PUMPKIN "Dýně" + IDS_RAIN "Deštivý den" + IDS_RWB "Red, White, and Blue" + IDS_CLASSIC "ReactOS Classic" + IDS_STANDARD "ReactOS Standard" + IDS_ROSE "Růže" + IDS_SAND "Písek" //Desert + IDS_SLATE "Břidlice" + IDS_SKY "Nebe" + IDS_STORM "Bouře" + IDS_TEAL "Modrozelená" + IDS_WHEAT "Pšenice" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "Normal" + IDS_SIZE_LARGE "Large" + IDS_SIZE_XLARGE "Extra Large" +END diff --git a/dll/win32/themeui/lang/de-DE.rc b/dll/win32/themeui/lang/de-DE.rc new file mode 100644 index 0000000000..df0a0469a5 --- /dev/null +++ b/dll/win32/themeui/lang/de-DE.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_BRICK "Backstein" + IDS_EGGPLANT "Aubergine" + IDS_GOLIVE "Olivgrün" //Spruce + IDS_HCONTRAST_1 "Hoher Kontrast 1" + IDS_HCONTRAST_2 "Hoher Kontrast 2" + IDS_HCONTRAST_BLACK "Hoher Kontrast Schwarz" + IDS_HCONTRAST_WHITE "Hoher Kontrast Weiß" + IDS_LILAC "Flieder" + IDS_MAPLE "Ahorn" + IDS_MARINE "Ozean" + IDS_PLUM "Pflaume" + IDS_PUMPKIN "Kürbis" + IDS_RAIN "Regentag" + IDS_RWB "Red, White, and Blue" + IDS_CLASSIC "ReactOS Klassisch" + IDS_STANDARD "ReactOS Standard" + IDS_ROSE "Rose" + IDS_SAND "Sand" //Desert + IDS_SLATE "Schiefer" + IDS_SKY "Himmel" + IDS_STORM "Sturm" + IDS_TEAL "Türkis" + IDS_WHEAT "Gelbbraun" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "Normal" + IDS_SIZE_LARGE "Large" + IDS_SIZE_XLARGE "Extra Large" +END diff --git a/dll/win32/themeui/lang/en-US.rc b/dll/win32/themeui/lang/en-US.rc new file mode 100644 index 0000000000..807cc22108 --- /dev/null +++ b/dll/win32/themeui/lang/en-US.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_BRICK "Brick" + IDS_EGGPLANT "Eggplant" + IDS_GOLIVE "Green Olive" //Spruce + IDS_HCONTRAST_1 "High Contrast 1" + IDS_HCONTRAST_2 "High Contrast 2" + IDS_HCONTRAST_BLACK "High Contrast Black" + IDS_HCONTRAST_WHITE "High Contrast White" + IDS_LILAC "Lilac" + IDS_MAPLE "Maple" + IDS_MARINE "Marine" + IDS_PLUM "Plum" + IDS_PUMPKIN "Pumpkin" + IDS_RAIN "Rainy Day" + IDS_RWB "Red, White, and Blue" + IDS_CLASSIC "ReactOS Classic" + IDS_STANDARD "ReactOS Standard" + IDS_ROSE "Rose" + IDS_SAND "Sand" //Desert + IDS_SLATE "Slate" + IDS_SKY "Sky" + IDS_STORM "Storm" + IDS_TEAL "Teal" + IDS_WHEAT "Wheat" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "Normal" + IDS_SIZE_LARGE "Large" + IDS_SIZE_XLARGE "Extra Large" +END diff --git a/dll/win32/themeui/lang/es-ES.rc b/dll/win32/themeui/lang/es-ES.rc new file mode 100644 index 0000000000..d90a72d296 --- /dev/null +++ b/dll/win32/themeui/lang/es-ES.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_BRICK "Ladrillo" + IDS_EGGPLANT "Berenjena" + IDS_GOLIVE "Verde oliva" //Spruce + IDS_HCONTRAST_1 "Alto contraste 1" + IDS_HCONTRAST_2 "Alto contraste 2" + IDS_HCONTRAST_BLACK "Alto contraste oscuro" + IDS_HCONTRAST_WHITE "Alto contraste claro" + IDS_LILAC "Lila" + IDS_MAPLE "Arce" + IDS_MARINE "Marino" + IDS_PLUM "Ciruela" + IDS_PUMPKIN "Calabaza" + IDS_RAIN "Días de lluvia" + IDS_RWB "Red, White, and Blue" + IDS_CLASSIC "ReactOS clásico" + IDS_STANDARD "ReactOS estándar" + IDS_ROSE "Rosa" + IDS_SAND "Arenisca" //Desert + IDS_SLATE "Pizarra" + IDS_SKY "Cielo" + IDS_STORM "Tormenta" + IDS_TEAL "Verde turquesa" + IDS_WHEAT "Trigo" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "Normal" + IDS_SIZE_LARGE "Large" + IDS_SIZE_XLARGE "Extra Large" +END diff --git a/dll/win32/themeui/lang/it-IT.rc b/dll/win32/themeui/lang/it-IT.rc new file mode 100644 index 0000000000..60fc095c59 --- /dev/null +++ b/dll/win32/themeui/lang/it-IT.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_BRICK "Rosso mattone" + IDS_EGGPLANT "Melanzana" + IDS_GOLIVE "Verde Oliva" //Spruce + IDS_HCONTRAST_1 "Contrasto elevato 1" + IDS_HCONTRAST_2 "Contrasto elevato 2" + IDS_HCONTRAST_BLACK "Nero a contrasto elevato" + IDS_HCONTRAST_WHITE "Bianco a contrasto elevato" + IDS_LILAC "Lilla" + IDS_MAPLE "Giallo cromo chiaro" + IDS_MARINE "Verde mare" + IDS_PLUM "Prugna" + IDS_PUMPKIN "Giallo cromo scuro" + IDS_RAIN "Grigio antracite" + IDS_RWB "Red, White, and Blue" + IDS_CLASSIC "ReactOS classico" + IDS_STANDARD "ReactOS Standard" + IDS_ROSE "Rosa" + IDS_SAND "Sabbia" //Desert + IDS_SLATE "Lavagna" + IDS_SKY "Sky" + IDS_STORM "Tempesta" + IDS_TEAL "Verde acqua" + IDS_WHEAT "Tabacco" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "Normal" + IDS_SIZE_LARGE "Large" + IDS_SIZE_XLARGE "Extra Large" +END diff --git a/dll/win32/themeui/lang/pl-PL.rc b/dll/win32/themeui/lang/pl-PL.rc new file mode 100644 index 0000000000..fec6e79ba0 --- /dev/null +++ b/dll/win32/themeui/lang/pl-PL.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_BRICK "Cegła" + IDS_EGGPLANT "Bakłażan" + IDS_GOLIVE "Zielona Oliwka" //Spruce + IDS_HCONTRAST_1 "Duży kontrast nr 1" + IDS_HCONTRAST_2 "Duży kontrast nr 2" + IDS_HCONTRAST_BLACK "Czerń o dużym kontraście" + IDS_HCONTRAST_WHITE "Biel o dużym kontraście" + IDS_LILAC "Lilak" + IDS_MAPLE "Klon" + IDS_MARINE "Morski" + IDS_PLUM "Śliwkowy" + IDS_PUMPKIN "Dynia" + IDS_RAIN "Deszczowy Dzień" + IDS_RWB "Red, White, and Blue" + IDS_CLASSIC "Klasyczny ReactOS" + IDS_STANDARD "Podstawowy ReactOS" + IDS_ROSE "Róża" + IDS_SAND "Piasek" //Desert + IDS_SLATE "Łupek" + IDS_SKY "Niebo" + IDS_STORM "Burza" + IDS_TEAL "Morska Zieleń" + IDS_WHEAT "Pszenica" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "Normal" + IDS_SIZE_LARGE "Large" + IDS_SIZE_XLARGE "Extra Large" +END diff --git a/dll/win32/themeui/lang/ro-RO.rc b/dll/win32/themeui/lang/ro-RO.rc new file mode 100644 index 0000000000..3e30753d7a --- /dev/null +++ b/dll/win32/themeui/lang/ro-RO.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_BRICK "Cărămiziu" + IDS_EGGPLANT "Vânăt" + IDS_GOLIVE "Verde măsliniu" //Spruce + IDS_HCONTRAST_1 "Contrast sporit 1" + IDS_HCONTRAST_2 "Contrast sporit 2" + IDS_HCONTRAST_BLACK "Contrast sporit Negru" + IDS_HCONTRAST_WHITE "Contrast sporit Alb" + IDS_LILAC "Liliachiu" + IDS_MAPLE "Arțar" + IDS_MARINE "Marin" + IDS_PLUM "Prună" + IDS_PUMPKIN "Dovleac" + IDS_RAIN "Zi ploioasă" + IDS_RWB "Red, White, and Blue" + IDS_CLASSIC "ReactOS Clasic" + IDS_STANDARD "ReactOS Standard" + IDS_ROSE "Trandafiriu" + IDS_SAND "Nisip" //Desert + IDS_SLATE "Ardezie" + IDS_SKY "Cer" + IDS_STORM "Furtună" + IDS_TEAL "Turcoaz" + IDS_WHEAT "Grâu" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "Normal" + IDS_SIZE_LARGE "Large" + IDS_SIZE_XLARGE "Extra Large" +END diff --git a/dll/win32/themeui/lang/ru-RU.rc b/dll/win32/themeui/lang/ru-RU.rc new file mode 100644 index 0000000000..720d8741a5 --- /dev/null +++ b/dll/win32/themeui/lang/ru-RU.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_BRICK "Кирпич" + IDS_EGGPLANT "Баклажан" + IDS_GOLIVE "Зелёная оливка" //Spruce + IDS_HCONTRAST_1 "Высокая контрастность–1" + IDS_HCONTRAST_2 "Высокая контрастность–2" + IDS_HCONTRAST_BLACK "Контрастная чёрная" + IDS_HCONTRAST_WHITE "Контрастная белая" + IDS_LILAC "Сирень" + IDS_MAPLE "Клён" + IDS_MARINE "Морская" + IDS_PLUM "Слива" + IDS_PUMPKIN "Тыква" + IDS_RAIN "Дождливый день" + IDS_RWB "Red, White, and Blue" + IDS_CLASSIC "ReactOS классическая" + IDS_STANDARD "ReactOS стандартная" + IDS_ROSE "Роза" + IDS_SAND "Песок" //Desert + IDS_SLATE "Шифер" + IDS_SKY "Небо" + IDS_STORM "Шторм" + IDS_TEAL "Зеленовато-голубая" + IDS_WHEAT "Пшеница" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "Normal" + IDS_SIZE_LARGE "Large" + IDS_SIZE_XLARGE "Extra Large" +END diff --git a/dll/win32/themeui/lang/tr-TR.rc b/dll/win32/themeui/lang/tr-TR.rc new file mode 100644 index 0000000000..4c2747d8c5 --- /dev/null +++ b/dll/win32/themeui/lang/tr-TR.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_BRICK "Tuğla" + IDS_EGGPLANT "Patlıcan" + IDS_GOLIVE "Yeşil Zeytin" //Spruce + IDS_HCONTRAST_1 "Yüksek Karşıtlık 1" + IDS_HCONTRAST_2 "Yüksek Karşıtlık 2" + IDS_HCONTRAST_BLACK "Yüksek Karşıtlık Kara" + IDS_HCONTRAST_WHITE "Yüksek Karşıtlık Ak" + IDS_LILAC "Leylak" + IDS_MAPLE "Akçaağaç" + IDS_MARINE "Deniz" + IDS_PLUM "Erik" + IDS_PUMPKIN "Kabak" + IDS_RAIN "Yağmurlu Gün" + IDS_RWB "Red, White, and Blue" + IDS_CLASSIC "ReactOS Kökleşik" + IDS_STANDARD "ReactOS Ölçünlü" + IDS_ROSE "Gül" + IDS_SAND "Kum" //Desert + IDS_SLATE "Kayağan Taş" + IDS_SKY "Gökyüzü" + IDS_STORM "Fırtına" + IDS_TEAL "Çamurcun" + IDS_WHEAT "Buğday" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "Normal" + IDS_SIZE_LARGE "Large" + IDS_SIZE_XLARGE "Extra Large" +END diff --git a/dll/win32/themeui/lang/uk-UA.rc b/dll/win32/themeui/lang/uk-UA.rc new file mode 100644 index 0000000000..ba3175b7ac --- /dev/null +++ b/dll/win32/themeui/lang/uk-UA.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_BRICK "Цегла" + IDS_EGGPLANT "Баклажан" + IDS_GOLIVE "Зелена Оливка" //Spruce + IDS_HCONTRAST_1 "Висока Контрастність 1" + IDS_HCONTRAST_2 "Висока Контрастність 2" + IDS_HCONTRAST_BLACK "Контрастна Чорна" + IDS_HCONTRAST_WHITE "Контрастна Біла" + IDS_LILAC "Бузок" + IDS_MAPLE "Клен" + IDS_MARINE "Морська" + IDS_PLUM "Слива" + IDS_PUMPKIN "Гарбуз" + IDS_RAIN "Дощовий День" + IDS_RWB "Red, White, and Blue" + IDS_CLASSIC "ReactOS Класична" + IDS_STANDARD "ReactOS Стандартна" + IDS_ROSE "Троянда" + IDS_SAND "Пісок" //Desert + IDS_SLATE "Шифер" + IDS_SKY "Небо" + IDS_STORM "Шторм" + IDS_TEAL "Зеленовато-блакитна" + IDS_WHEAT "Пшениця" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "Normal" + IDS_SIZE_LARGE "Large" + IDS_SIZE_XLARGE "Extra Large" +END diff --git a/dll/win32/themeui/lang/zh-CN.rc b/dll/win32/themeui/lang/zh-CN.rc new file mode 100644 index 0000000000..d792d432ac --- /dev/null +++ b/dll/win32/themeui/lang/zh-CN.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_BRICK "红砖色" + IDS_EGGPLANT "茄子" + IDS_GOLIVE "绿色橄榄" //Spruce + IDS_HCONTRAST_1 "高对比度 1" + IDS_HCONTRAST_2 "高对比度 2" + IDS_HCONTRAST_BLACK "高对比度（黑）" + IDS_HCONTRAST_WHITE "高对比度（白）" + IDS_LILAC "丁香" + IDS_MAPLE "枫树" + IDS_MARINE "海洋" + IDS_PLUM "梅花" + IDS_PUMPKIN "南瓜" + IDS_RAIN "雨天" + IDS_RWB "Red, White, and Blue" + IDS_CLASSIC "ReactOS 经典" + IDS_STANDARD "ReactOS 标准" + IDS_ROSE "玫瑰" + IDS_SAND "沙" //Desert + IDS_SLATE "石板" + IDS_SKY "天空" + IDS_STORM "风暴" + IDS_TEAL "青色" + IDS_WHEAT "麦色" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "Normal" + IDS_SIZE_LARGE "Large" + IDS_SIZE_XLARGE "Extra Large" +END diff --git a/dll/win32/themeui/resource.h b/dll/win32/themeui/resource.h new file mode 100644 index 0000000000..89955822f0 --- /dev/null +++ b/dll/win32/themeui/resource.h @@ -0,0 +1,32 @@ +#ifndef RESOURCE_H +#define RESOURCE_H + +#define IDS_BRICK 850 +#define IDS_SAND 851 +#define IDS_EGGPLANT 852 +#define IDS_HCONTRAST_1 853 +#define IDS_HCONTRAST_2 856 +#define IDS_HCONTRAST_BLACK 859 +#define IDS_HCONTRAST_WHITE 862 +#define IDS_LILAC 865 +#define IDS_MAPLE 867 +#define IDS_MARINE 868 +#define IDS_PLUM 869 +#define IDS_PUMPKIN 870 +#define IDS_WHEAT 871 +#define IDS_RAIN 872 +#define IDS_RWB 873 +#define IDS_ROSE 874 +#define IDS_SLATE 876 +#define IDS_GOLIVE 877 +#define IDS_STORM 878 +#define IDS_TEAL 879 +#define IDS_CLASSIC 880 +#define IDS_STANDARD 883 +#define IDS_SKY 884 + +#define IDS_SIZE_NORMAL 2019 +#define IDS_SIZE_LARGE 2020 +#define IDS_SIZE_XLARGE 2021 + +#endif /* RESOURCE_H */ diff --git a/dll/win32/themeui/themeui.rc b/dll/win32/themeui/themeui.rc index fac5b36ed6..44e2410386 100644 --- a/dll/win32/themeui/themeui.rc +++ b/dll/win32/themeui/themeui.rc @@ -1,8 +1,48 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "Theme UI Library\0" -#define REACTOS_STR_INTERNAL_NAME "themeui\0" -#define REACTOS_STR_ORIGINAL_FILENAME "themeui.dll\0" +#include <windef.h> +#include "resource.h" +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Theme UI Library" +#define REACTOS_STR_INTERNAL_NAME "themeui" +#define REACTOS_STR_ORIGINAL_FILENAME "themeui.dll" #include <reactos/version.rc> +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + 1 ICON "themeui.ico" + +/* UTF-8 */ +#pragma code_page(65001) +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif

5 years, 9 months

[reactos] 01/01: [NTOS] Addendum to 03873aee: check that the computed size of the OEM-converted string is less than MAXUSHORT.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2bad34b9b17e8ac5a4fc… commit b2bad34b9b17e8ac5a4fcbfc977357cd4041c69c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 21 00:33:56 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 21 00:34:56 2018 +0100 [NTOS] Addendum to 03873aee: check that the computed size of the OEM-converted string is less than MAXUSHORT. --- ntoskrnl/inbv/inbv.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 75825d0aa2..9228569298 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -778,6 +778,7 @@ NtDisplayString(IN PUNICODE_STRING DisplayString) NTSTATUS Status; UNICODE_STRING CapturedString; OEM_STRING OemString; + ULONG OemLength; KPROCESSOR_MODE PreviousMode; PAGED_CODE(); @@ -806,11 +807,14 @@ NtDisplayString(IN PUNICODE_STRING DisplayString) * We cannot perform the allocation using RtlUnicodeStringToOemString() * since its allocator uses PagedPool. */ - RtlInitEmptyAnsiString((PANSI_STRING)&OemString, NULL, - RtlUnicodeStringToOemSize(&CapturedString)); - OemString.Buffer = ExAllocatePoolWithTag(NonPagedPool, - OemString.MaximumLength, - TAG_OSTR); + OemLength = RtlUnicodeStringToOemSize(&CapturedString); + if (OemLength > MAXUSHORT) + { + Status = STATUS_BUFFER_OVERFLOW; + goto Quit; + } + RtlInitEmptyAnsiString((PANSI_STRING)&OemString, NULL, (USHORT)OemLength); + OemString.Buffer = ExAllocatePoolWithTag(NonPagedPool, OemLength, TAG_OSTR); if (OemString.Buffer == NULL) { Status = STATUS_NO_MEMORY;

5 years, 9 months

[reactos] 01/01: [LOG2LINES] Partially sync output format from command line input (#1109)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c77cd9050223de3867c8… commit 5c77cd9050223de3867c8eec83e8832b165572db Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Dec 21 00:27:01 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 21 00:27:01 2018 +0100 [LOG2LINES] Partially sync output format from command line input (#1109) --- sdk/tools/log2lines/log2lines.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk/tools/log2lines/log2lines.c b/sdk/tools/log2lines/log2lines.c index cbe9482f49..7213781c15 100644 --- a/sdk/tools/log2lines/log2lines.c +++ b/sdk/tools/log2lines/log2lines.c @@ -644,8 +644,12 @@ main(int argc, const char **argv) if (exefile) { l2l_dbg(2, "translating %s %s\n", exefile, offset); - translate_file(exefile, my_atoi(offset), Line); - printf("%s\n", Line); + printf("<%s:%s", exefile, offset); + if (!translate_file(exefile, my_atoi(offset), Line)) + { + printf(" (%s)", Line); + } + printf(">\n"); report(conOut); } else

5 years, 9 months

← Newer
1
...
9
10
11
12
13
14
15
...
33
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 December 2018