Ros-diffs May 2018

ros-diffs@reactos.org

23 participants
218 discussions

01/01: [DEVMGR] Fix a Clang-Cl warning about DriverInfoDetailData.SectionName

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=627f3dc7256e24c13a905… commit 627f3dc7256e24c13a905087dda52c8eb8a3c33f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri May 4 23:04:14 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 7 14:00:41 2018 +0200 [DEVMGR] Fix a Clang-Cl warning about DriverInfoDetailData.SectionName "warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]" CORE-14306 --- dll/win32/devmgr/properties/misc.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/devmgr/properties/misc.cpp b/dll/win32/devmgr/properties/misc.cpp index 5dbe6a4ea0..50ec12f94e 100644 --- a/dll/win32/devmgr/properties/misc.cpp +++ b/dll/win32/devmgr/properties/misc.cpp @@ -1078,8 +1078,7 @@ FindCurrentDriver(IN HDEVINFO DeviceInfoSet, ERR("SetupDiGetDriverInfoDetail() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } - if (!_wcsicmp(DriverInfoDetailData.SectionName, - InfSection) != 0) + if (_wcsicmp(DriverInfoDetailData.SectionName, InfSection) == 0) { /* We have found the right driver */ Ret = TRUE;

6 years, 4 months

01/01: [IDL][NETAPI32][SRVSVC] Hack around another midl/rpcrt4 bug

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12bdbe5710f617a50c5a9… commit 12bdbe5710f617a50c5a9f65b0ff9fcf0243a8a1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 6 16:49:24 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 6 16:49:24 2018 +0200 [IDL][NETAPI32][SRVSVC] Hack around another midl/rpcrt4 bug NETAPI32: Get rid of the old WINE NetServerGetInfo and replace it by a proper call to NetrServerGetInfo. SRVSVC: Implement parts of NetrServerGetInfo. srvsvc.idl: Hack around a bug in midl or rpcrt4. They are not able to handle a pointer to a union of pointers to structs. A pointer to a union of structs works a advertised. --- base/services/srvsvc/rpcserver.c | 87 ++++++++++++++++++++++++++++++++++++-- dll/win32/netapi32/netapi32.c | 63 --------------------------- dll/win32/netapi32/srvsvc.c | 4 +- sdk/include/reactos/idl/srvsvc.idl | 59 +++++++++++++++++++++++++- 4 files changed, 143 insertions(+), 70 deletions(-) diff --git a/base/services/srvsvc/rpcserver.c b/base/services/srvsvc/rpcserver.c index e47eafb2c0..d1d9f3dc3d 100644 --- a/base/services/srvsvc/rpcserver.c +++ b/base/services/srvsvc/rpcserver.c @@ -348,10 +348,91 @@ __stdcall NetrServerGetInfo( SRVSVC_HANDLE ServerName, DWORD Level, - LPSERVER_INFO InfoStruct) + LPSERVER_INFO *InfoStruct) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD dwComputerNameLength, dwSize; + PSERVER_INFO pServerInfo = NULL; + OSVERSIONINFOW VersionInfo; + + TRACE("NetrServerGetInfo(%p %lu %p)\n", + ServerName, Level, InfoStruct); + + dwComputerNameLength = MAX_COMPUTERNAME_LENGTH + 1; + GetComputerNameW(szComputerName, &dwComputerNameLength); + dwComputerNameLength++; /* include NULL terminator */ + + VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); + GetVersionExW(&VersionInfo); + + switch (Level) + { + case 100: + dwSize = sizeof(SERVER_INFO_100) + + dwComputerNameLength * sizeof(WCHAR); + pServerInfo = midl_user_allocate(dwSize); + if (pServerInfo == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + pServerInfo->ServerInfo100.sv100_platform_id = PLATFORM_ID_NT; + pServerInfo->ServerInfo100.sv100_name = (LPWSTR)((ULONG_PTR)pServerInfo + sizeof(SERVER_INFO_100)); + wcscpy(pServerInfo->ServerInfo100.sv100_name, szComputerName); + + *InfoStruct = pServerInfo; + break; + + case 101: + dwSize = sizeof(SERVER_INFO_101) + + dwComputerNameLength * sizeof(WCHAR); + pServerInfo = midl_user_allocate(dwSize); + if (pServerInfo == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + pServerInfo->ServerInfo101.sv101_platform_id = PLATFORM_ID_NT; + pServerInfo->ServerInfo101.sv101_name = (LPWSTR)((ULONG_PTR)pServerInfo + sizeof(SERVER_INFO_101)); + wcscpy(pServerInfo->ServerInfo101.sv101_name, szComputerName); + + pServerInfo->ServerInfo101.sv101_version_major = VersionInfo.dwMajorVersion; + pServerInfo->ServerInfo101.sv101_version_minor = VersionInfo.dwMinorVersion; + pServerInfo->ServerInfo101.sv101_type = SV_TYPE_NT; /* FIXME */ + pServerInfo->ServerInfo101.sv101_comment = NULL; /* FIXME */ + + *InfoStruct = pServerInfo; + break; + + case 102: + dwSize = sizeof(SERVER_INFO_102) + + dwComputerNameLength * sizeof(WCHAR); + pServerInfo = midl_user_allocate(dwSize); + if (pServerInfo == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + pServerInfo->ServerInfo102.sv102_platform_id = PLATFORM_ID_NT; + pServerInfo->ServerInfo102.sv102_name = (LPWSTR)((ULONG_PTR)pServerInfo + sizeof(SERVER_INFO_102)); + wcscpy(pServerInfo->ServerInfo102.sv102_name, szComputerName); + + pServerInfo->ServerInfo102.sv102_version_major = VersionInfo.dwMajorVersion; + pServerInfo->ServerInfo102.sv102_version_minor = VersionInfo.dwMinorVersion; + pServerInfo->ServerInfo102.sv102_type = SV_TYPE_NT; + pServerInfo->ServerInfo102.sv102_comment = NULL; /* FIXME */ + + pServerInfo->ServerInfo102.sv102_users = 0; /* FIXME */ + pServerInfo->ServerInfo102.sv102_disc = 0; /* FIXME */ + pServerInfo->ServerInfo102.sv102_hidden = SV_VISIBLE; /* FIXME */ + pServerInfo->ServerInfo102.sv102_announce = 0; /* FIXME */ + pServerInfo->ServerInfo102.sv102_anndelta = 0; /* FIXME */ + pServerInfo->ServerInfo102.sv102_licenses = 0; /* FIXME */ + pServerInfo->ServerInfo102.sv102_userpath = NULL; /* FIXME */ + + *InfoStruct = pServerInfo; + break; + + default: + FIXME("level %d unimplemented\n", Level); + return ERROR_INVALID_LEVEL; + } + + return NERR_Success; } diff --git a/dll/win32/netapi32/netapi32.c b/dll/win32/netapi32/netapi32.c index a2ffcefd52..5775aa46bd 100644 --- a/dll/win32/netapi32/netapi32.c +++ b/dll/win32/netapi32/netapi32.c @@ -18,8 +18,6 @@ #include "netapi32.h" -#include <lmserver.h> - WINE_DEFAULT_DEBUG_CHANNEL(netapi32); BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -40,64 +38,3 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } - -/************************************************************ - * NetServerGetInfo (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bufptr) -{ - NET_API_STATUS ret; - - TRACE("%s %d %p\n", debugstr_w( servername ), level, bufptr ); - if (servername) - { - if (!NETAPI_IsLocalComputer(servername)) - { - FIXME("remote computers not supported\n"); - return ERROR_INVALID_LEVEL; - } - } - if (!bufptr) return ERROR_INVALID_PARAMETER; - - switch (level) - { - case 100: - case 101: - { - DWORD computerNameLen, size; - WCHAR computerName[MAX_COMPUTERNAME_LENGTH + 1]; - - computerNameLen = MAX_COMPUTERNAME_LENGTH + 1; - GetComputerNameW(computerName, &computerNameLen); - computerNameLen++; /* include NULL terminator */ - - size = sizeof(SERVER_INFO_101) + computerNameLen * sizeof(WCHAR); - ret = NetApiBufferAllocate(size, (LPVOID *)bufptr); - if (ret == NERR_Success) - { - /* INFO_100 structure is a subset of INFO_101 */ - PSERVER_INFO_101 info = (PSERVER_INFO_101)*bufptr; - OSVERSIONINFOW verInfo; - - info->sv101_platform_id = PLATFORM_ID_NT; - info->sv101_name = (LMSTR)(*bufptr + sizeof(SERVER_INFO_101)); - memcpy(info->sv101_name, computerName, - computerNameLen * sizeof(WCHAR)); - verInfo.dwOSVersionInfoSize = sizeof(verInfo); - GetVersionExW(&verInfo); - info->sv101_version_major = verInfo.dwMajorVersion; - info->sv101_version_minor = verInfo.dwMinorVersion; - /* Use generic type as no wine equivalent of DC / Server */ - info->sv101_type = SV_TYPE_NT; - info->sv101_comment = NULL; - } - break; - } - - default: - FIXME("level %d unimplemented\n", level); - ret = ERROR_INVALID_LEVEL; - } - return ret; -} - diff --git a/dll/win32/netapi32/srvsvc.c b/dll/win32/netapi32/srvsvc.c index 139bcfc6f7..7103e4aa58 100644 --- a/dll/win32/netapi32/srvsvc.c +++ b/dll/win32/netapi32/srvsvc.c @@ -364,7 +364,6 @@ NetServerDiskEnum( } -#if 0 NET_API_STATUS WINAPI NetServerGetInfo( @@ -383,7 +382,7 @@ NetServerGetInfo( { status = NetrServerGetInfo(servername, level, - (LPSERVER_INFO)bufptr); + (LPSERVER_INFO *)bufptr); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -393,7 +392,6 @@ NetServerGetInfo( return status; } -#endif NET_API_STATUS diff --git a/sdk/include/reactos/idl/srvsvc.idl b/sdk/include/reactos/idl/srvsvc.idl index f8d1d6c54b..eea19b18ea 100644 --- a/sdk/include/reactos/idl/srvsvc.idl +++ b/sdk/include/reactos/idl/srvsvc.idl @@ -734,6 +734,7 @@ typedef struct _SERVER_INFO_1556 } SERVER_INFO_1556, *PSERVER_INFO_1556, *LPSERVER_INFO_1556; cpp_quote("#endif") +/* typedef [switch_type(unsigned long)] union _SERVER_INFO { [case(100)] LPSERVER_INFO_100 ServerInfo100; @@ -788,6 +789,61 @@ typedef [switch_type(unsigned long)] union _SERVER_INFO [case(1555)] LPSERVER_INFO_1555 ServerInfo1555; [case(1556)] LPSERVER_INFO_1556 ServerInfo1556; } SERVER_INFO, *PSERVER_INFO, *LPSERVER_INFO; +*/ +typedef [switch_type(unsigned long)] union _SERVER_INFO +{ + [case(100)] SERVER_INFO_100 ServerInfo100; + [case(101)] SERVER_INFO_101 ServerInfo101; + [case(102)] SERVER_INFO_102 ServerInfo102; + [case(103)] SERVER_INFO_103 ServerInfo103; + [case(502)] SERVER_INFO_502 ServerInfo502; + [case(503)] SERVER_INFO_503 ServerInfo503; + [case(599)] SERVER_INFO_599 ServerInfo599; + [case(1005)] SERVER_INFO_1005 ServerInfo1005; + [case(1107)] SERVER_INFO_1107 ServerInfo1107; + [case(1010)] SERVER_INFO_1010 ServerInfo1010; + [case(1016)] SERVER_INFO_1016 ServerInfo1016; + [case(1017)] SERVER_INFO_1017 ServerInfo1017; + [case(1018)] SERVER_INFO_1018 ServerInfo1018; + [case(1501)] SERVER_INFO_1501 ServerInfo1501; + [case(1502)] SERVER_INFO_1502 ServerInfo1502; + [case(1503)] SERVER_INFO_1503 ServerInfo1503; + [case(1506)] SERVER_INFO_1506 ServerInfo1506; + [case(1510)] SERVER_INFO_1510 ServerInfo1510; + [case(1511)] SERVER_INFO_1511 ServerInfo1511; + [case(1512)] SERVER_INFO_1512 ServerInfo1512; + [case(1513)] SERVER_INFO_1513 ServerInfo1513; + [case(1514)] SERVER_INFO_1514 ServerInfo1514; + [case(1515)] SERVER_INFO_1515 ServerInfo1515; + [case(1516)] SERVER_INFO_1516 ServerInfo1516; + [case(1518)] SERVER_INFO_1518 ServerInfo1518; + [case(1523)] SERVER_INFO_1523 ServerInfo1523; + [case(1528)] SERVER_INFO_1528 ServerInfo1528; + [case(1529)] SERVER_INFO_1529 ServerInfo1529; + [case(1530)] SERVER_INFO_1530 ServerInfo1530; + [case(1533)] SERVER_INFO_1533 ServerInfo1533; + [case(1534)] SERVER_INFO_1534 ServerInfo1534; + [case(1535)] SERVER_INFO_1535 ServerInfo1535; + [case(1536)] SERVER_INFO_1536 ServerInfo1536; + [case(1538)] SERVER_INFO_1538 ServerInfo1538; + [case(1539)] SERVER_INFO_1539 ServerInfo1539; + [case(1540)] SERVER_INFO_1540 ServerInfo1540; + [case(1541)] SERVER_INFO_1541 ServerInfo1541; + [case(1542)] SERVER_INFO_1542 ServerInfo1542; + [case(1543)] SERVER_INFO_1543 ServerInfo1543; + [case(1544)] SERVER_INFO_1544 ServerInfo1544; + [case(1545)] SERVER_INFO_1545 ServerInfo1545; + [case(1546)] SERVER_INFO_1546 ServerInfo1546; + [case(1547)] SERVER_INFO_1547 ServerInfo1547; + [case(1548)] SERVER_INFO_1548 ServerInfo1548; + [case(1549)] SERVER_INFO_1549 ServerInfo1549; + [case(1550)] SERVER_INFO_1550 ServerInfo1550; + [case(1552)] SERVER_INFO_1552 ServerInfo1552; + [case(1553)] SERVER_INFO_1553 ServerInfo1553; + [case(1554)] SERVER_INFO_1554 ServerInfo1554; + [case(1555)] SERVER_INFO_1555 ServerInfo1555; + [case(1556)] SERVER_INFO_1556 ServerInfo1556; +} SERVER_INFO, *PSERVER_INFO, *LPSERVER_INFO; typedef struct _DISK_INFO { @@ -1162,7 +1218,8 @@ interface srvsvc NetrServerGetInfo( [in, string, unique] SRVSVC_HANDLE ServerName, [in] DWORD Level, - [out, switch_is(Level)] LPSERVER_INFO InfoStruct); + [out, switch_is(Level)] LPSERVER_INFO *InfoStruct); +// [out, switch_is(Level)] LPSERVER_INFO InfoStruct); NET_API_STATUS __stdcall

6 years, 4 months

01/01: [IPHLPAPI_APITEST] Avoid crash on ROS and failure on Windows. CORE-14411

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93edd2a1855be5c3fde4d… commit 93edd2a1855be5c3fde4dc2a985a3bbd6ce6a56c Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun May 6 08:24:26 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun May 6 08:36:19 2018 +0200 [IPHLPAPI_APITEST] Avoid crash on ROS and failure on Windows. CORE-14411 - Make the reply buffer for IcmpSendEcho large enough to hold the reply, even when testing a smaller size. This avoids a buffer overflow with ROS's broken implementation. - Avoid unnecessary initialization. - Fix IcmpSendEcho return value check to succeed on Win2003. - Don't free a string literal in the GetInterfaceName test. --- modules/rostests/apitests/iphlpapi/GetInterfaceName.c | 1 - modules/rostests/apitests/iphlpapi/icmp.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/rostests/apitests/iphlpapi/GetInterfaceName.c b/modules/rostests/apitests/iphlpapi/GetInterfaceName.c index f6e3321cee..76078cc39f 100644 --- a/modules/rostests/apitests/iphlpapi/GetInterfaceName.c +++ b/modules/rostests/apitests/iphlpapi/GetInterfaceName.c @@ -361,7 +361,6 @@ test_GetInterfaceName(VOID) } ApiReturn = RtlGUIDFromString(&GuidString, &AdapterGUID); - RtlFreeUnicodeString(&GuidString); if (ApiReturn != 0) { skip("RtlGUIDFromString failed. Can't proceed\n"); diff --git a/modules/rostests/apitests/iphlpapi/icmp.c b/modules/rostests/apitests/iphlpapi/icmp.c index 0d853ffa57..c635c225b3 100644 --- a/modules/rostests/apitests/iphlpapi/icmp.c +++ b/modules/rostests/apitests/iphlpapi/icmp.c @@ -90,7 +90,7 @@ test_IcmpSendEcho(void) unsigned long ipaddr = INADDR_NONE; DWORD bRet = 0, error = 0; char SendData[32] = "Data Buffer"; - PVOID ReplyBuffer = NULL; + PVOID ReplyBuffer; DWORD ReplySize = 0; SetLastError(0xDEADBEEF); @@ -102,27 +102,27 @@ test_IcmpSendEcho(void) } ipaddr = 0x08080808; // 8.8.8.8 + ReplyBuffer = malloc(sizeof(ICMP_ECHO_REPLY) + sizeof(SendData)); ReplySize = sizeof(ICMP_ECHO_REPLY); - ReplyBuffer = malloc(ReplySize); SetLastError(0xDEADBEEF); bRet = IcmpSendEcho(hIcmp, ipaddr, SendData, sizeof(SendData), NULL, ReplyBuffer, ReplySize, 5000); ok(!bRet, "IcmpSendEcho succeeded unexpectedly\n"); error = GetLastError(); - ok(error == IP_GENERAL_FAILURE, "IcmpSendEcho returned unexpected error: %lu\n", error); - free(ReplyBuffer); + ok(error == IP_BUF_TOO_SMALL /* Win2003 */ || + error == IP_GENERAL_FAILURE /* Win10 */, + "IcmpSendEcho returned unexpected error: %lu\n", error); ReplySize = sizeof(ICMP_ECHO_REPLY) + sizeof(SendData); - ReplyBuffer = malloc(ReplySize); SetLastError(0xDEADBEEF); bRet = IcmpSendEcho(hIcmp, ipaddr, SendData, sizeof(SendData), NULL, ReplyBuffer, ReplySize, 5000); ok(bRet, "IcmpSendEcho failed unexpectedly: %lu\n", GetLastError()); - free(ReplyBuffer); + free(ReplyBuffer); IcmpCloseHandle(hIcmp); }

6 years, 4 months

01/01: [BOOTDATA][SHELL32] Add some recognized file extensions (.db, .efi, .nls, .ocx, .tlb, .nt), and update some reported MIME types. CORE-11308

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34b0f3e4f8e8d3e3061dd… commit 34b0f3e4f8e8d3e3061dd053c517f3daf07a91cd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat May 5 22:20:21 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat May 5 22:20:21 2018 +0200 [BOOTDATA][SHELL32] Add some recognized file extensions (.db, .efi, .nls, .ocx, .tlb, .nt), and update some reported MIME types. CORE-11308 --- boot/bootdata/hivecls.inf | 68 ++++++++++++++++++++++++++++++++++++----- dll/win32/shell32/lang/bg-BG.rc | 7 +++++ dll/win32/shell32/lang/ca-ES.rc | 7 +++++ dll/win32/shell32/lang/cs-CZ.rc | 9 +++++- dll/win32/shell32/lang/da-DK.rc | 7 +++++ dll/win32/shell32/lang/de-DE.rc | 9 +++++- dll/win32/shell32/lang/el-GR.rc | 7 +++++ dll/win32/shell32/lang/en-GB.rc | 7 +++++ dll/win32/shell32/lang/en-US.rc | 7 +++++ dll/win32/shell32/lang/es-ES.rc | 7 +++++ dll/win32/shell32/lang/et-EE.rc | 7 +++++ dll/win32/shell32/lang/fi-FI.rc | 7 +++++ dll/win32/shell32/lang/fr-FR.rc | 13 ++++++-- dll/win32/shell32/lang/he-IL.rc | 9 +++++- dll/win32/shell32/lang/hu-HU.rc | 7 +++++ dll/win32/shell32/lang/it-IT.rc | 7 +++++ dll/win32/shell32/lang/ja-JP.rc | 7 +++++ dll/win32/shell32/lang/ko-KR.rc | 7 +++++ dll/win32/shell32/lang/nl-NL.rc | 7 +++++ dll/win32/shell32/lang/no-NO.rc | 7 +++++ dll/win32/shell32/lang/pl-PL.rc | 7 +++++ dll/win32/shell32/lang/pt-BR.rc | 7 +++++ dll/win32/shell32/lang/pt-PT.rc | 7 +++++ dll/win32/shell32/lang/ro-RO.rc | 7 +++++ dll/win32/shell32/lang/ru-RU.rc | 7 +++++ dll/win32/shell32/lang/sk-SK.rc | 7 +++++ dll/win32/shell32/lang/sl-SI.rc | 7 +++++ dll/win32/shell32/lang/sq-AL.rc | 7 +++++ dll/win32/shell32/lang/sv-SE.rc | 7 +++++ dll/win32/shell32/lang/tr-TR.rc | 7 +++++ dll/win32/shell32/lang/uk-UA.rc | 7 +++++ dll/win32/shell32/lang/zh-CN.rc | 9 +++++- dll/win32/shell32/lang/zh-TW.rc | 7 +++++ dll/win32/shell32/shresdef.h | 8 ++++- 34 files changed, 298 insertions(+), 16 deletions(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index f368d4e3c5..a424bfcc09 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -20,6 +20,7 @@ HKCR,"Folder\shell\explore\command","",0x00000000,"explorer.exe /e,""%1""" ; Clipboard Element HKCR,".clp","",0x00000000,"clpfile" +HKCR,".clp","Content Type",0x00000000,"application/x-msclip" HKCR,"clpfile","",0x00000000,"Clipboard Element" HKCR,"clpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\clipbrd.exe,-121" HKCR,"clpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\clipbrd.exe,1" @@ -78,6 +79,7 @@ HKCR,"cmdfile\shell\open\command","",0x00000000,"""%1"" %*" ; DOS Applications HKCR,".com","",0x00000000,"comfile" +HKCR,".com","Content Type",0x00000000,"application/x-msdos-program" HKCR,"comfile","",0x00000000,"DOS Application" HKCR,"comfile","EditFlags",0x00010001,0x00000010 HKCR,"comfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-203" @@ -100,8 +102,16 @@ HKCR,"curfile","",0x00000000,"Cursor" HKCR,"curfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-205" HKCR,"curfile\DefaultIcon","",0x00000000,"%1" +; Database File +HKCR,".db","",0x00000000,"dbfile" +HKCR,"dbfile","",0x00000000,"Database File" +HKCR,"dbfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-220" +HKCR,"dbfile","NoOpen",0x00000000,"" +HKCR,"dbfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + ; Dynamic Link Libraries HKCR,".dll","",0x00000000,"dllfile" +HKCR,".dll","Content Type",0x00000000,"application/x-msdownload" HKCR,"dllfile","",0x00000000,"Application Extension" HKCR,"dllfile","EditFlags",0x00010001,0x00000001 HKCR,"dllfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-206" @@ -114,8 +124,17 @@ HKCR,"drvfile","",0x00000000,"Device Driver" HKCR,"drvfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-207" HKCR,"drvfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" +; Extensible Firmware Interface Executable +HKCR,".efi","",0x00000000,"efifile" +HKCR,".efi","Content Type",0x00000000,"application/octet-stream" +HKCR,"efifile","",0x00000000,"Extensible Firmware Interface Executable" +HKCR,"efifile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-221" +HKCR,"efifile","NoOpen",0x00000000,"" +HKCR,"efifile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + ; Applications HKCR,".exe","",0x00000000,"exefile" +HKCR,".exe","Content Type",0x00000000,"application/x-msdownload" HKCR,"exefile","",0x00000000,"Application" HKCR,"exefile","EditFlags",0x00010001,0x00000010 HKCR,"exefile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-208" @@ -124,6 +143,29 @@ HKCR,"exefile\shell\open\command","",0x00000000,"""%1"" %*" HKCR,"exefile\shell\runas\command","",0x00020000,"""%1"" %*" HKCR,"exefile\shellex\DropHandler","",0x00020000,"{86C86720-42A0-1069-A2E8-08002B30309D}" +; National Language Support File +HKCR,".nls","",0x00000000,"nlsfile" +HKCR,"nlsfile","",0x00000000,"National Language Support File" +HKCR,"nlsfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-222" +HKCR,"nlsfile","NoOpen",0x00000000,"" +HKCR,"nlsfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + +; ActiveX Control +HKCR,".ocx","",0x00000000,"ocxfile" +HKCR,".ocx","PerceivedType",0x00000000,"system" +HKCR,"ocxfile","",0x00000000,"ActiveX Control" +HKCR,"ocxfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-223" +HKCR,"ocxfile","NoOpen",0x00000000,"" +HKCR,"ocxfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + +; Type Library +HKCR,".tlb","",0x00000000,"tlbfile" +HKCR,"tlbfile","",0x00000000,"Type Library" +HKCR,"tlbfile","AlwaysShowExt",0x00000000,"" +HKCR,"tlbfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-224" +HKCR,"tlbfile","NoOpen",0x00000000,"" +HKCR,"tlbfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + ; Fonts HKCR,".fon","",0x00000000,"fonfile" HKCR,"fonfile","",0x00000000,"Font File" @@ -358,7 +400,14 @@ HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msi HKCR,"Msi.Package\shell\Uninstall","",0x00000000,%UNINSTALL% HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec.exe /x ""%1""" -; Program Information File for NT VDM +; NT DOS32 Configuration File +HKCR,".nt","",0x00000000,"ntfile" +HKCR,"ntfile","",0x00000000,"NT DOS32 Configuration File" +HKCR,"ntfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-225" +HKCR,"ntfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" +HKCR,"ntfile\shell\open\command","",0x00000000,"notepad.exe ""%1""" + +; NT VDM Program Information File HKCR,".pif","",0x00000000,"piffile" HKCR,"piffile","",0x00000000,"NT VDM Program Information File" HKCR,"piffile","EditFlags",0x00010001,0x00000001 @@ -410,6 +459,7 @@ HKCR,"SHCmdFile\shellex\DropHandler","",0x00000000,"{86C86720-42A0-1069-A2E8-080 ; System Files HKCR,".sys","",0x00000000,"sysfile" +HKCR,".sys","PerceivedType",0x00000000,"system" HKCR,"sysfile","",0x00000000,"System File" HKCR,"sysfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-218" HKCR,"sysfile","NoOpen",0x00000000,"" @@ -433,13 +483,19 @@ HKCR,".url","",0x00000000,"InternetShortcut" ; Wave Sounds HKCR,".wav","",0x00000000,"SoundRec" +HKCR,".wav","Content Type",0x00000000,"audio/wav" +HKCR,".wav","PerceivedType",0x00000000,"audio" HKCR,"SoundRec","",0x00000000,%WAVFILE% HKCR,"SoundRec\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225" HKCR,"SoundRec\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" ; Midi Sounds HKCR,".mid","",0x00000000,"MIDFile" +HKCR,".mid","Content Type",0x00000000,"audio/mid" +HKCR,".mid","PerceivedType",0x00000000,"audio" HKCR,".midi","",0x00000000,"MIDFile" +HKCR,".midi","Content Type",0x00000000,"audio/mid" +HKCR,".midi","PerceivedType",0x00000000,"audio" HKCR,"MIDFile","",0x00000000,%MIDFILE% HKCR,"MIDFile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225" HKCR,"MIDFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" @@ -452,6 +508,8 @@ HKCR,"CDAFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.e ; Avi Files HKCR,".avi","",0x00000000,"AVIFile" +HKCR,".avi","Content Type",0x00000000,"video/avi" +HKCR,".avi","PerceivedType",0x00000000,"video" HKCR,"AVIFile","",0x00000000,%AVIFILE% HKCR,"AVIFile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-224" HKCR,"AVIFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" @@ -515,8 +573,6 @@ HKCR,".java","PerceivedType",0x00000000,"text" HKCR,".local","PerceivedType",0x00000000,"system" HKCR,".manifest","PerceivedType",0x00000000,"system" HKCR,".nvr","PerceivedType",0x00000000,"text" -HKCR,".ocx","",0x00000000,%OCXFILE% -HKCR,".ocx","PerceivedType",0x00000000,"system" HKCR,".php3","PerceivedType",0x00000000,"text" HKCR,".pl","PerceivedType",0x00000000,"text" HKCR,".plg","PerceivedType",0x00000000,"text" @@ -697,11 +753,10 @@ AVIFILE="Video Clip" ;; Misc file types without friendly (localized in .dll resources) name CSSFILE="Cascading Style Sheet" -OCXFILE="OLE Control Extension" SCFFILE="ReactOS Explorer Command" WMZFILE="Compressed Enhanced Metafile" -:: For .reg files, right-click menu +;; For .reg files, right-click menu MERGE="Merge" ;; For screensaver (*.scr) and MSI install package (*.msi) files, right-click menu @@ -739,7 +794,6 @@ MIDFILE="Secuencia MIDI" CDAFILE="Pista de audio CD" AVIFILE="Secuencia de vídeo" CSSFILE="Hoja de estilos en cascada" -OCXFILE="Extensión de control OLE" SCFFILE="Órden del explorador de ReactOS" WMZFILE="Metarchivo mejorado comprimido" @@ -795,7 +849,6 @@ WAVFILE="Dźwięk typu wave" MIDFILE="Sekwencja MIDI" CDAFILE="Ścieżka CD audio" AVIFILE="Arkusz stylu kaskadowego" -OCXFILE="Kontrolka OLE" SCFFILE="Polecenie Eksploratora ReactOS" WMZFILE="Skompresowany metaplik" MERGE="Scal" @@ -821,7 +874,6 @@ MIDFILE="Secvență audio MIDI" CDAFILE="Pistă de CD audio" AVIFILE="Fișier video" CSSFILE="Foaie de stiluri în cascadă" -OCXFILE="Extensie de control OLE" SCFFILE="Comandă de Explorator ReactOS" WMZFILE="Metafișier îmbunătățit comprimat" MERGE="Unește" diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 25cb7880b4..2cad795f64 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Папка" IDS_BAT_FILE "Пакетен файл на РеактОС" IDS_CMD_FILE "Писание за управление на РеактОС" IDS_COM_FILE "Приложение за ДОС" IDS_CPL_FILE "Предмет от крилото за управление" IDS_CUR_FILE "Показалец" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Разширение за приложения" IDS_DRV_FILE "Водача на устройство" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Приложение" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Шрифтов файл" IDS_TTF_FILE "Файл с шрифт TrueType" IDS_OTF_FILE "Файл с шрифт OpenType" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Настроечен файл" IDS_LNK_FILE "Препратка" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Системен файл" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 61f5dba7b5..c2cebd14f1 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Shortcut" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 447a2c1291..333e126917 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -802,15 +802,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Složka" IDS_BAT_FILE "ReactOS dávkový soubor" IDS_CMD_FILE "ReactOS příkazový skript" IDS_COM_FILE "DOS Aplikace" IDS_CPL_FILE "Položka Ovládacích panelů" IDS_CUR_FILE "Kurzor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Rozšíření aplikace" IDS_DRV_FILE "Ovladač zařízení" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Aplikace" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Soubor písma" IDS_TTF_FILE "Soubor písma TrueType" IDS_OTF_FILE "Soubor písma OpenType" @@ -818,12 +824,13 @@ BEGIN IDS_ICO_FILE "Ikona" IDS_INI_FILE "Konfigurační nastavení" IDS_LNK_FILE "Zástupce" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Spořič obrazovky" IDS_SYS_FILE "Systémový soubor" IDS_VXD_FILE "Virtuální ovladač zařízení" IDS_ANY_FILE "Soubor %s" - + IDS_OPEN_VERB "Otevřít" IDS_EXPLORE_VERB "Prozkoumat" IDS_RUNAS_VERB "Spustit jako..." diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index f6b90ad1cd..1a662274bc 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -802,15 +802,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -818,6 +824,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Shortcut" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 2c787e6565..1690c9ea3e 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -797,15 +797,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Anzeigen der Eigenschaften nicht möglich (Fehlercode: %lu)." IDS_CANTDISCONNECT "Trennen nicht möglich (Fehlercode: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Dateiordner" IDS_BAT_FILE "ReactOS-Stapelverarbeitungsdatei" IDS_CMD_FILE "ReactOS-Befehlsskript" IDS_COM_FILE "DOS Anwendung" IDS_CPL_FILE "Systemsteuerungselement" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Programmbibliothek" IDS_DRV_FILE "Gerätetreiber" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Anwendung" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Schriftartendatei" IDS_TTF_FILE "TrueType-Schriftartendatei" IDS_OTF_FILE "OpenType-Schriftartendatei" @@ -813,7 +819,8 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Konfigurationseinstellungen" IDS_LNK_FILE "Verknüpfung" - IDS_PIF_FILE "NTVDM Programminformationsdatei" + IDS_NT__FILE "NT DOS32 Configuration File" + IDS_PIF_FILE "NT VDM Programminformationsdatei" IDS_SCR_FILE "Bildschirmschoner" IDS_SYS_FILE "Systemdatei" IDS_VXD_FILE "Virtueller Gerätetreiber" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index d464e8e361..269d0d69af 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Shortcut" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index a0c796975c..33066d710a 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Shortcut" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 445518ca18..f09a32b2d6 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -797,15 +797,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -813,6 +819,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Shortcut" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index f51a243fce..a655661522 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -798,15 +798,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Directorio" IDS_BAT_FILE "Archivo por lotes de ReactOS" IDS_CMD_FILE "Script de comandos ReactOS" IDS_COM_FILE "Aplicación DOS" IDS_CPL_FILE "Elemento del Panel de control" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Biblioteca de aplicación" IDS_DRV_FILE "Controlador de dispositivo" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Aplicación" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Archivo de fuente" IDS_TTF_FILE "Archivo de fuente TrueType" IDS_OTF_FILE "Archivo de fuente OpenType" @@ -814,6 +820,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Archivo de configuración" IDS_LNK_FILE "Acceso directo" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Archivo del sistema" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 220ed59615..5dcac20d55 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -804,15 +804,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Ei saa atribuute näidata (Veateade: %lu)." IDS_CANTDISCONNECT "Ei saa lahti ühendada (Veateade: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Kaust" IDS_BAT_FILE "ReactOS Batch Fail" IDS_CMD_FILE "ReactOS Command Skript" IDS_COM_FILE "DOS Rakendus" IDS_CPL_FILE "Juhtpaneeli üksus" IDS_CUR_FILE "Kursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Rakenduse laiendus" IDS_DRV_FILE "Seadme draiver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Rakendus" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Fondi fail" IDS_TTF_FILE "TrueType Fondi fail" IDS_OTF_FILE "OpenType Fondi fail" @@ -820,6 +826,7 @@ BEGIN IDS_ICO_FILE "Ikoon" IDS_INI_FILE "Konfiguratsiooni seaded" IDS_LNK_FILE "Otsetee" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM programmi informatsiooni fail" IDS_SCR_FILE "Ekraanisäästja" IDS_SYS_FILE "Süsteemi fail" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 9e9288e981..bef4798082 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Shortcut" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index e660f7871d..ed0cbbdd6a 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Impossible de montrer les propriétés (code d'erreur : %lu)." IDS_CANTDISCONNECT "Impossible de déconnecter (code d'erreur : %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Dossier" IDS_BAT_FILE "Fichier Batch ReactOS" IDS_CMD_FILE "Script de commandes ReactOS" IDS_COM_FILE "Application DOS" IDS_CPL_FILE "Élément du panneau de contrôle" IDS_CUR_FILE "Curseur" + IDS_DB__FILE "Fichier de base de données" IDS_DLL_FILE "Extension d'application" IDS_DRV_FILE "Pilote de périphérique" + IDS_EFI_FILE "Exécutable Extensible Firmware Interface" IDS_EXE_FILE "Application" + IDS_NLS_FILE "Fichier de prise en charge linguistique" + IDS_OCX_FILE "Contrôle ActiveX" + IDS_TLB_FILE "Bibliothèque de types" IDS_FON_FILE "Fichier de police" IDS_TTF_FILE "Fichier de police TrueType" IDS_OTF_FILE "Fichier de police OpenType" @@ -812,11 +818,12 @@ BEGIN IDS_ICO_FILE "Icône" IDS_INI_FILE "Fichier de configuration" IDS_LNK_FILE "Raccourci" + IDS_NT__FILE "Fichier de configuration NT DOS32" IDS_PIF_FILE "Fichier d'information programme NT VDM" IDS_SCR_FILE "Écran de veille" IDS_SYS_FILE "Fichier système" IDS_VXD_FILE "Pilote de périphérique virtuel" - IDS_ANY_FILE "%s-file" + IDS_ANY_FILE "Fichier %s" IDS_OPEN_VERB "Ouvrir" IDS_EXPLORE_VERB "Explorer" @@ -837,12 +844,12 @@ BEGIN IDS_FILE_DETAILS "Détails concernant l'extension '%s'" IDS_FILE_DETAILSADV "Les fichiers avec l'extension '%s' sont de type '%s'. Pour modifier les paramètres qui concernent tous les fichiers '%s', cliquez sur Avancé." - IDS_FILE_TYPES "File Types" + IDS_FILE_TYPES "Types de fichiers" IDS_COLUMN_EXTENSION "Extensions" /* As in 'INI File' or 'WAV File', fallback string for no-name extensions used in the _File type_ tab of the _Folder Options_ dialog */ - IDS_FILE_EXT_TYPE "%s File" + IDS_FILE_EXT_TYPE "Fichier %s" IDS_BYTES_FORMAT "octets" IDS_UNKNOWN_APP "Application inconnue" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index f837ead3b1..8472eaddee 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -812,11 +818,12 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Shortcut" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" - IDS_ANY_FILE "%s-file" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 011efe8353..629b97485b 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Shortcut" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index d888d2a999..a2697d681a 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Cartella" IDS_BAT_FILE "File Batch ReactOS" IDS_CMD_FILE "Script di comandi ReactOS" IDS_COM_FILE "Applicazione DOS" IDS_CPL_FILE "Elemento del pannello di controllo" IDS_CUR_FILE "Cursore" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Estensione di applicazione" IDS_DRV_FILE "Driver di periferica" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Applicazione" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font" IDS_TTF_FILE "TrueType Font" IDS_OTF_FILE "OpenType Font" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icona" IDS_INI_FILE "Impostazioni di configurazione" IDS_LNK_FILE "Collegamento" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "File di sistema" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index c2b55d12e6..0a1bce3e2a 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -793,15 +793,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "フォルダ" IDS_BAT_FILE "ReactOS バッチファイル" IDS_CMD_FILE "ReactOS コマンドスクリプト" IDS_COM_FILE "DOS アプリケーション" IDS_CPL_FILE "コントロールパネルの項目" IDS_CUR_FILE "カーソル" + IDS_DB__FILE "Database File" IDS_DLL_FILE "アプリケーション拡張" IDS_DRV_FILE "デバイスドライバ" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "アプリケーション" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "フォントファイル" IDS_TTF_FILE "TrueType フォントファイル" IDS_OTF_FILE "OpenType フォントファイル" @@ -809,6 +815,7 @@ BEGIN IDS_ICO_FILE "アイコンファイル" IDS_INI_FILE "設定ファイル" IDS_LNK_FILE "ショートカット" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM プログラム情報ファイル" IDS_SCR_FILE "スクリーンセーバー" IDS_SYS_FILE "システムファイル" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 9b95a3bc9f..37d7afd13b 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Shortcut" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 97379481f9..75a82a21af 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Shortcut" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index b19147d895..564809b3ee 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Mappe" IDS_BAT_FILE "ReactOS Batch fil" IDS_CMD_FILE "ReactOS Kommando skript" IDS_COM_FILE "DOS Applikasjon" IDS_CPL_FILE "Kontrollpanel enhet" IDS_CUR_FILE "Markør" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Applikasjon utvidelse" IDS_DRV_FILE "Enhet driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Applikasjon" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Skrift fil" IDS_TTF_FILE "TrueType skrift fil" IDS_OTF_FILE "OpenType skrift fil" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Konfigurasjon innstilling" IDS_LNK_FILE "Snarvei" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Systemfil" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 336431f68b..a218dc33dc 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -801,15 +801,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Nie można pokazać właściwości (kod błędu: %lu)." IDS_CANTDISCONNECT "Nie można odłączyć (kod błędu: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Katalog" IDS_BAT_FILE "Plik wsadowy ReactOS" IDS_CMD_FILE "Skrypt konsoli ReactOS" IDS_COM_FILE "Aplikacja DOS" IDS_CPL_FILE "Element Panelu sterowania" IDS_CUR_FILE "Kursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Rozszerzenie aplikacji" IDS_DRV_FILE "Sterownik urządzenia" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Aplikacja" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Plik czcionki" IDS_TTF_FILE "Plik czcionki TrueType" IDS_OTF_FILE "Plik czcionki OpenType" @@ -817,6 +823,7 @@ BEGIN IDS_ICO_FILE "Ikona" IDS_INI_FILE "Ustawienia konfiguracji" IDS_LNK_FILE "Skrót" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "Plik informacyjny o programie NT VDM" IDS_SCR_FILE "Wygaszacz ekranu" IDS_SYS_FILE "Plik systemowy" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 56bd55ef1f..1592819a3f 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Pasta" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Atalho" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Arquivo do sistema" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 35ad18b692..243b4caf71 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Pasta" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "Aplicação DOS" IDS_CPL_FILE "Item do Painel de Controle" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Extensão da Aplicação" IDS_DRV_FILE "Driver do Dispositivo" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Aplicação" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Ficheiro de tipo de letra" IDS_TTF_FILE "Tipo de letra TrueType" IDS_OTF_FILE "Tipo de letra OpenType" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Definições" IDS_LNK_FILE "Atalho" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Ficheiro de Sistema" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 3d05384e6c..4732b10d39 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -798,15 +798,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Dosar" IDS_BAT_FILE "Fișier de comenzi ReactOS" IDS_CMD_FILE "Script de comenzi ReactOS" IDS_COM_FILE "Executabil DOS" IDS_CPL_FILE "Element din Panoul de control" IDS_CUR_FILE "Indicator" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Bibliotecă aplicație" IDS_DRV_FILE "Modúl-pilot de dispozitiv" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Executabil" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font" IDS_TTF_FILE "Font TrueType" IDS_OTF_FILE "Font OpenType" @@ -814,6 +820,7 @@ BEGIN IDS_ICO_FILE "Pictogramă" IDS_INI_FILE "Fișier de inițializare" IDS_LNK_FILE "Scurtătură" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "Fișier de informații program NT VDM" IDS_SCR_FILE "Animație regim de inactivitate" IDS_SYS_FILE "Fișier de sistem" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index fe43e1bcf9..6a6cefc297 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -798,15 +798,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Не удалось вывести свойства (код ошибки: %lu)." IDS_CANTDISCONNECT "Не удалось отсоединить сетевой диск (код ошибки: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Папка с файлами" IDS_BAT_FILE "Пакетный файл ReactOS" IDS_CMD_FILE "Командный скрипт ReactOS" IDS_COM_FILE "Приложение DOS" IDS_CPL_FILE "Элемент панели управления" IDS_CUR_FILE "Курсор" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Расширение приложения" IDS_DRV_FILE "Драйвер устройства" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Приложение" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Файл шрифта" IDS_TTF_FILE "Файл шрифта TrueType" IDS_OTF_FILE "Файл шрифта OpenType" @@ -814,6 +820,7 @@ BEGIN IDS_ICO_FILE "Значок" IDS_INI_FILE "Файл конфигурации" IDS_LNK_FILE "Ярлык" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "Информация о приложении NT VDM" IDS_SCR_FILE "Заставка" IDS_SYS_FILE "Системный файл" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 3f046b3c4e..55e3200648 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Priečinok" IDS_BAT_FILE "Dávkový súbor systému ReactOS" IDS_CMD_FILE "Príkazový skript systému ReactOS" IDS_COM_FILE "DOS Aplikácia" IDS_CPL_FILE "Položka ovládacieho panela" IDS_CUR_FILE "Kurzor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Rozšírenie aplikácie" IDS_DRV_FILE "Ovládač zariadenia" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Aplikácia" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Súbor písma" IDS_TTF_FILE "Súbor písma TrueType" IDS_OTF_FILE "Súbor písma OpenType" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Konfiguračné nastavenia" IDS_LNK_FILE "Odkaz" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Systémový súbor" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 42fa20a66b..b51330b7b8 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Shortcut" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index e949cd91c4..2b886ebc4f 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -800,15 +800,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Dosje" IDS_BAT_FILE "ReactOS Dokument Batch" IDS_CMD_FILE "ReactOS Skript Komande" IDS_COM_FILE "Aplikacion DOS" IDS_CPL_FILE "Artikuj Kontroll Panelit" IDS_CUR_FILE "Tregues" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Zgjatja Aplikacionit" IDS_DRV_FILE "Drejtuesi Pajisjes" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Aplikacion" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Dokument Fonti" IDS_TTF_FILE "Dokument Fonti TrueType" IDS_OTF_FILE "Dokument Fonti OpenType" @@ -816,6 +822,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Konfigum Cilësimesh" IDS_LNK_FILE "Shkurtues" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Dokumente Sistemi" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 51569f2719..e10e28aa4f 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Mapp" IDS_BAT_FILE "ReactOS Batch-fil" IDS_CMD_FILE "ReactOS Kommandoradsskript" IDS_COM_FILE "DOS-program" IDS_CPL_FILE "Kontrollpanelsprogram" IDS_CUR_FILE "Pekare" + IDS_DB__FILE "Database File" IDS_DLL_FILE "DLL-fil" IDS_DRV_FILE "Enhetsdrivrutin" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Program" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Teckensnittsfil" IDS_TTF_FILE "TrueType teckensnittsfil" IDS_OTF_FILE "OpenType teckensnittsfil" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Ikon" IDS_INI_FILE "Konfigurationsinställningar" IDS_LNK_FILE "Genväg" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM-programinformationsfil" IDS_SCR_FILE "Skärmsläckare" IDS_SYS_FILE "Systemfil" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 4974a819f5..e4edafe2d1 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -798,15 +798,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Dizin" IDS_BAT_FILE "ReactOS Toplu İş Kütüğü" IDS_CMD_FILE "ReactOS Komut Betiği" IDS_COM_FILE "DOS Uygulaması" IDS_CPL_FILE "Denetim Masası Ögesi" IDS_CUR_FILE "İmleç" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Uygulama Uzantısı" IDS_DRV_FILE "Aygıt Sürücüsü" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Uygulama" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "YazıTipi" IDS_TTF_FILE "TrueType Yazı Tipi Kütüğü" IDS_OTF_FILE "OpenType Yazı Tipi Kütüğü" @@ -814,6 +820,7 @@ BEGIN IDS_ICO_FILE "Simge" IDS_INI_FILE "Yapılandırma Ayarları" IDS_LNK_FILE "Kısayol" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM İzlence Bilgi Kütüğü" IDS_SCR_FILE "Görüntülük Koruyucu" IDS_SYS_FILE "Dizge Kütüğü" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 05094aa00f..142e75f235 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -796,15 +796,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Папка" IDS_BAT_FILE "Пакетний файл ReactOS" IDS_CMD_FILE "Командний скрипт ReactOS" IDS_COM_FILE "Додаток DOS" IDS_CPL_FILE "Елемент панелі керування" IDS_CUR_FILE "Курсор" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Розширення додатку" IDS_DRV_FILE "Драйвер пристрою" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Додаток" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Файл шрифту" IDS_TTF_FILE "Файл шрифту TrueType" IDS_OTF_FILE "Файл шрифту OpenType" @@ -812,6 +818,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Файл налаштувань" IDS_LNK_FILE "Ярлик" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Системний файл" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index dc3abce8a2..e298c62759 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -741,7 +741,7 @@ BEGIN IDS_RUNDLG_BROWSE_FILTER "可执行文件 (*.exe)\0*.exe\0所有文件 (*.*)\0*.*\0" /* shell folder path default values */ - /* ATTENTION: If there is no special situation, please DO NOT change + /* ATTENTION: If there is no special situation, please DO NOT change English folder names into Chinese, or it may cause problems in the system. */ IDS_PROGRAMS "「开始」菜单\\程序" IDS_PERSONAL "我的文档" @@ -806,15 +806,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "无法显示属性 (错误代码: %lu)." IDS_CANTDISCONNECT "无法断开连接 (错误代码: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "文件夹" IDS_BAT_FILE "ReactOS 批处理文件" IDS_CMD_FILE "ReactOS 命令脚本" IDS_COM_FILE "DOS 应用程序" IDS_CPL_FILE "控制面板项" IDS_CUR_FILE "光标" + IDS_DB__FILE "Database File" IDS_DLL_FILE "应用程序扩展" IDS_DRV_FILE "设备驱动程序" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "应用程序" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "字体文件" IDS_TTF_FILE "TrueType 字体文件" IDS_OTF_FILE "OpenType 字体文件" @@ -822,6 +828,7 @@ BEGIN IDS_ICO_FILE "图标" IDS_INI_FILE "配置设置" IDS_LNK_FILE "快捷方式" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM 程序信息文件" IDS_SCR_FILE "屏幕保护程序" IDS_SYS_FILE "系统文件" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 6ba357b90c..db828af75c 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -804,15 +804,21 @@ BEGIN IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + /* Friendly File Type Names */ IDS_DIRECTORY "Folder" IDS_BAT_FILE "ReactOS Batch File" IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS Application" IDS_CPL_FILE "Control Panel Item" IDS_CUR_FILE "Cursor" + IDS_DB__FILE "Database File" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Device Driver" + IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Application" + IDS_NLS_FILE "National Language Support File" + IDS_OCX_FILE "ActiveX Control" + IDS_TLB_FILE "Type Library" IDS_FON_FILE "Font file" IDS_TTF_FILE "TrueType Font file" IDS_OTF_FILE "OpenType Font file" @@ -820,6 +826,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Configuration Settings" IDS_LNK_FILE "Shortcut" + IDS_NT__FILE "NT DOS32 Configuration File" IDS_PIF_FILE "NT VDM Program Information File" IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 5508e3f1d9..8d5cf11293 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -147,9 +147,14 @@ #define IDS_COM_FILE 203 #define IDS_CPL_FILE 204 #define IDS_CUR_FILE 205 +#define IDS_DB__FILE 220 #define IDS_DLL_FILE 206 #define IDS_DRV_FILE 207 +#define IDS_EFI_FILE 221 #define IDS_EXE_FILE 208 +#define IDS_NLS_FILE 222 +#define IDS_OCX_FILE 223 +#define IDS_TLB_FILE 224 #define IDS_FON_FILE 209 #define IDS_TTF_FILE 210 #define IDS_OTF_FILE 211 @@ -157,11 +162,12 @@ #define IDS_ICO_FILE 213 #define IDS_INI_FILE 214 #define IDS_LNK_FILE 215 +#define IDS_NT__FILE 225 #define IDS_PIF_FILE 216 #define IDS_SCR_FILE 217 #define IDS_SYS_FILE 218 #define IDS_VXD_FILE 219 -#define IDS_ANY_FILE 220 +#define IDS_ANY_FILE 299 #define IDS_EMPTY_BITBUCKET 172 #define IDS_SHLEXEC_NOASSOC 173

6 years, 4 months

01/01: [IDL] srvsvc.idl: Fix the definition of Opnum29NotUsedOnWire

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7994ca74f268995a0d2d… commit c7994ca74f268995a0d2d9750828501044f0f6f9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 5 15:32:05 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 5 15:34:43 2018 +0200 [IDL] srvsvc.idl: Fix the definition of Opnum29NotUsedOnWire Opnum29NotUsedOnWire is actually called NetrServerSetServiceBits. See: http://l.wzm.me/_security/internet/_internet/WinServices/ch04s07s08.html and https://git.samba.org/?p=samba.git;a=blob;f=librpc/idl/srvsvc.idl;h=db804e5… --- base/services/srvsvc/rpcserver.c | 11 ++++++++--- sdk/include/reactos/idl/srvsvc.idl | 10 +++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/base/services/srvsvc/rpcserver.c b/base/services/srvsvc/rpcserver.c index ab96f2554f..e47eafb2c0 100644 --- a/base/services/srvsvc/rpcserver.c +++ b/base/services/srvsvc/rpcserver.c @@ -529,12 +529,17 @@ NetrRemoteTOD( } -/* Function 29 */ -void +/* Function 29 - Not used on wire */ +NET_API_STATUS __stdcall -Opnum29NotUsedOnWire(void) +NetrServerSetServiceBits( + SRVSVC_HANDLE ServerName, + WCHAR *Transport, + DWORD ServiceBits, + DWORD UpdateImmediately) { UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/sdk/include/reactos/idl/srvsvc.idl b/sdk/include/reactos/idl/srvsvc.idl index 1cd1bb5ec9..f8d1d6c54b 100644 --- a/sdk/include/reactos/idl/srvsvc.idl +++ b/sdk/include/reactos/idl/srvsvc.idl @@ -1220,10 +1220,14 @@ interface srvsvc [in, string, unique] SRVSVC_HANDLE ServerName, [out] LPTIME_OF_DAY_INFO *BufferPtr); - // This method not used on the wire - void + /* Function 29 - Not used on wire */ + NET_API_STATUS __stdcall - Opnum29NotUsedOnWire(void); + NetrServerSetServiceBits( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string, unique] WCHAR *Transport, + [in] DWORD ServiceBits, + [in] DWORD UpdateImmediately); NET_API_STATUS __stdcall

6 years, 4 months

01/01: [CONUTILS] Use the currently active console codepage to output text to files. If you want to output UTF-8 run "chcp 65001" before. CORE-12122

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b3fd31bc55ddb2185a64… commit 2b3fd31bc55ddb2185a64c33bf2dd8b753de44e2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat May 5 01:36:19 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat May 5 01:37:30 2018 +0200 [CONUTILS] Use the currently active console codepage to output text to files. If you want to output UTF-8 run "chcp 65001" before. CORE-12122 --- sdk/lib/conutils/outstream.c | 34 +++++++++++++++++++--------------- sdk/lib/conutils/stream.c | 20 +++++++++----------- sdk/lib/conutils/stream.h | 14 ++++---------- sdk/lib/conutils/stream_private.h | 2 +- 4 files changed, 33 insertions(+), 37 deletions(-) diff --git a/sdk/lib/conutils/outstream.c b/sdk/lib/conutils/outstream.c index a36a5ddaa2..645452f3ef 100644 --- a/sdk/lib/conutils/outstream.c +++ b/sdk/lib/conutils/outstream.c @@ -103,7 +103,7 @@ ConWrite( // if (IsConsoleHandle(Stream->hHandle)) if (Stream->IsConsole) { - // TODO: Check if (ConStream->Mode == WideText or UTF16Text) ?? + // TODO: Check if (Stream->Mode == WideText or UTF16Text) ?? /* * This code is inspired from _cputws, in particular from the fact that, @@ -136,15 +136,15 @@ ConWrite( * * Implementation NOTE: * MultiByteToWideChar (resp. WideCharToMultiByte) are equivalent to - * OemToCharBuffW (resp. CharToOemBuffW), but the latters uselessly - * depend on user32.dll, while MultiByteToWideChar and WideCharToMultiByte - * only need kernel32.dll. + * OemToCharBuffW (resp. CharToOemBuffW), but these latter functions + * uselessly depend on user32.dll, while MultiByteToWideChar and + * WideCharToMultiByte only need kernel32.dll. */ if ((Stream->Mode == WideText) || (Stream->Mode == UTF16Text)) { #ifndef _UNICODE // UNICODE means that TCHAR == WCHAR == UTF-16 - /* Convert from the current process/thread's codepage to UTF-16 */ - WCHAR *buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + /* Convert from the current process/thread's code page to UTF-16 */ + PWCHAR buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); if (!buffer) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -200,18 +200,22 @@ ConWrite( } else if ((Stream->Mode == UTF8Text) || (Stream->Mode == AnsiText)) { - CHAR *buffer; + UINT CodePage; + PCHAR buffer; /* - * Resolve the codepage cache if it was not assigned yet - * (only if the stream is in ANSI mode; in UTF8 mode the - * codepage was already set to CP_UTF8). + * Resolve the current code page if it has not been assigned yet + * (we do this only if the stream is in ANSI mode; in UTF8 mode + * the code page is always set to CP_UTF8). Otherwise use the + * current stream's code page. */ if (/*(Stream->Mode == AnsiText) &&*/ (Stream->CodePage == INVALID_CP)) - Stream->CodePage = GetConsoleOutputCP(); // CP_ACP, CP_OEMCP + CodePage = GetConsoleOutputCP(); // CP_ACP, CP_OEMCP + else + CodePage = Stream->CodePage; #ifdef _UNICODE // UNICODE means that TCHAR == WCHAR == UTF-16 - /* Convert from UTF-16 to either UTF-8 or ANSI, using stream codepage */ + /* Convert from UTF-16 to either UTF-8 or ANSI, using the stream code page */ // NOTE: MB_LEN_MAX defined either in limits.h or in stdlib.h . buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * MB_LEN_MAX); if (!buffer) @@ -219,14 +223,14 @@ ConWrite( SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; } - len = WideCharToMultiByte(Stream->CodePage, 0, + len = WideCharToMultiByte(CodePage, 0, szStr, len, buffer, len * MB_LEN_MAX, NULL, NULL); szStr = (PVOID)buffer; #else /* - * Convert from the current process/thread's codepage to either - * UTF-8 or ANSI, using stream codepage. + * Convert from the current process/thread's code page to either + * UTF-8 or ANSI, using the stream code page. * We need to perform a double conversion, by going through UTF-16. */ // TODO! diff --git a/sdk/lib/conutils/stream.c b/sdk/lib/conutils/stream.c index 0b137ea2f7..7246453df4 100644 --- a/sdk/lib/conutils/stream.c +++ b/sdk/lib/conutils/stream.c @@ -73,9 +73,6 @@ static int ConToCRTMode[] = _O_U16TEXT, // UTF16Text (UTF16 without BOM; translated) _O_U8TEXT, // UTF8Text (UTF8 without BOM; translated) }; -#endif - -#ifdef USE_CRT /* * See http://archives.miloush.net/michkap/archive/2008/03/18/8306597.html @@ -83,7 +80,7 @@ static int ConToCRTMode[] = * for more details. */ -// NOTE: May the translated mode be cached somehow? +// NOTE1: May the translated mode be cached somehow? // NOTE2: We may also call IsConsoleHandle to directly set the mode to // _O_U16TEXT if it's ok?? // NOTE3: _setmode returns the previous mode, or -1 if failure. @@ -99,16 +96,17 @@ do { \ #else /* defined(USE_CRT) */ /* - * We set Stream->CodePage to INVALID_CP (= -1) to signal that the codepage + * We set Stream->CodePage to INVALID_CP (== -1) to signal that the code page * is either not assigned (if the mode is Binary, WideText, or UTF16Text), or - * is not cached yet (if the mode is AnsiText). In this latter case the cache - * is resolved inside ConWrite. Finally, if the mode is UTF8Text, the codepage - * cache is set to CP_UTF8. - * The codepage cache can be reset by an explicit call to CON_STREAM_SET_MODE + * is not cached (if the mode is AnsiText). In this latter case the code page + * is resolved inside ConWrite. Finally, if the mode is UTF8Text, the code page + * cache is always set to CP_UTF8. + * The code page cache can be reset by an explicit call to CON_STREAM_SET_MODE * (i.e. by calling ConStreamSetMode, or by reinitializing the stream with * ConStreamInit(Ex)). * - * NOTE: the magic value could not be '0' since it is reserved for CP_ACP. + * NOTE: the reserved values are: 0 (CP_ACP), 1 (CP_OEMCP), 2 (CP_MACCP), + * 3 (CP_THREAD_ACP), 42 (CP_SYMBOL), 65000 (CP_UTF7) and 65001 (CP_UTF8). */ #define CON_STREAM_SET_MODE(Stream, Mode, CacheCodePage) \ do { \ @@ -229,7 +227,7 @@ ConStreamSetCacheCodePage( return FALSE; /* - * Keep the original stream mode but set the correct file codepage + * Keep the original stream mode but set the correct file code page * (will be reset only if Mode == AnsiText). */ Mode = Stream->Mode; diff --git a/sdk/lib/conutils/stream.h b/sdk/lib/conutils/stream.h index 8a2746af5c..031ae56d30 100644 --- a/sdk/lib/conutils/stream.h +++ b/sdk/lib/conutils/stream.h @@ -113,20 +113,14 @@ do { \ } while(0) #endif /* defined(USE_CRT) */ -#ifdef _UNICODE /* - * Use UTF8 by default for file output, because this mode is back-compatible - * with ANSI, and it displays nice on terminals that support UTF8 by default - * (not many terminals support UTF16 on the contrary). + * Use ANSI by default for file output, with no cached code page. + * Note that setting the stream mode to AnsiText and the code page value + * to CP_UTF8 sets the stream to UTF8 mode, and has the same effect as if + * the stream mode UTF8Text had been specified instead. */ -#define ConInitStdStreams() \ - ConInitStdStreamsAndMode(UTF8Text, INVALID_CP) - /* Note that here the cache code page is unused */ -#else -/* Use ANSI by default for file output */ #define ConInitStdStreams() \ ConInitStdStreamsAndMode(AnsiText, INVALID_CP) -#endif /* defined(_UNICODE) */ /* Stream translation modes */ BOOL diff --git a/sdk/lib/conutils/stream_private.h b/sdk/lib/conutils/stream_private.h index 6b801dfb23..181cf77fc3 100644 --- a/sdk/lib/conutils/stream_private.h +++ b/sdk/lib/conutils/stream_private.h @@ -46,7 +46,7 @@ typedef struct _CON_STREAM * when 'hHandle' refers to a file or a pipe. */ CON_STREAM_MODE Mode; - UINT CodePage; // Used to convert UTF-16 text to some ANSI codepage. + UINT CodePage; // Used to convert UTF-16 text to some ANSI code page. #endif /* defined(USE_CRT) */ } CON_STREAM, *PCON_STREAM;

6 years, 4 months

01/01: [DESK.CPL] Fix a Clang-Cl warning about "LogPixels"

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=444553c7f0d11a2ab5a1c… commit 444553c7f0d11a2ab5a1c95211ab24c2201b5cd8 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri May 4 19:10:57 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri May 4 22:02:48 2018 +0200 [DESK.CPL] Fix a Clang-Cl warning about "LogPixels" "warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]" CORE-14306 --- dll/cpl/desk/general.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/desk/general.c b/dll/cpl/desk/general.c index 0858c16f97..e5891a02cf 100644 --- a/dll/cpl/desk/general.c +++ b/dll/cpl/desk/general.c @@ -32,8 +32,8 @@ InitFontSizeList(HWND hWnd) dwSize = MAX_PATH; dwType = REG_DWORD; - if (!RegQueryValueEx(hKey, _T("LogPixels"), NULL, - &dwType, (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS) + if (RegQueryValueEx(hKey, _T("LogPixels"), NULL, &dwType, + (LPBYTE)&dwValue, &dwSize) != ERROR_SUCCESS) { dwValue = 0; }

6 years, 4 months

01/01: [UMPNPMGR] Fix a Clang-Cl warning about "CSConfigFlags"

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ca037d5f6a285730f2f9… commit 5ca037d5f6a285730f2f9ddfecb3125899d4bd9b Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri May 4 06:15:37 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri May 4 22:02:24 2018 +0200 [UMPNPMGR] Fix a Clang-Cl warning about "CSConfigFlags" "warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]" CORE-14306 --- base/services/umpnpmgr/umpnpmgr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index e86047785a..de64057afb 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -2423,12 +2423,12 @@ PNP_HwProfFlags( else { dwSize = sizeof(DWORD); - if (!RegQueryValueExW(hDeviceKey, - L"CSConfigFlags", - NULL, - NULL, - (LPBYTE)pulValue, - &dwSize) != ERROR_SUCCESS) + if (RegQueryValueExW(hDeviceKey, + L"CSConfigFlags", + NULL, + NULL, + (LPBYTE)pulValue, + &dwSize) != ERROR_SUCCESS) { *pulValue = 0; }

6 years, 4 months

02/02: [ZIPFLDR] Add German translation

by Robert Naumann

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6cebe736a2b99a713f8d… commit d6cebe736a2b99a713f8df6a0c63a273eaa30609 Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Fri May 4 21:32:12 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Fri May 4 21:34:09 2018 +0200 [ZIPFLDR] Add German translation --- dll/shellext/zipfldr/lang/de-DE.rc | 71 ++++++++++++++++++++++++++++++++++++++ dll/shellext/zipfldr/zipfldr.rc | 4 +++ 2 files changed, 75 insertions(+) diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc new file mode 100644 index 0000000000..8c507b7a62 --- /dev/null +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: German (Germany) resource translation + * COPYRIGHT: Copyright 2018 Robert Naumann + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ziel auswählen" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Wählen Sie ein Ziel zum Extahieren der Dateien.",IDC_STATIC,6,12,174,8 + EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL + PUSHBUTTON "Durchsuchen...",IDC_BROWSE,174,42,54,14 + PUSHBUTTON "Kennwort",IDC_PASSWORD,174,66,54,14 + LTEXT "Extrahieren...",IDC_STATIC,6,114,42,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 +END + +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extrahieren abgeschlossen" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Die Dateien wurden in das folgende Verzeichnis extrahiert:",IDC_STATIC,6,12,222,18 + LTEXT "Zielverzeichnis",IDC_DESTDIR,6,36,222,8 + CONTROL "Extrahierte Dateien anzeigen",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 + LTEXT "Abschließen drücken um fortzufahren.",IDC_STATIC,6,84,174,8 +END + +IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ersetzen von Dateien bestätigen" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Ja",IDYES,6,36,62,14 + PUSHBUTTON "Abbrechen",IDCANCEL,204,36,62,14 + PUSHBUTTON "Alle",IDYESALL,72,36,62,14 + PUSHBUTTON "&Nein",IDNO,138,36,62,14 + ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 + LTEXT "",IDC_MESSAGE,36,6,228,24 +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Name" + IDS_COL_TYPE "Dateityp" + IDS_COL_COMPRSIZE "Komprimierte Größe" + IDS_COL_PASSWORD "Kennwort" + IDS_COL_SIZE "Größe" + IDS_COL_RATIO "Rate" + IDS_COL_DATE_MOD "Änderungsdatum" + IDS_YES "Ja" + IDS_NO "Nein" + + IDS_WIZ_TITLE "Extrahier-Assistent" + IDS_WIZ_DEST_TITLE "Ziel auswählen" + IDS_WIZ_DEST_SUBTITLE "Dateien im ZIP-Archiv werden auf den von Ihnen hier angegebenen Pfad extrahiert." + IDS_WIZ_COMPL_TITLE "Extrahieren abgeschlossen" + IDS_WIZ_COMPL_SUBTITLE "Die Dateien des ZIP-Archives wurden extrahiert." + IDS_WIZ_BROWSE_TITLE "Wählen Sie ein Ziel zum extrahieren der Dateien." + + IDS_OVERWRITEFILE_TEXT "Dieser Ordner enthält bereits eine Datei '%1'.\nMöchten Sie die existierende Datei ersetzen?" + + IDS_MENUITEM "&Alle Extrahieren..." + IDS_HELPTEXT "Ordnerinhalt extrahieren" + IDS_FRIENDLYNAME "ZIP-komprimierter Ordner" +END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index 593ad3efa5..5f39bfd7e1 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -18,6 +18,10 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" /* UTF-8 */ #pragma code_page(65001) + +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif

6 years, 4 months

01/02: [DRWTSN32] Add German translation

by Robert Naumann

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f9c961b41e127515d920… commit 9f9c961b41e127515d920352c6b19f2657abc362 Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Fri May 4 21:31:48 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Fri May 4 21:34:09 2018 +0200 [DRWTSN32] Add German translation --- base/applications/drwtsn32/drwtsn32.rc | 3 +++ base/applications/drwtsn32/lang/de-DE.rc | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/base/applications/drwtsn32/drwtsn32.rc b/base/applications/drwtsn32/drwtsn32.rc index 07c449cf18..8698a3a9fc 100644 --- a/base/applications/drwtsn32/drwtsn32.rc +++ b/base/applications/drwtsn32/drwtsn32.rc @@ -19,6 +19,9 @@ /* UTF-8 */ #pragma code_page(65001) +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif diff --git a/base/applications/drwtsn32/lang/de-DE.rc b/base/applications/drwtsn32/lang/de-DE.rc new file mode 100644 index 0000000000..6587f1721c --- /dev/null +++ b/base/applications/drwtsn32/lang/de-DE.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: Dr. Watson crash reporter + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: de-DE resource file + * COPYRIGHT: Copyright 2018 Robert Naumann + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_APP_TITLE "ReactOS Fehlerberichterstattung" + IDS_USER_ALERT_MESSAGE "Die Anwendung %ls ist abgestürzt. Informationen über den Absturz wurden hier abgespeichert:\r\n\r\n%ls" +END

6 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2018