Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [KERNEL32] Stub GetSystemTimePreciseAsFileTime

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6b64448ce46d1f1ca808… commit c6b64448ce46d1f1ca80850f4a358f2bf74178f7 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Oct 9 18:40:22 2019 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 29 09:03:09 2019 +0100 [KERNEL32] Stub GetSystemTimePreciseAsFileTime --- dll/apisets/api-ms-win-core-sysinfo-l1-2-0.spec | 2 +- dll/apisets/api-ms-win-core-sysinfo-l1-2-1.spec | 2 +- dll/win32/kernel32/client/time.c | 10 ++++++++++ dll/win32/kernel32/kernel32.spec | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dll/apisets/api-ms-win-core-sysinfo-l1-2-0.spec b/dll/apisets/api-ms-win-core-sysinfo-l1-2-0.spec index 0c48bdccdb7..591e4e7037c 100644 --- a/dll/apisets/api-ms-win-core-sysinfo-l1-2-0.spec +++ b/dll/apisets/api-ms-win-core-sysinfo-l1-2-0.spec @@ -17,7 +17,7 @@ @ stdcall GetSystemTime() kernel32.GetSystemTime @ stdcall GetSystemTimeAdjustment() kernel32.GetSystemTimeAdjustment @ stdcall GetSystemTimeAsFileTime() kernel32.GetSystemTimeAsFileTime -@ stub GetSystemTimePreciseAsFileTime +@ stdcall -version=0x602+ GetSystemTimePreciseAsFileTime() kernel32.GetSystemTimePreciseAsFileTime @ stdcall GetSystemWindowsDirectoryA() kernel32.GetSystemWindowsDirectoryA @ stdcall GetSystemWindowsDirectoryW() kernel32.GetSystemWindowsDirectoryW @ stdcall GetTickCount() kernel32.GetTickCount diff --git a/dll/apisets/api-ms-win-core-sysinfo-l1-2-1.spec b/dll/apisets/api-ms-win-core-sysinfo-l1-2-1.spec index 7baed33465a..ab5ce34982a 100644 --- a/dll/apisets/api-ms-win-core-sysinfo-l1-2-1.spec +++ b/dll/apisets/api-ms-win-core-sysinfo-l1-2-1.spec @@ -19,7 +19,7 @@ @ stdcall GetSystemTime() kernel32.GetSystemTime @ stdcall GetSystemTimeAdjustment() kernel32.GetSystemTimeAdjustment @ stdcall GetSystemTimeAsFileTime() kernel32.GetSystemTimeAsFileTime -@ stub GetSystemTimePreciseAsFileTime +@ stdcall -version=0x602+ GetSystemTimePreciseAsFileTime() kernel32.GetSystemTimePreciseAsFileTime @ stdcall GetSystemWindowsDirectoryA() kernel32.GetSystemWindowsDirectoryA @ stdcall GetSystemWindowsDirectoryW() kernel32.GetSystemWindowsDirectoryW @ stdcall -version=0x600+ GetTickCount64() kernel32.GetTickCount64 diff --git a/dll/win32/kernel32/client/time.c b/dll/win32/kernel32/client/time.c index 6ff8559956a..7c67e1165ce 100644 --- a/dll/win32/kernel32/client/time.c +++ b/dll/win32/kernel32/client/time.c @@ -140,6 +140,16 @@ GetSystemTimeAsFileTime(OUT PFILETIME lpFileTime) lpFileTime->dwHighDateTime = SystemTime.HighPart; } +/* + * @unimplemented + */ +VOID +WINAPI +GetSystemTimePreciseAsFileTime(OUT PFILETIME lpFileTime) +{ + STUB; +} + /* * @implemented */ diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index b7cf1e6a019..765d5f450bb 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -605,6 +605,7 @@ @ stdcall GetSystemTime(ptr) @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) @ stdcall GetSystemTimeAsFileTime(ptr) +@ stdcall -version=0x602+ GetSystemTimePreciseAsFileTime(ptr) @ stdcall GetSystemTimes(ptr ptr ptr) @ stdcall GetSystemWindowsDirectoryA(ptr long) @ stdcall GetSystemWindowsDirectoryW(ptr long)

4 years, 10 months

[reactos] 01/01: Stub GetCurrentPackageId() (#1942)

by William Kent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=192926ee026ee04992e1f… commit 192926ee026ee04992e1f8d5c6b34916389fd9ca Author: William Kent <wjk011(a)gmail.com> AuthorDate: Fri Nov 29 02:56:02 2019 -0500 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 29 08:56:02 2019 +0100 Stub GetCurrentPackageId() (#1942) * [KERNEL32] Add stub implementation for GetCurrentPackageId() function This Windows 8+ function is called by WiX bundles (EXE-based installers) upon exit, if the export is present. If it is a stub in the spec, they will crash, even if they are coded to be compatible with Windows XP/ReactOS. Also add GetCurrentPackageId() forwarder to apiset. --- dll/apisets/CMakeLists.txt | 2 +- dll/apisets/api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- dll/win32/kernel32/client/sysinfo.c | 12 ++++++++++++ dll/win32/kernel32/kernel32.spec | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dll/apisets/CMakeLists.txt b/dll/apisets/CMakeLists.txt index 778af7f878f..4e658584755 100644 --- a/dll/apisets/CMakeLists.txt +++ b/dll/apisets/CMakeLists.txt @@ -40,7 +40,7 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_reactos.apisets_6595b64144ccf1d # Apisets will be appended add_apiset(api-ms-win-appmodel-identity-l1-1-0 0x60000000 ) -add_apiset(api-ms-win-appmodel-runtime-l1-1-1 0x60020000 ) +add_apiset(api-ms-win-appmodel-runtime-l1-1-1 0x60020000 kernel32) add_apiset(api-ms-win-appmodel-runtime-l1-1-2 0x60040000 ) add_apiset(api-ms-win-core-apiquery-l1-1-0 0x60060000 ) add_apiset(api-ms-win-core-appcompat-l1-1-1 0x60070000 kernel32) diff --git a/dll/apisets/api-ms-win-appmodel-runtime-l1-1-1.spec b/dll/apisets/api-ms-win-appmodel-runtime-l1-1-1.spec index c814f9b98da..1c4887411eb 100644 --- a/dll/apisets/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dll/apisets/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -8,7 +8,7 @@ @ stub GetCurrentApplicationUserModelId @ stub GetCurrentPackageFamilyName @ stub GetCurrentPackageFullName -@ stub GetCurrentPackageId +@ stdcall -version=0x602+ GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId @ stub GetCurrentPackageInfo @ stub GetCurrentPackagePath @ stub GetPackageApplicationIds diff --git a/dll/win32/kernel32/client/sysinfo.c b/dll/win32/kernel32/client/sysinfo.c index ac0ad750efc..74151c19eea 100644 --- a/dll/win32/kernel32/client/sysinfo.c +++ b/dll/win32/kernel32/client/sysinfo.c @@ -582,3 +582,15 @@ SetSystemFileCacheSize(IN SIZE_T MinimumFileCacheSize, STUB; return FALSE; } + +/* + * @unimplemented + */ +LONG +WINAPI +GetCurrentPackageId(UINT32 *BufferLength, + BYTE *Buffer) +{ + STUB; + return APPMODEL_ERROR_NO_PACKAGE; +} diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 36122395322..b7cf1e6a019 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -430,6 +430,7 @@ @ stub -version=0x600+ GetCurrentConsoleFontEx @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) +@ stdcall -version=0x602+ GetCurrentPackageId(ptr ptr) @ stdcall -norelay GetCurrentProcess() @ stdcall -norelay GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.RtlGetCurrentProcessorNumber

4 years, 10 months

[reactos] 01/01: [CHARMAP] LoadSettings(): Properly use RegQueryValueEx()

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d84e25ac0ad53d837968… commit 3d84e25ac0ad53d837968bc056ef9cf2691075e7 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 28 17:11:27 2019 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Fri Nov 29 10:45:02 2019 +0300 [CHARMAP] LoadSettings(): Properly use RegQueryValueEx() --- base/applications/charmap/settings.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/base/applications/charmap/settings.c b/base/applications/charmap/settings.c index 6d44a259513..5a30f6d0943 100644 --- a/base/applications/charmap/settings.c +++ b/base/applications/charmap/settings.c @@ -59,7 +59,8 @@ extern void LoadSettings(void) { TCHAR szBuffer[MAX_PATH]; DWORD dwAdvancedChecked; - unsigned long type = REG_DWORD, size = 1024; + DWORD type, size = sizeof(dwAdvancedChecked); + LSTATUS lstatus; /* Restore last selected font */ if (QueryStringValue(HKEY_CURRENT_USER, g_szGeneralRegKey, _T("Font"), szBuffer, (sizeof(szBuffer)/sizeof(szBuffer[0]))) == ERROR_SUCCESS) @@ -89,10 +90,11 @@ extern void LoadSettings(void) } } - RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvancedChecked, &size); - - if(dwAdvancedChecked != FALSE) + lstatus = RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvancedChecked, &size); + if (lstatus == ERROR_SUCCESS && type == REG_DWORD && dwAdvancedChecked != FALSE) + { SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, MF_CHECKED, 0); + } RegCloseKey(hKey); }

4 years, 10 months

[reactos] 01/01: [OPENGLCFG] general.c: Fix overruns and warnings, improve code consistency (#1923)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c8f2a099b712334f49ef… commit 2c8f2a099b712334f49ef0fa11bf56a2b279b13e Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Nov 29 08:43:15 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 29 08:43:15 2019 +0100 [OPENGLCFG] general.c: Fix overruns and warnings, improve code consistency (#1923) * [OPENGLCFG] dwNumDrivers: Fix related pOglDrivers[] overruns Follow-up to e7b8f273094c9402ff1df3baa5841bf3518a3f02. * [OPENGLCFG] dwNumDrivers: Sync related iKey to DWORD type * [OPENGLCFG] Fix 2 MSVC-x64 'C4267' warnings about RegSetValueExW() --- dll/cpl/openglcfg/general.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dll/cpl/openglcfg/general.c b/dll/cpl/openglcfg/general.c index 69170a4232f..3f228da19b9 100644 --- a/dll/cpl/openglcfg/general.c +++ b/dll/cpl/openglcfg/general.c @@ -48,14 +48,14 @@ static VOID InitSettings(HWND hWndDlg) if (dwType == REG_SZ) { DWORD ret; - INT iKey; + DWORD iKey; if (wcsncmp(szBultin, szDriver, MAX_KEY_LENGTH) == 0) SendDlgItemMessageW(hWndDlg, IDC_RENDERER, CB_SETCURSEL, RENDERER_RSWR, 0); ret = RegQueryInfoKeyW(hKeyDrivers, NULL, NULL, NULL, &dwNumDrivers, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - if (ret != ERROR_SUCCESS || dwNumDrivers <= 0) + if (ret != ERROR_SUCCESS || dwNumDrivers == 0) { RegCloseKey(hKeyDrivers); RegCloseKey(hKeyRenderer); @@ -139,7 +139,7 @@ static VOID SaveSettings(HWND hWndDlg) { WCHAR szBuffer[MAX_KEY_LENGTH]; LoadString(hApplet, IDS_RENDERER_RSWR, (LPTSTR)szBuffer, 127); - RegSetValueExW(hKeyRenderer, L"", 0, REG_SZ, (PBYTE)szBuffer, (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + RegSetValueExW(hKeyRenderer, L"", 0, REG_SZ, (PBYTE)szBuffer, (DWORD)((wcslen(szBuffer) + 1) * sizeof(WCHAR))); break; } @@ -148,8 +148,8 @@ static VOID SaveSettings(HWND hWndDlg) /* Adjustment for DEFAULT and RSWR renderers */ iSel -= 2; - if (iSel >= 0 && iSel <= dwNumDrivers) - RegSetValueExW(hKeyRenderer, L"", 0, REG_SZ, (PBYTE)pOglDrivers[iSel], (wcslen(pOglDrivers[iSel]) + 1) * sizeof(WCHAR)); + if (iSel >= 0 && iSel < dwNumDrivers) + RegSetValueExW(hKeyRenderer, L"", 0, REG_SZ, (PBYTE)pOglDrivers[iSel], (DWORD)((wcslen(pOglDrivers[iSel]) + 1) * sizeof(WCHAR))); break; } @@ -192,8 +192,9 @@ INT_PTR CALLBACK GeneralPageProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM case WM_DESTROY: if (pOglDrivers != NULL) { - INT iKey; - for (iKey = 0; iKey <= dwNumDrivers; iKey++) + DWORD iKey; + + for (iKey = 0; iKey < dwNumDrivers; ++iKey) HeapFree(GetProcessHeap(), 0, pOglDrivers[iKey]); HeapFree(GetProcessHeap(), 0, pOglDrivers);

4 years, 10 months

[reactos] 01/01: [NETSTAT] Fix output formats and more (#1709)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fa2780796671e23a9888… commit 1fa2780796671e23a98882d011fa1324b29ad211 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Nov 29 08:26:19 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 29 08:26:19 2019 +0100 [NETSTAT] Fix output formats and more (#1709) * [NETSTAT] Restore expected output formats "Revert" parts of bd3c852012943f7407f79edabea33f9ae4be9f49. CORE-16119 * [NETSTAT] Improve default and ICMPv4 output formats * [NETSTAT] Fix a few typos, in output strings * [NETSTAT] Output usage to StdErr * [NETSTAT] Be more explicit about unimplemented -b/-t/-v options --- base/applications/network/netstat/lang/en-US.rc | 105 ++++++++++++------------ base/applications/network/netstat/netstat.c | 23 ++++-- 2 files changed, 69 insertions(+), 59 deletions(-) diff --git a/base/applications/network/netstat/lang/en-US.rc b/base/applications/network/netstat/lang/en-US.rc index 218baf8913a..0ba302812b6 100644 --- a/base/applications/network/netstat/lang/en-US.rc +++ b/base/applications/network/netstat/lang/en-US.rc @@ -3,10 +3,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN IDS_USAGE "\nDisplays current TCP/IP protocol statistics and network connections.\n\n\ -NETSTAT [-a] [-e] [-n] [-o] [-p proto] [-r] [-s] [interval]\n\n\ +NETSTAT [-a] [-b] [-e] [-n] [-o] [-p proto] [-r] [-s] [-t] [-v] [interval]\n\n\ -a Displays all connections and listening ports.\n\ + -b FIXME (Accepted option though unimplemented feature).\n\ -e Displays Ethernet statistics. May be combined with -s\n\ - option\n\ + option.\n\ -n Displays address and port numbers in numeric form.\n\ -o Displays the process ID for each connection.\n\ -p proto Shows connections for protocol 'proto' TCP or UDP.\n\ @@ -16,9 +17,11 @@ NETSTAT [-a] [-e] [-n] [-o] [-p proto] [-r] [-s] [interval]\n\n\ -s Displays per-protocol statistics. By default, Statistics are\n\ shown for IP, ICMP, TCP and UDP;\n\ the -p option may be used to specify a subset of the default.\n\ + -t FIXME (Accepted option though unimplemented feature).\n\ + -v FIXME (Accepted option though unimplemented feature).\n\ interval Redisplays selected statistics every 'interval' seconds.\n\ Press CTRL+C to stop redisplaying. By default netstat will\n\ - print the current information only once.\n\n" + print the current information only once.\n" IDS_DISPLAY_THEADER "\n Proto Local Address Foreign Address State" IDS_DISPLAY_PROCESS " Process\n" IDS_ACTIVE_CONNECT "\nActive Connections\n" @@ -27,76 +30,76 @@ END STRINGTABLE BEGIN IDS_IP4_STAT_HEADER "\nIPv4 Statistics\n\n" - IDS_IP_PACK_REC " Packets Received = %lu\n" - IDS_IP_HEAD_REC_ERROR " Received Header Errors = %lu\n" - IDS_IP_ADDR_REC_ERROR " Received Address Errors = %lu\n" - IDS_IP_DATAG_FWD " Datagrams Forwarded = %lu\n" - IDS_IP_UNKNOWN_PRO_REC " Unknown Protocols Received = %lu\n" - IDS_IP_REC_PACK_DISCARD " Received Packets Discarded = %lu\n" - IDS_IP_REC_PACK_DELIVER " Received Packets Delivered = %lu\n" - IDS_IP_OUT_REQUEST " Output Requests = %lu\n" - IDS_IP_ROUTE_DISCARD " Routing Discards = %lu\n" - IDS_IP_DISCARD_OUT_PACK " Discarded Output Packets = %lu\n" - IDS_IP_OUT_PACKET_NO_ROUTE " Output Packets No Route = %lu\n" - IDS_IP_REASSEMBLE_REQUIRED " Reassembly Required = %lu\n" - IDS_IP_REASSEMBLE_SUCCESS " Reassembly Succesful = %lu\n" - IDS_IP_REASSEMBLE_FAILURE " Reassembly Failures = %lu\n" - IDS_IP_DATAG_FRAG_SUCCESS " Datagrams Successfully Fragmented = %lu\n" - IDS_IP_DATAG_FRAG_FAILURE " Datagrams Failing Fragmentation = %lu\n" - IDS_IP_DATAG_FRAG_CREATE " Fragments Created = %lu\n" + IDS_IP_PACK_REC " Packets Received = %lu\n" + IDS_IP_HEAD_REC_ERROR " Received Header Errors = %lu\n" + IDS_IP_ADDR_REC_ERROR " Received Address Errors = %lu\n" + IDS_IP_DATAG_FWD " Datagrams Forwarded = %lu\n" + IDS_IP_UNKNOWN_PRO_REC " Unknown Protocols Received = %lu\n" + IDS_IP_REC_PACK_DISCARD " Received Packets Discarded = %lu\n" + IDS_IP_REC_PACK_DELIVER " Received Packets Delivered = %lu\n" + IDS_IP_OUT_REQUEST " Output Requests = %lu\n" + IDS_IP_ROUTE_DISCARD " Routing Discards = %lu\n" + IDS_IP_DISCARD_OUT_PACK " Discarded Output Packets = %lu\n" + IDS_IP_OUT_PACKET_NO_ROUTE " Output Packet No Route = %lu\n" + IDS_IP_REASSEMBLE_REQUIRED " Reassembly Required = %lu\n" + IDS_IP_REASSEMBLE_SUCCESS " Reassembly Successful = %lu\n" + IDS_IP_REASSEMBLE_FAILURE " Reassembly Failures = %lu\n" + IDS_IP_DATAG_FRAG_SUCCESS " Datagrams Successfully Fragmented = %lu\n" + IDS_IP_DATAG_FRAG_FAILURE " Datagrams Failing Fragmentation = %lu\n" + IDS_IP_DATAG_FRAG_CREATE " Fragments Created = %lu\n" END STRINGTABLE BEGIN IDS_ICMP4_STAT_HEADER "\nICMPv4 Statistics\n\n" IDS_ICMP_THEADER " Received Sent\n" - IDS_ICMP_MSG " Messages %-11lu %lu\n" - IDS_ICMP_ERROR " Errors %-11lu %lu\n" - IDS_ICMP_DEST_UNREACH " Destination Unreachable %-11lu %lu\n" - IDS_ICMP_TIME_EXCEED " Time Exceeded %-11lu %lu\n" - IDS_ICMP_PARAM_PROBLEM " Parameter Problems %-11lu %lu\n" - IDS_ICMP_SRC_QUENCHES " Source Quenches %-11lu %lu\n" - IDS_ICMP_REDIRECT " Redirects %-11lu %lu\n" - IDS_ICMP_ECHO " Echos %-11lu %lu\n" - IDS_ICMP_ECHO_REPLY " Echo Replies %-11lu %lu\n" - IDS_ICMP_TIMESTAMP " Timestamps %-11lu %lu\n" - IDS_ICMP_TIMESTAMP_REPLY " Timestamp Replies %-11lu %lu\n" - IDS_ICMP_ADDRESSS_MASK " Address Masks %-11lu %lu\n" - IDS_ICMP_ADDRESSS_MASK_REPLY " Address Mask Replies %-11lu %lu\n" + IDS_ICMP_MSG " Messages %-11lu %-10lu\n" + IDS_ICMP_ERROR " Errors %-11lu %-10lu\n" + IDS_ICMP_DEST_UNREACH " Destination Unreachable %-11lu %-10lu\n" + IDS_ICMP_TIME_EXCEED " Time Exceeded %-11lu %-10lu\n" + IDS_ICMP_PARAM_PROBLEM " Parameter Problems %-11lu %-10lu\n" + IDS_ICMP_SRC_QUENCHES " Source Quenches %-11lu %-10lu\n" + IDS_ICMP_REDIRECT " Redirects %-11lu %-10lu\n" + IDS_ICMP_ECHO " Echos %-11lu %-10lu\n" + IDS_ICMP_ECHO_REPLY " Echo Replies %-11lu %-10lu\n" + IDS_ICMP_TIMESTAMP " Timestamps %-11lu %-10lu\n" + IDS_ICMP_TIMESTAMP_REPLY " Timestamp Replies %-11lu %-10lu\n" + IDS_ICMP_ADDRESSS_MASK " Address Masks %-11lu %-10lu\n" + IDS_ICMP_ADDRESSS_MASK_REPLY " Address Mask Replies %-11lu %-10lu\n" END STRINGTABLE BEGIN IDS_TCP4_HEADER "\nTCP Statistics for IPv4\n\n" - IDS_TCP_ACTIVE_OPEN " Active Opens = %lu\n" - IDS_TCP_PASS_OPEN " Passive Opens = %lu\n" - IDS_TCP_FAIL_CONNECT " Failed Connection Attempts = %lu\n" - IDS_TCP_RESET_CONNECT " Reset Connections = %lu\n" - IDS_TCP_CURRENT_CONNECT " Current Connections = %lu\n" - IDS_TCP_SEG_RECEIVE " Segments Received = %lu\n" - IDS_TCP_SEG_SENT " Segments Sent = %lu\n" - IDS_TCP_SEG_RETRANSMIT " Segments Retransmitted = %lu\n" + IDS_TCP_ACTIVE_OPEN " Active Opens = %lu\n" + IDS_TCP_PASS_OPEN " Passive Opens = %lu\n" + IDS_TCP_FAIL_CONNECT " Failed Connection Attempts = %lu\n" + IDS_TCP_RESET_CONNECT " Reset Connections = %lu\n" + IDS_TCP_CURRENT_CONNECT " Current Connections = %lu\n" + IDS_TCP_SEG_RECEIVE " Segments Received = %lu\n" + IDS_TCP_SEG_SENT " Segments Sent = %lu\n" + IDS_TCP_SEG_RETRANSMIT " Segments Retransmitted = %lu\n" END STRINGTABLE BEGIN IDS_UDP_IP4_HEADER "\nUDP Statistics for IPv4\n\n" - IDS_UDP_DATAG_RECEIVE " Datagrams Received = %lu\n" - IDS_UDP_NO_PORT " No Ports = %lu\n" - IDS_UDP_RECEIVE_ERROR " Receive Errors = %lu\n" - IDS_UDP_DATAG_SEND " Datagrams Sent = %lu\n" + IDS_UDP_DATAG_RECEIVE " Datagrams Received = %lu\n" + IDS_UDP_NO_PORT " No Ports = %lu\n" + IDS_UDP_RECEIVE_ERROR " Receive Errors = %lu\n" + IDS_UDP_DATAG_SEND " Datagrams Sent = %lu\n" END STRINGTABLE BEGIN IDS_ETHERNET_INTERFACE_STAT "Interface Statistics\n\n" IDS_ETHERNET_THEADER " Received Sent\n\n" - IDS_ETHERNET_BYTES " Bytes %14lu %15lu\n" - IDS_ETHERNET_UNICAST_PACKET " Unicast packets %14lu %15lu\n" - IDS_ETHERNET_NON_UNICAST_PACKET " Non-unicast packets %14lu %15lu\n" - IDS_ETHERNET_DISCARD " Discards %14lu %15lu\n" - IDS_ETHERNET_ERROR " Errors %14lu %15lu\n" - IDS_ETHERNET_UNKNOWN " Unknown Protocols %14lu\n" + IDS_ETHERNET_BYTES "Bytes %14lu %15lu\n" + IDS_ETHERNET_UNICAST_PACKET "Unicast packets %14lu %15lu\n" + IDS_ETHERNET_NON_UNICAST_PACKET "Non-unicast packets %14lu %15lu\n" + IDS_ETHERNET_DISCARD "Discards %14lu %15lu\n" + IDS_ETHERNET_ERROR "Errors %14lu %15lu\n" + IDS_ETHERNET_UNKNOWN "Unknown protocols %14lu\n" END STRINGTABLE diff --git a/base/applications/network/netstat/netstat.c b/base/applications/network/netstat/netstat.c index 97a843b143d..bee7f834fd0 100644 --- a/base/applications/network/netstat/netstat.c +++ b/base/applications/network/netstat/netstat.c @@ -8,7 +8,7 @@ /* * TODO: * sort function return values. - * implement -b, -o and -v + * implement -b, -t and -v * clean up GetIpHostName * command line parser needs more work */ @@ -88,6 +88,8 @@ BOOL ParseCmdline(int argc, wchar_t* argv[]) bDoShowAllCons = TRUE; break; case L'b': + // UNIMPLEMENTED. + ConPuts(StdErr, L"'b' option is FIXME (Accepted option though unimplemented feature).\n"); bDoShowProcName = TRUE; break; case L'e': @@ -96,6 +98,9 @@ BOOL ParseCmdline(int argc, wchar_t* argv[]) case L'n': bDoShowNumbers = TRUE; break; + case L'o': + bDoShowProcessId = TRUE; + break; case L'p': bDoShowProtoCons = TRUE; Proto = argv[i+1]; @@ -109,7 +114,7 @@ BOOL ParseCmdline(int argc, wchar_t* argv[]) Protocol = UDP; else { - ConResPuts(StdOut, IDS_USAGE); + ConResPuts(StdErr, IDS_USAGE); return FALSE; } break; @@ -119,16 +124,17 @@ BOOL ParseCmdline(int argc, wchar_t* argv[]) case L's': bDoShowProtoStats = TRUE; break; - case L'o': - bDoShowProcessId = TRUE; + case L't': + // UNIMPLEMENTED. + ConPuts(StdErr, L"'t' option is FIXME (Accepted option though unimplemented feature).\n"); break; case L'v': - // FIXME! - ConPuts(StdOut, L"got v\n"); + // UNIMPLEMENTED. + ConPuts(StdErr, L"'v' option is FIXME (Accepted option though unimplemented feature).\n"); bDoDispSeqComp = TRUE; break; default : - ConResPuts(StdOut, IDS_USAGE); + ConResPuts(StdErr, IDS_USAGE); return FALSE; } } @@ -142,7 +148,7 @@ BOOL ParseCmdline(int argc, wchar_t* argv[]) } // else // { -// ConResPrintf(StdOut, IDS_USAGE); +// ConResPrintf(StdErr, IDS_USAGE); // return FALSE; // } } @@ -169,6 +175,7 @@ BOOL DisplayOutput(VOID) { if (bNoOptions) { + ConResPuts(StdOut, IDS_ACTIVE_CONNECT); DisplayTableHeader(); return ShowTcpTable(); }

4 years, 10 months

[reactos] 01/01: [BOOT][SHELL32][INCLUDE] Support 'SuperHidden' files (#2102)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5734570a1514a0068950d… commit 5734570a1514a0068950d1fef98b844e0d034c0b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 29 15:14:18 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 29 15:14:18 2019 +0900 [BOOT][SHELL32][INCLUDE] Support 'SuperHidden' files (#2102) PR #2101 shows desktop.ini files on Desktop. I want to hide them. - Add "ShowSuperHidden" setting to Explorer. - Add SHCONTF_INCLUDESUPERHIDDEN flag. - Support SHCONTF_INCLUDESUPERHIDDEN in Explorer. CORE-10045 --- boot/bootdata/hivedef.inf | 1 + dll/win32/shell32/CDefView.cpp | 39 ++++++++++++++++++--------------- dll/win32/shell32/folders/CFSFolder.cpp | 10 +++++++-- sdk/include/psdk/shobjidl.idl | 7 +++++- 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 8346f145159..49c7b8bd11e 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1892,6 +1892,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ListviewShad HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","HideFileExt",0x00010003,0x00000000 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","StartMenuLogoff",0x00010003,0x00000001 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","Hidden",0x00010003,1 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ShowSuperHidden",0x00010003,0 ; ComDlg32 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ComDlg32",,0x00000012 diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 9dc6bc98110..608ada85bf4 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -908,29 +908,32 @@ HRESULT CDefView::FillList() DWORD dwFetched; HRESULT hRes; HDPA hdpa; - HKEY hKey; DWORD dFlags = SHCONTF_NONFOLDERS | SHCONTF_FOLDERS; + DWORD dwValue, cbValue; TRACE("%p\n", this); /* determine if there is a setting to show all the hidden files/folders */ - if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - DWORD dataLength, flagVal; - - dataLength = sizeof(flagVal); - if (RegQueryValueExW(hKey, L"Hidden", NULL, NULL, (LPBYTE)&flagVal, &dataLength) == ERROR_SUCCESS) - { - /* if the value is 1, then show all hidden files/folders */ - if (flagVal == 1) - { - dFlags |= SHCONTF_INCLUDEHIDDEN; - m_ListView.SendMessageW(LVM_SETCALLBACKMASK, LVIS_CUT, 0); - } - } - - /* close the key */ - RegCloseKey(hKey); + dwValue = 1; + cbValue = sizeof(dwValue); + SHGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", + L"Hidden", NULL, &dwValue, &cbValue); + if (dwValue == 1) + { + dFlags |= SHCONTF_INCLUDEHIDDEN; + m_ListView.SendMessageW(LVM_SETCALLBACKMASK, LVIS_CUT, 0); + } + + dwValue = 0; + cbValue = sizeof(dwValue); + SHGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", + L"ShowSuperHidden", NULL, &dwValue, &cbValue); + if (dwValue) + { + dFlags |= SHCONTF_INCLUDESUPERHIDDEN; + m_ListView.SendMessageW(LVM_SETCALLBACKMASK, LVIS_CUT, 0); } /* get the itemlist from the shfolder */ diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index 493eeeafa49..d0aee2faccf 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -391,10 +391,16 @@ HRESULT WINAPI CFileSysEnum::Initialize(LPWSTR lpszPath, DWORD dwFlags) { BOOL findFinished = FALSE; +#define HIDDEN FILE_ATTRIBUTE_HIDDEN +#define SUPER_HIDDEN (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM) + do { - if ( !(stffile.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) - || (dwFlags & SHCONTF_INCLUDEHIDDEN) ) + if ((stffile.dwFileAttributes & HIDDEN) == 0 || + ((dwFlags & SHCONTF_INCLUDEHIDDEN) && + (stffile.dwFileAttributes & SUPER_HIDDEN) == HIDDEN) || + ((dwFlags & SHCONTF_INCLUDESUPERHIDDEN) && + (stffile.dwFileAttributes & SUPER_HIDDEN) == SUPER_HIDDEN)) { LPITEMIDLIST pidl = NULL; diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index 1fa2e3940b5..a94f1a9f4c6 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -176,7 +176,12 @@ interface IShellFolder : IUnknown SHCONTF_INIT_ON_FIRST_NEXT = 256, SHCONTF_NETPRINTERSRCH = 512, SHCONTF_SHAREABLE = 1024, - SHCONTF_STORAGE = 2048 + SHCONTF_STORAGE = 2048, + SHCONTF_NAVIGATION_ENUM = 0x01000, + SHCONTF_FASTITEMS = 0x02000, + SHCONTF_FLATLIST = 0x04000, + SHCONTF_ENABLE_ASYNC = 0x08000, + SHCONTF_INCLUDESUPERHIDDEN = 0x10000 }; typedef DWORD SHCONTF;

4 years, 10 months

[reactos] 01/01: [SHELL32] Add desktop.ini more to some folders (#2101)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c272a9017955f3bd4ac3… commit 2c272a9017955f3bd4ac3466aeab449acdcf36c7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 29 14:40:04 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 29 14:40:04 2019 +0900 [SHELL32] Add desktop.ini more to some folders (#2101) Provides special icons for special folders by adding desktop.ini. CORE-10045 --- dll/win32/shell32/CSendToMenu.cpp | 2 +- dll/win32/shell32/lang/bg-BG.rc | 1 + dll/win32/shell32/lang/ca-ES.rc | 3 ++- dll/win32/shell32/lang/cs-CZ.rc | 3 ++- dll/win32/shell32/lang/da-DK.rc | 1 + dll/win32/shell32/lang/de-DE.rc | 1 + dll/win32/shell32/lang/el-GR.rc | 3 ++- dll/win32/shell32/lang/en-GB.rc | 3 ++- dll/win32/shell32/lang/en-US.rc | 3 ++- dll/win32/shell32/lang/es-ES.rc | 1 + dll/win32/shell32/lang/et-EE.rc | 3 ++- dll/win32/shell32/lang/fi-FI.rc | 1 + dll/win32/shell32/lang/fr-FR.rc | 1 + dll/win32/shell32/lang/he-IL.rc | 1 + dll/win32/shell32/lang/hi-IN.rc | 1 + dll/win32/shell32/lang/hu-HU.rc | 3 ++- dll/win32/shell32/lang/id-ID.rc | 1 + dll/win32/shell32/lang/it-IT.rc | 1 + dll/win32/shell32/lang/ja-JP.rc | 3 ++- dll/win32/shell32/lang/ko-KR.rc | 3 ++- dll/win32/shell32/lang/nl-NL.rc | 3 ++- dll/win32/shell32/lang/no-NO.rc | 1 + dll/win32/shell32/lang/pl-PL.rc | 1 + dll/win32/shell32/lang/pt-BR.rc | 1 + dll/win32/shell32/lang/pt-PT.rc | 1 + dll/win32/shell32/lang/ro-RO.rc | 1 + dll/win32/shell32/lang/ru-RU.rc | 1 + dll/win32/shell32/lang/sk-SK.rc | 1 + dll/win32/shell32/lang/sl-SI.rc | 3 ++- dll/win32/shell32/lang/sq-AL.rc | 1 + dll/win32/shell32/lang/sv-SE.rc | 3 ++- dll/win32/shell32/lang/tr-TR.rc | 1 + dll/win32/shell32/lang/uk-UA.rc | 1 + dll/win32/shell32/lang/zh-CN.rc | 3 ++- dll/win32/shell32/lang/zh-TW.rc | 3 ++- dll/win32/shell32/shresdef.h | 1 + dll/win32/shell32/wine/shellpath.c | 35 +++++++++++++++++++++-------------- 37 files changed, 71 insertions(+), 29 deletions(-) diff --git a/dll/win32/shell32/CSendToMenu.cpp b/dll/win32/shell32/CSendToMenu.cpp index 6c67707534e..9e9fbe8afeb 100644 --- a/dll/win32/shell32/CSendToMenu.cpp +++ b/dll/win32/shell32/CSendToMenu.cpp @@ -303,7 +303,7 @@ CSendToMenu::QueryContextMenu(HMENU hMenu, UINT cItems = InsertSendToItems(hSubMenu, idCmdFirst, 0); - CStringW strSendTo(MAKEINTRESOURCEW(IDS_SENDTO)); + CStringW strSendTo(MAKEINTRESOURCEW(IDS_SENDTO_MENU)); MENUITEMINFOW mii = { sizeof(mii) }; mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE | MIIM_SUBMENU; diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 9a9d63989bc..f04caa795dc 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -772,6 +772,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index f442d13a2a4..0a844310342 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -817,7 +818,7 @@ BEGIN IDS_FAVORITES "Favorites" IDS_STARTUP "Start Menu\\Programs\\StartUp" IDS_RECENT "Recent" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menu" IDS_MYMUSIC "My Music" IDS_MYVIDEO "My Videos" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index e593800de32..4a22af175e6 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -777,6 +777,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Složku '%1' nebylo možné vytvořit" IDS_CREATEFOLDER_CAPTION "Složku nebylo možné vytvořit" @@ -823,7 +824,7 @@ BEGIN IDS_FAVORITES "Oblíbené" IDS_STARTUP "Nabídka Start\\Programy\\Po spuštění" IDS_RECENT "Poslední dokumenty" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "Nabídka Start" IDS_MYMUSIC "Hudba" IDS_MYVIDEO "Filmy" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index d9605986d8c..22fc8626ab9 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -777,6 +777,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 0351e32a5c3..624d2d8ce88 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -772,6 +772,7 @@ BEGIN IDS_DISCONNECT "Trennen" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED " Der Ordner kann nicht erstellt werden '%1'" IDS_CREATEFOLDER_CAPTION " Der Ordner kann nicht erstellt werden." diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 497dafe7ab5..4ace3aa836e 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -817,7 +818,7 @@ BEGIN IDS_FAVORITES "Favorites" IDS_STARTUP "Start Menu\\Programs\\StartUp" IDS_RECENT "Recent" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menu" IDS_MYMUSIC "My Music" IDS_MYVIDEO "My Videos" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index b7c7f4517bc..767c0bb8ce8 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -817,7 +818,7 @@ BEGIN IDS_FAVORITES "Favorites" IDS_STARTUP "Start Menu\\Programs\\StartUp" IDS_RECENT "Recent" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menu" IDS_MYMUSIC "My Music" IDS_MYVIDEO "My Videos" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index c13b373e50c..3abbaa21a45 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -817,7 +818,7 @@ BEGIN IDS_FAVORITES "Favorites" IDS_STARTUP "Start Menu\\Programs\\StartUp" IDS_RECENT "Recent" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menu" IDS_MYMUSIC "My Music" IDS_MYVIDEO "My Videos" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index dac44bafc0a..45eeb3fba71 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -779,6 +779,7 @@ BEGIN IDS_DISCONNECT "Desconectar" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "No se pudo crear la carpeta '%1'" IDS_CREATEFOLDER_CAPTION "No se pudo crear la carpeta" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 1e376de4dcb..644a1bc77ff 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -778,6 +778,7 @@ BEGIN IDS_DISCONNECT "Katkesta ühendus" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Ei saa luua kausta '%1'" IDS_CREATEFOLDER_CAPTION "Ei saa kausta luua" @@ -824,7 +825,7 @@ BEGIN IDS_FAVORITES "Lemmikud" IDS_STARTUP "Start Menu\\Programs\\StartUp" IDS_RECENT "Hiljutised" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menüü" IDS_MYMUSIC "Minu muusika" IDS_MYVIDEO "Minu videod" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 854d836a4e2..3f37a24fcb8 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 0d32521b8c0..d8856c9bbb8 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Déconnecter" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier '%1'" IDS_CREATEFOLDER_CAPTION "Impossible de créer un dossier" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 603132672c2..3b4f96d8213 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -773,6 +773,7 @@ BEGIN IDS_DISCONNECT "נתק" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 8f359fb58d0..4051fa022d8 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "डिस्कनेक्ट" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "फ़ोल्डर '%1' बनाने में असमर्थ" IDS_CREATEFOLDER_CAPTION "फ़ोल्डर बनाने में असमर्थ" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 34857dfb04a..3d0cd95cea6 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -817,7 +818,7 @@ BEGIN IDS_FAVORITES "Kedvencek" IDS_STARTUP "Start Menu\\Programs\\Automatikus indítás" /* MS style: Indítópult */ IDS_RECENT "Recent" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menu" IDS_MYMUSIC "Zenék" IDS_MYVIDEO "Videók" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 5aeb4d1ae99..659f15172c4 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Putuskan" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Tidak bisa membuat folder folder '%1'" IDS_CREATEFOLDER_CAPTION "Tidak bisa membuat folder" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index da8b5cbb46e..a8d1a685984 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 1c6ceba915f..dd114ce8cd2 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -768,6 +768,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません" IDS_CREATEFOLDER_CAPTION "フォルダを作成できません" @@ -814,7 +815,7 @@ BEGIN IDS_FAVORITES "お気に入り" IDS_STARTUP "スタートメニュー\\プログラム\\スタートアップ" IDS_RECENT "最近使ったドキュメント" - IDS_SENDTO "送る(&N)" + IDS_SENDTO "送る" IDS_STARTMENU "スタートメニュー" IDS_MYMUSIC "マイミュージック" IDS_MYVIDEO "マイビデオ" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index e22bff38c38..44e14519876 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -817,7 +818,7 @@ BEGIN IDS_FAVORITES "Favorites" IDS_STARTUP "Start Menu\\Programs\\StartUp" IDS_RECENT "Recent" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menu" IDS_MYMUSIC "My Music" IDS_MYVIDEO "My Videos" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index fc734cac927..556f77549e7 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -817,7 +818,7 @@ BEGIN IDS_FAVORITES "Favorites" IDS_STARTUP "Start Menu\\Programs\\StartUp" IDS_RECENT "Recent" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menu" IDS_MYMUSIC "My Music" IDS_MYVIDEO "My Videos" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 2b8662a8db1..ef7139eb566 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 46ec68d8480..c74d513f98a 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -776,6 +776,7 @@ BEGIN IDS_DISCONNECT "Odłącz" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Nie można utworzyć folderu '%1'" IDS_CREATEFOLDER_CAPTION "Nie można utworzyć folderu" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 26eaad64d1a..ac3d16a51a9 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 7e9d91f3ede..fb8fd3f93f9 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Desligar" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Impossivel de criar pasta '%1'" IDS_CREATEFOLDER_CAPTION "Impossivel de criar pasta" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 655ed748ee5..7b6691343fa 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -773,6 +773,7 @@ BEGIN IDS_DISCONNECT "Deconectea&ză" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Nu poate fi creat un dosar cu numele „%1”" IDS_CREATEFOLDER_CAPTION "Nu poate fi creat dosar" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 19e432ddef6..d0a826765b4 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -778,6 +778,7 @@ BEGIN IDS_DISCONNECT "Отсоединить" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Невозможно создать папку '%1'" IDS_CREATEFOLDER_CAPTION "Невозможно создать папку" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 26723a857e4..3b6425e9f50 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index e4fba05e92a..7156fc59143 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" @@ -817,7 +818,7 @@ BEGIN IDS_FAVORITES "Favorites" IDS_STARTUP "Start Menu\\Programs\\StartUp" IDS_RECENT "Recent" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menu" IDS_MYMUSIC "My Music" IDS_MYVIDEO "My Videos" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index e1cef58e5cb..25e327389f7 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -775,6 +775,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index ae0836d3bd4..a8a041b0612 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Kunde inte skapa mappen '%1'" IDS_CREATEFOLDER_CAPTION "Kunde inte skapa mapp" @@ -817,7 +818,7 @@ BEGIN IDS_FAVORITES "Favoriter" IDS_STARTUP "Start-meny\\Program\\Autostart" IDS_RECENT "Tidigare" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "Start-meny" IDS_MYMUSIC "Min musik" IDS_MYVIDEO "Mina videoklipp" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 946d1784f93..137f26b50c6 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -773,6 +773,7 @@ BEGIN IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED """%1"" dizini oluşturulamıyor." IDS_CREATEFOLDER_CAPTION "Dizin Oluşturulamıyor" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index d8c5fd58361..3a36763d514 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -771,6 +771,7 @@ BEGIN IDS_DISCONNECT "Відключити" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "Не вдалося створити папку '%1'" IDS_CREATEFOLDER_CAPTION "Не вдалося створити папку" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 8f08b218125..23253b17f70 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -779,6 +779,7 @@ BEGIN IDS_DISCONNECT "断开" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "无法创建文件夹 '%1'" IDS_CREATEFOLDER_CAPTION "无法创建文件夹" @@ -827,7 +828,7 @@ BEGIN IDS_FAVORITES "收藏夹" IDS_STARTUP "「开始」菜单\\程序\\启动" IDS_RECENT "Recent" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "「开始」菜单" IDS_MYMUSIC "我的音乐" IDS_MYVIDEO "我的视频" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index ce149f33525..e5388754625 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -780,6 +780,7 @@ BEGIN IDS_DISCONNECT "中斷" IDS_OPENFILELOCATION "Open f&ile location" IDS_DESKLINK "Desktop (Create shortcut)" + IDS_SENDTO_MENU "Se&nd To" IDS_CREATEFOLDER_DENIED "無法建立資料夾 '%1'" IDS_CREATEFOLDER_CAPTION "無法建立資料夾" @@ -828,7 +829,7 @@ BEGIN IDS_FAVORITES "我的最愛" IDS_STARTUP "「開始」功能表\\程式\\啟動" IDS_RECENT "Recent" - IDS_SENDTO "Se&nd To" + IDS_SENDTO "SendTo" IDS_STARTMENU "「開始」功能表" IDS_MYMUSIC "我的音樂" IDS_MYVIDEO "我的影片" diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index d80365f94a2..875401a23f4 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -230,6 +230,7 @@ #define IDS_OPENFILELOCATION 341 #define IDS_DESKLINK 342 +#define IDS_SENDTO_MENU 343 #define IDS_MENU_EMPTY 34561 diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 1fe931f50e7..6974a4d9628 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -974,7 +974,8 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_ProgramFilesCommonX86, CSIDL_Type_CurrVer, CommonFilesDirX86W, - Program_Files_x86_Common_FilesW + Program_Files_x86_Common_FilesW, + -IDI_SHELL_PROGRAMS_FOLDER }, { /* 0x2d - CSIDL_COMMON_TEMPLATES */ &FOLDERID_CommonTemplates, @@ -2366,8 +2367,15 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( TRACE("Created missing system directory %s\n", debugstr_w(szBuildPath)); +end: + if ((nFolder & CSIDL_FLAG_CREATE) && folder == CSIDL_SENDTO) + { + DoCreateSendToFiles(szBuildPath); + } + /* create desktop.ini for custom icon */ - if (CSIDL_Data[folder].nShell32IconIndex) + if ((nFolder & CSIDL_FLAG_CREATE) && + CSIDL_Data[folder].nShell32IconIndex) { static const WCHAR s_szFormat[] = L"%%SystemRoot%%\\system32\\shell32.dll,%d"; WCHAR szIconLocation[MAX_PATH]; @@ -2397,12 +2405,6 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( SetFileAttributesW(szBuildPath, dwAttributes); } -end: - if (folder == CSIDL_SENDTO) - { - if (PathIsDirectoryEmptyW(szBuildPath)) - DoCreateSendToFiles(szBuildPath); - } TRACE("returning 0x%08x (final path is %s)\n", hr, debugstr_w(szBuildPath)); return hr; } @@ -2479,16 +2481,21 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, szValueName = &buffer[0]; } - if (RegQueryValueExW(hUserKey, szValueName, NULL, - &dwType, (LPBYTE)path, &dwPathLen) || (dwType != REG_SZ && - dwType != REG_EXPAND_SZ)) + if (!RegQueryValueExW(hUserKey, szValueName, NULL, + &dwType, (LPBYTE)path, &dwPathLen) && + (dwType == REG_SZ || dwType == REG_EXPAND_SZ)) + { + hr = SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE, + hToken, SHGFP_TYPE_CURRENT, path); + } + else { *path = '\0'; if (CSIDL_Data[folders[i]].type == CSIDL_Type_User) - _SHGetUserProfilePath(hToken, SHGFP_TYPE_DEFAULT, folders[i], + _SHGetUserProfilePath(hToken, SHGFP_TYPE_CURRENT, folders[i], path); else if (CSIDL_Data[folders[i]].type == CSIDL_Type_AllUsers) - _SHGetAllUsersProfilePath(SHGFP_TYPE_DEFAULT, folders[i], path); + _SHGetAllUsersProfilePath(SHGFP_TYPE_CURRENT, folders[i], path); else if (CSIDL_Data[folders[i]].type == CSIDL_Type_WindowsPath) { GetWindowsDirectoryW(path, MAX_PATH); @@ -2510,7 +2517,7 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, else { hr = SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE, - hToken, SHGFP_TYPE_DEFAULT, path); + hToken, SHGFP_TYPE_CURRENT, path); ret = RegSetValueExW(hKey, szValueName, 0, REG_SZ, (LPBYTE)path, (strlenW(path) + 1) * sizeof(WCHAR)); if (ret)

4 years, 10 months

[reactos] 01/01: [CMD_APITEST] Add attrib testcase (#2104)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7ef99fcc8393aa5f20fa… commit f7ef99fcc8393aa5f20fa479216576ffa4958f5a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 29 11:13:17 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 29 11:13:17 2019 +0900 [CMD_APITEST] Add attrib testcase (#2104) CORE-16284 --- modules/rostests/apitests/cmd/cmd.c | 228 +++++++++++++++++++++++++++++-- modules/rostests/apitests/cmd/testlist.c | 2 + 2 files changed, 221 insertions(+), 9 deletions(-) diff --git a/modules/rostests/apitests/cmd/cmd.c b/modules/rostests/apitests/cmd/cmd.c index f4e79cc59bd..372bf5a947d 100644 --- a/modules/rostests/apitests/cmd/cmd.c +++ b/modules/rostests/apitests/cmd/cmd.c @@ -16,6 +16,10 @@ typedef struct TEST_ENTRY const char *cmdline; BOOL bStdOutput; BOOL bStdError; + const char *OutputContains; + const char *ErrorContains; + const char *OutputNotContains; + const char *ErrorNotContains; } TEST_ENTRY; static const TEST_ENTRY s_exit_entries[] = @@ -31,19 +35,20 @@ static const TEST_ENTRY s_exit_entries[] = static const TEST_ENTRY s_echo_entries[] = { - { __LINE__, 0, "cmd /c echo", TRUE, FALSE }, - { __LINE__, 0, "cmd /c echo.", TRUE, FALSE }, + { __LINE__, 0, "cmd /c echo", TRUE, FALSE, NULL, "ECHO" }, + { __LINE__, 0, "cmd /c echo.", TRUE, FALSE, "\r\n" }, + { __LINE__, 0, "cmd /c echo ABC", TRUE, FALSE, "ABC\r\n" }, }; static const TEST_ENTRY s_cd_entries[] = { - { __LINE__, 0, "cmd /c cd \"C:\\ ", }, - { __LINE__, 0, "cmd /c cd C:/", }, + { __LINE__, 0, "cmd /c cd \"C:\\ " }, + { __LINE__, 0, "cmd /c cd C:/" }, { __LINE__, 0, "cmd /c cd \"\"", TRUE, FALSE }, { __LINE__, 0, "cmd /c cd", TRUE, FALSE }, { __LINE__, 1234, "cmd /c cd C:\\Program Files && exit 1234" }, - { __LINE__, 1234, "cmd /c cd \"C:\\ \" && exit 1234", }, - { __LINE__, 1234, "cmd /c cd \"C:\\Program Files\" && exit 1234", }, + { __LINE__, 1234, "cmd /c cd \"C:\\ \" && exit 1234" }, + { __LINE__, 1234, "cmd /c cd \"C:\\Program Files\" && exit 1234" }, { __LINE__, 1234, "cmd /c cd \"\" && exit 1234", TRUE, FALSE }, { __LINE__, 1234, "cmd /c cd \\ && exit 1234" }, }; @@ -119,6 +124,169 @@ static const TEST_ENTRY s_pushd_entries[] = { __LINE__, 1234, "cmd /c pushd \"C:\\\" && popd && exit 1234" }, }; +static const TEST_ENTRY s_attrib_entries[] = +{ + /* invalid-path.txt */ + { __LINE__, 0, "attrib invalid-path.txt", TRUE, FALSE }, + { __LINE__, 0, "attrib +H invalid-path.txt", TRUE, FALSE }, + { __LINE__, 0, "attrib -H invalid-path.txt", TRUE, FALSE }, + + /* attr-test.txt */ + { __LINE__, 0, "cmd /c if exist attr-test.txt attrib -H attr-test.txt" }, + { __LINE__, 0, "cmd /c if exist attr-test.txt del /Q attr-test.txt" }, + { __LINE__, 0, "cmd /c copy NUL attr-test.txt ", TRUE, FALSE }, + { __LINE__, 0, "attrib attr-test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib +H attr-test.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib attr-test.txt", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib -H attr-test.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib attr-test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib attr-te*.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib +H attr-te*.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib attr-te*.txt", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib -H attr-te*.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib attr-te*.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "cmd /c if exist attr-test.txt attrib -H attr-test.txt" }, + { __LINE__, 0, "cmd /c if exist attr-test.txt del /Q attr-test.txt" }, + + /* /S attr-test.txt */ + { __LINE__, 0, "cmd /c if exist attr-test.txt attrib -H attr-test.txt" }, + { __LINE__, 0, "cmd /c if exist attr-test.txt del /Q attr-test.txt" }, + { __LINE__, 0, "cmd /c copy NUL attr-test.txt ", TRUE, FALSE }, + { __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S +H attr-test.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib /S -H attr-test.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S attr-te*.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S +H attr-te*.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-te*.txt", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib /S -H attr-te*.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-te*.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "cmd /c if exist attr-test.txt attrib -H attr-test.txt" }, + { __LINE__, 0, "cmd /c if exist attr-test.txt del /Q attr-test.txt" }, + + /* /S /D attr-test.txt */ + { __LINE__, 0, "cmd /c if exist attr-test.txt attrib -H attr-test.txt" }, + { __LINE__, 0, "cmd /c if exist attr-test.txt del /Q attr-test.txt" }, + { __LINE__, 0, "cmd /c copy NUL attr-test.txt ", TRUE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S /D +H attr-test.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-test.txt", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib /S /D -H attr-test.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S /D attr-te*.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S /D +H attr-te*.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-te*.txt", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib /S /D -H attr-te*.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-te*.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "cmd /c if exist attr-test.txt attrib -H attr-test.txt" }, + { __LINE__, 0, "cmd /c if exist attr-test.txt del /Q attr-test.txt" }, + + /* attr-dir, attr-dir/test.txt */ + { __LINE__, 0, "cmd /c if exist attr-dir rmdir /s /q attr-dir" }, + { __LINE__, 0, "cmd /c mkdir attr-dir", FALSE, FALSE }, + { __LINE__, 0, "cmd /c if exist attr-dir/test.txt attrib -H attr-dir/test.txt" }, + { __LINE__, 0, "cmd /c if exist attr-dir/test.txt del /Q attr-dir/test.txt" }, + { __LINE__, 1, "cmd /c copy NUL attr-dir/test.txt ", TRUE, FALSE }, + { __LINE__, 0, "attrib attr-dir/test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib +H attr-dir/test.txt", TRUE, FALSE }, + { __LINE__, 0, "attrib attr-dir/test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib -H attr-dir/test.txt", TRUE, FALSE, "test.txt" }, + { __LINE__, 0, "attrib attr-dir/test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib +H attr-dir", FALSE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib attr-dir", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib attr-dir/test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib -H attr-dir", FALSE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib attr-dir", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "cmd /c if exist attr-dir/test.txt attrib -H attr-dir/test.txt" }, + { __LINE__, 0, "cmd /c if exist attr-dir/test.txt del /Q attr-dir/test.txt" }, + { __LINE__, 0, "cmd /c if exist attr-dir rmdir /s /q attr-dir" }, + + /* attr-dir, attr-dir\\dir1 */ + { __LINE__, 0, "cmd /c if exist attr-dir rmdir /s /q attr-dir" }, + { __LINE__, 0, "cmd /c mkdir attr-dir", FALSE, FALSE }, + { __LINE__, 0, "attrib attr-dir", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "cmd /c if exist attr-dir echo OK", TRUE, FALSE, "OK" }, + { __LINE__, 0, "cmd /c mkdir attr-dir\\dir1", FALSE, FALSE }, + { __LINE__, 0, "cmd /c if exist attr-dir\\dir1 echo OK", TRUE, FALSE, "OK" }, + { __LINE__, 0, "attrib attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib +H attr-dir\\dir1", FALSE, FALSE }, + { __LINE__, 0, "attrib attr-dir\\dir1", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib -H attr-dir\\dir1", FALSE, FALSE }, + { __LINE__, 0, "attrib attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib +H attr-dir", FALSE, FALSE }, + { __LINE__, 0, "attrib attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib -H attr-dir", FALSE, FALSE }, + { __LINE__, 0, "attrib attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib +H attr-d*", TRUE, FALSE, "attr-d*" }, + { __LINE__, 0, "attrib attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib -H attr-d*", TRUE, FALSE, "attr-d*" }, + { __LINE__, 0, "attrib attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib +H attr-dir\\d*", TRUE, FALSE, "attr-dir\\d*" }, + { __LINE__, 0, "attrib attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib -H attr-dir\\d*", TRUE, FALSE, "attr-dir\\d*" }, + { __LINE__, 0, "attrib attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib -H attr-dir\\dir1", FALSE, FALSE }, + { __LINE__, 0, "attrib -H attr-dir", FALSE, FALSE }, + { __LINE__, 0, "cmd /c if exist attr-dir rmdir /s /q attr-dir" }, + + /* /S attr-dir, attr-dir\\dir1 */ + { __LINE__, 0, "cmd /c if exist attr-dir rmdir /s /q attr-dir" }, + { __LINE__, 0, "cmd /c mkdir attr-dir", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-dir", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "cmd /c if exist attr-dir echo OK", TRUE, FALSE, "OK" }, + { __LINE__, 0, "cmd /c mkdir attr-dir\\dir1", FALSE, FALSE }, + { __LINE__, 0, "cmd /c if exist attr-dir\\dir1 echo OK", TRUE, FALSE, "OK" }, + { __LINE__, 0, "attrib /S attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S +H attr-dir\\dir1", TRUE, FALSE, "attr-dir\\dir1", }, + { __LINE__, 0, "attrib /S attr-dir\\dir1", TRUE, FALSE, "attr-dir\\dir1" }, + { __LINE__, 0, "attrib /S -H attr-dir\\dir1", TRUE, FALSE, "attr-dir\\dir1" }, + { __LINE__, 0, "attrib /S attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S +H attr-dir", TRUE, FALSE, "attr-dir" }, + { __LINE__, 0, "attrib /S attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S -H attr-dir", TRUE, FALSE, "attr-dir" }, + { __LINE__, 0, "attrib /S attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S +H attr-d*", TRUE, FALSE, "attr-d*" }, + { __LINE__, 0, "attrib /S attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S -H attr-d*", TRUE, FALSE, "attr-d*" }, + { __LINE__, 0, "attrib /S attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S +H attr-dir\\d*", TRUE, FALSE, "attr-dir\\d*" }, + { __LINE__, 0, "attrib /S attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S -H attr-dir\\d*", TRUE, FALSE, "attr-dir\\d*" }, + { __LINE__, 0, "attrib /S attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S -H attr-dir\\dir1", TRUE, FALSE, "attr-dir\\dir1" }, + { __LINE__, 0, "attrib /S -H attr-dir", TRUE, FALSE, "attr-dir" }, + { __LINE__, 0, "cmd /c if exist attr-dir rmdir /s /q attr-dir" }, + + /* /S /D attr-dir, attr-dir\\dir1 */ + { __LINE__, 0, "cmd /c if exist attr-dir rmdir /s /q attr-dir" }, + { __LINE__, 0, "cmd /c mkdir attr-dir", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-dir", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "cmd /c if exist attr-dir echo OK", TRUE, FALSE, "OK" }, + { __LINE__, 0, "cmd /c mkdir attr-dir\\dir1", FALSE, FALSE }, + { __LINE__, 0, "cmd /c if exist attr-dir\\dir1 echo OK", TRUE, FALSE, "OK" }, + { __LINE__, 0, "attrib /S /D attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S /D +H attr-dir\\dir1", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-dir\\dir1", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib /S /D -H attr-dir\\dir1", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S /D +H attr-dir", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S /D -H attr-dir", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S /D +H attr-d*", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S /D -H attr-d*", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S /D +H attr-dir\\d*", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-dir\\dir1", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib /S /D -H attr-dir\\d*", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-dir\\dir1", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S /D -H attr-dir\\dir1", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D -H attr-dir", FALSE, FALSE }, + { __LINE__, 0, "cmd /c if exist attr-dir rmdir /s /q attr-dir" }, +}; + static BOOL MyDuplicateHandle(HANDLE hFile, PHANDLE phFile, BOOL bInherit) { HANDLE hProcess = GetCurrentProcess(); @@ -207,9 +375,9 @@ static void DoTestEntry(const TEST_ENTRY *pEntry) DWORD dwExitCode, dwWait; HANDLE hOutputRead = NULL; HANDLE hErrorRead = NULL; - BYTE b; DWORD dwRead; BOOL bStdOutput, bStdError; + CHAR szOut[512], szErr[512]; memset(&si, 0, sizeof(si)); si.cb = sizeof(si); @@ -238,9 +406,14 @@ static void DoTestEntry(const TEST_ENTRY *pEntry) dwExitCode = 8888; } - PeekNamedPipe(hOutputRead, &b, 1, &dwRead, NULL, NULL); + ZeroMemory(szOut, sizeof(szOut)); + PeekNamedPipe(hOutputRead, szOut, ARRAYSIZE(szOut), &dwRead, NULL, NULL); + szOut[ARRAYSIZE(szOut) - 1] = 0; bStdOutput = dwRead != 0; - PeekNamedPipe(hErrorRead, &b, 1, &dwRead, NULL, NULL); + + ZeroMemory(szErr, sizeof(szErr)); + PeekNamedPipe(hErrorRead, szErr, ARRAYSIZE(szErr), &dwRead, NULL, NULL); + szErr[ARRAYSIZE(szErr) - 1] = 0; bStdError = dwRead != 0; if (si.hStdInput) @@ -261,6 +434,34 @@ static void DoTestEntry(const TEST_ENTRY *pEntry) ok(pEntry->dwExitCode == dwExitCode, "Line %u: dwExitCode %ld vs %ld\n", pEntry->line, pEntry->dwExitCode, dwExitCode); + + if (pEntry->OutputContains) + { + ok(strstr(szOut, pEntry->OutputContains) != NULL, + "Line %u: szOut was '%s'\n", + pEntry->line, szOut); + } + + if (pEntry->ErrorContains) + { + ok(strstr(szErr, pEntry->ErrorContains) != NULL, + "Line %u: szErr was '%s'\n", + pEntry->line, szErr); + } + + if (pEntry->OutputNotContains) + { + ok(strstr(szOut, pEntry->OutputNotContains) == NULL, + "Line %u: szOut was '%s'\n", + pEntry->line, szOut); + } + + if (pEntry->ErrorNotContains) + { + ok(strstr(szErr, pEntry->ErrorNotContains) == NULL, + "Line %u: szErr was '%s'\n", + pEntry->line, szErr); + } } START_TEST(exit) @@ -298,3 +499,12 @@ START_TEST(pushd) DoTestEntry(&s_pushd_entries[i]); } } + +START_TEST(attrib) +{ + SIZE_T i; + for (i = 0; i < ARRAYSIZE(s_attrib_entries); ++i) + { + DoTestEntry(&s_attrib_entries[i]); + } +} diff --git a/modules/rostests/apitests/cmd/testlist.c b/modules/rostests/apitests/cmd/testlist.c index 07ab34a2c97..cc73f9d0805 100644 --- a/modules/rostests/apitests/cmd/testlist.c +++ b/modules/rostests/apitests/cmd/testlist.c @@ -1,6 +1,7 @@ #define STANDALONE #include <apitest.h> +extern void func_attrib(void); extern void func_cd(void); extern void func_echo(void); extern void func_exit(void); @@ -8,6 +9,7 @@ extern void func_pushd(void); const struct test winetest_testlist[] = { + { "attrib", func_attrib }, { "cd", func_cd }, { "echo", func_echo }, { "exit", func_exit },

4 years, 10 months

[reactos] 01/01: [URLMON] Delay-load advpack CORE-5007

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82b758974fdc46e167930… commit 82b758974fdc46e1679302e3d4831cb36cf959c2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Nov 28 21:40:20 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Nov 28 21:40:20 2019 +0100 [URLMON] Delay-load advpack CORE-5007 --- dll/win32/urlmon/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt index ef9c5377ab9..4021d1e1b6b 100644 --- a/dll/win32/urlmon/CMakeLists.txt +++ b/dll/win32/urlmon/CMakeLists.txt @@ -54,6 +54,7 @@ add_library(urlmon MODULE set_module_type(urlmon win32dll) target_link_libraries(urlmon uuid wine ${PSEH_LIB}) -add_importlibs(urlmon rpcrt4 propsys ole32 oleaut32 shlwapi shell32 wininet user32 advapi32 advpack kernel32_vista msvcrt kernel32 ntdll) +add_delay_importlibs(urlmon advpack) +add_importlibs(urlmon rpcrt4 propsys ole32 oleaut32 shlwapi shell32 wininet user32 advapi32 kernel32_vista msvcrt kernel32 ntdll) add_pch(urlmon precomp.h SOURCE) add_cd_file(TARGET urlmon DESTINATION reactos/system32 FOR all)

4 years, 10 months

[reactos] 01/01: [USERENV] Improve Japanese translation (again)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d7c5cf4597c5f2e80588… commit 5d7c5cf4597c5f2e80588bc5804ab0af79e2d0c8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 28 18:50:45 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 28 18:50:45 2019 +0900 [USERENV] Improve Japanese translation (again) --- dll/win32/userenv/lang/ja-JP.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/userenv/lang/ja-JP.rc b/dll/win32/userenv/lang/ja-JP.rc index d726075c611..a95bcdc216a 100644 --- a/dll/win32/userenv/lang/ja-JP.rc +++ b/dll/win32/userenv/lang/ja-JP.rc @@ -3,22 +3,22 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" - IDS_APPDATA "Application Data" + IDS_APPDATA "アプリのデータ" IDS_DESKTOP "デスクトップ" IDS_FAVORITES "お気に入り" IDS_MYDOCUMENTS "マイドキュメント" - IDS_NETHOOD "NetHood" - IDS_PRINTHOOD "PrintHood" + IDS_NETHOOD "近くのネットワーク" + IDS_PRINTHOOD "近くのプリンタ" IDS_RECENT "最近使った項目" IDS_SENDTO "送る" IDS_TEMPLATES "テンプレート" IDS_STARTMENU "スタートメニュー" IDS_PROGRAMS "スタートメニュー\\プログラム" IDS_STARTUP "スタートメニュー\\プログラム\\スタートアップ" - IDS_LOCALSETTINGS "Local Settings" - IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" - IDS_CACHE "Local Settings\\Temporary Internet Files" - IDS_HISTORY "Local Settings\\History" + IDS_LOCALSETTINGS "ローカル設定" + IDS_LOCALAPPDATA "ローカル設定\\アプリのデータ" + IDS_TEMP "ローカル設定\\Temp" + IDS_CACHE "ローカル設定\\インターネット一時ファイル" + IDS_HISTORY "ローカル設定\\履歴" IDS_COOKIES "Cookies" END

4 years, 10 months

← Newer
1
2
3
4
5
6
7
...
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 November 2019