Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 01/01: [KERNEL32_APITEST] Add a PCH.
by Amine Khaldi 13 Dec '17

13 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e00cc9728c2b2206bf304… commit e00cc9728c2b2206bf30498ac653392664d6924e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Dec 13 13:48:26 2017 +0100 [KERNEL32_APITEST] Add a PCH. --- modules/rostests/apitests/kernel32/CMakeLists.txt | 7 ++++--- modules/rostests/apitests/kernel32/Console.c | 4 +--- modules/rostests/apitests/kernel32/CreateProcess.c | 5 ++--- modules/rostests/apitests/kernel32/DefaultActCtx.c | 9 +-------- modules/rostests/apitests/kernel32/DeviceIoControl.c | 5 ++--- modules/rostests/apitests/kernel32/FindActCtxSectionStringW.c | 8 +------- modules/rostests/apitests/kernel32/FindFiles.c | 4 +--- modules/rostests/apitests/kernel32/GetComputerNameEx.c | 7 +------ modules/rostests/apitests/kernel32/GetCurrentDirectory.c | 6 +----- modules/rostests/apitests/kernel32/GetDriveType.c | 3 +-- modules/rostests/apitests/kernel32/GetModuleFileName.c | 10 ++-------- modules/rostests/apitests/kernel32/GetVolumeInformation.c | 5 +---- modules/rostests/apitests/kernel32/IsDBCSLeadByteEx.c | 8 +------- modules/rostests/apitests/kernel32/LoadLibraryExW.c | 8 +------- modules/rostests/apitests/kernel32/Mailslot.c | 5 +---- modules/rostests/apitests/kernel32/MultiByteToWideChar.c | 4 +--- modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c | 4 +--- modules/rostests/apitests/kernel32/SetConsoleWindowInfo.c | 3 +-- modules/rostests/apitests/kernel32/SetCurrentDirectory.c | 6 +----- .../rostests/apitests/kernel32/SetUnhandledExceptionFilter.c | 5 +---- modules/rostests/apitests/kernel32/TerminateProcess.c | 3 +-- modules/rostests/apitests/kernel32/TunnelCache.c | 6 +----- modules/rostests/apitests/kernel32/WideCharToMultiByte.c | 4 +--- modules/rostests/apitests/kernel32/dosdev.c | 8 +------- modules/rostests/apitests/kernel32/interlck.c | 7 +------ modules/rostests/apitests/kernel32/lstrcpynW.c | 5 +---- modules/rostests/apitests/kernel32/lstrlen.c | 5 +---- modules/rostests/apitests/kernel32/precomp.h | 11 +++++++++++ 28 files changed, 44 insertions(+), 121 deletions(-) diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 86107d733d..06edd1b9c3 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -19,6 +19,7 @@ list(APPEND SOURCE LoadLibraryExW.c lstrcpynW.c lstrlen.c + Mailslot.c MultiByteToWideChar.c PrivMoveFileIdentityW.c SetConsoleWindowInfo.c @@ -27,14 +28,14 @@ list(APPEND SOURCE TerminateProcess.c TunnelCache.c WideCharToMultiByte.c - testlist.c - Mailslot.c) + precomp.h) -add_executable(kernel32_apitest ${SOURCE}) +add_executable(kernel32_apitest ${SOURCE} testlist.c) target_link_libraries(kernel32_apitest wine ${PSEH_LIB}) set_module_type(kernel32_apitest win32cui) add_delay_importlibs(kernel32_apitest advapi32 shlwapi) add_importlibs(kernel32_apitest msvcrt kernel32 ntdll) +add_pch(kernel32_apitest precomp.h SOURCE) add_rostests_file(TARGET kernel32_apitest) list(APPEND MANIFEST_FILES diff --git a/modules/rostests/apitests/kernel32/Console.c b/modules/rostests/apitests/kernel32/Console.c index 3263291086..21dfd4b9e7 100644 --- a/modules/rostests/apitests/kernel32/Console.c +++ b/modules/rostests/apitests/kernel32/Console.c @@ -5,9 +5,7 @@ * PROGRAMMERS: Katayama Hirofumi MZ */ -#include <apitest.h> -#include <wincon.h> -#include <winnls.h> +#include "precomp.h" #define okCURSOR(hCon, c) do { \ CONSOLE_SCREEN_BUFFER_INFO __sbi; \ diff --git a/modules/rostests/apitests/kernel32/CreateProcess.c b/modules/rostests/apitests/kernel32/CreateProcess.c index a9ef26fd7d..f1d17d854e 100644 --- a/modules/rostests/apitests/kernel32/CreateProcess.c +++ b/modules/rostests/apitests/kernel32/CreateProcess.c @@ -5,10 +5,9 @@ * PROGRAMMERS: Mark Jansen */ -#include <apitest.h> -#include <ndk/rtltypes.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" +#include <ndk/rtlfuncs.h> START_TEST(CreateProcess) { diff --git a/modules/rostests/apitests/kernel32/DefaultActCtx.c b/modules/rostests/apitests/kernel32/DefaultActCtx.c index 579480459d..c5d7118e0f 100644 --- a/modules/rostests/apitests/kernel32/DefaultActCtx.c +++ b/modules/rostests/apitests/kernel32/DefaultActCtx.c @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include "precomp.h" START_TEST(DefaultActCtx) { diff --git a/modules/rostests/apitests/kernel32/DeviceIoControl.c b/modules/rostests/apitests/kernel32/DeviceIoControl.c index be3086edda..0a678997ea 100644 --- a/modules/rostests/apitests/kernel32/DeviceIoControl.c +++ b/modules/rostests/apitests/kernel32/DeviceIoControl.c @@ -5,10 +5,9 @@ * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> */ -#include <apitest.h> -#include <strsafe.h> +#include "precomp.h" + #include <winioctl.h> -#include <mountmgr.h> #include <mountdev.h> WCHAR Letter; diff --git a/modules/rostests/apitests/kernel32/FindActCtxSectionStringW.c b/modules/rostests/apitests/kernel32/FindActCtxSectionStringW.c index 7b2ba3ab67..de2a07545a 100644 --- a/modules/rostests/apitests/kernel32/FindActCtxSectionStringW.c +++ b/modules/rostests/apitests/kernel32/FindActCtxSectionStringW.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include "precomp.h" #define STRSECTION_MAGIC 0x64487353 /* dHsS */ diff --git a/modules/rostests/apitests/kernel32/FindFiles.c b/modules/rostests/apitests/kernel32/FindFiles.c index 52a031aa64..d4a0c6d69d 100644 --- a/modules/rostests/apitests/kernel32/FindFiles.c +++ b/modules/rostests/apitests/kernel32/FindFiles.c @@ -5,9 +5,7 @@ * PROGRAMMER: Hermès BÉLUSCA - MAÏTO */ -#include <apitest.h> - -#include <windows.h> +#include "precomp.h" /* * NOTE: This test supposes the following requirements: diff --git a/modules/rostests/apitests/kernel32/GetComputerNameEx.c b/modules/rostests/apitests/kernel32/GetComputerNameEx.c index 1beb70ceec..3e93165821 100644 --- a/modules/rostests/apitests/kernel32/GetComputerNameEx.c +++ b/modules/rostests/apitests/kernel32/GetComputerNameEx.c @@ -5,12 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <stdio.h> -#include <ndk/rtltypes.h> -#include <winreg.h> +#include "precomp.h" static VOID diff --git a/modules/rostests/apitests/kernel32/GetCurrentDirectory.c b/modules/rostests/apitests/kernel32/GetCurrentDirectory.c index c8aafb784a..f3dcc2620f 100644 --- a/modules/rostests/apitests/kernel32/GetCurrentDirectory.c +++ b/modules/rostests/apitests/kernel32/GetCurrentDirectory.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <stdio.h> -#include <ndk/rtltypes.h> +#include "precomp.h" static BOOLEAN diff --git a/modules/rostests/apitests/kernel32/GetDriveType.c b/modules/rostests/apitests/kernel32/GetDriveType.c index 657cf79e16..b6db1d9296 100644 --- a/modules/rostests/apitests/kernel32/GetDriveType.c +++ b/modules/rostests/apitests/kernel32/GetDriveType.c @@ -1,5 +1,4 @@ -#include <apitest.h> -#include <strsafe.h> +#include "precomp.h" #define IS_DRIVE_TYPE_VALID(type) ((type) != DRIVE_UNKNOWN && (type) != DRIVE_NO_ROOT_DIR) diff --git a/modules/rostests/apitests/kernel32/GetModuleFileName.c b/modules/rostests/apitests/kernel32/GetModuleFileName.c index 43c5ec338e..ba1572c920 100644 --- a/modules/rostests/apitests/kernel32/GetModuleFileName.c +++ b/modules/rostests/apitests/kernel32/GetModuleFileName.c @@ -5,14 +5,8 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <stdio.h> -#include <winreg.h> -#include <winnls.h> +#include "precomp.h" + #include <shlwapi.h> static diff --git a/modules/rostests/apitests/kernel32/GetVolumeInformation.c b/modules/rostests/apitests/kernel32/GetVolumeInformation.c index 7d2cf8bf3f..5184f1c9c3 100644 --- a/modules/rostests/apitests/kernel32/GetVolumeInformation.c +++ b/modules/rostests/apitests/kernel32/GetVolumeInformation.c @@ -5,10 +5,7 @@ * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <stdio.h> +#include "precomp.h" static VOID TestGetVolumeInformationA(VOID) diff --git a/modules/rostests/apitests/kernel32/IsDBCSLeadByteEx.c b/modules/rostests/apitests/kernel32/IsDBCSLeadByteEx.c index 77548e5011..f7fcfdba44 100644 --- a/modules/rostests/apitests/kernel32/IsDBCSLeadByteEx.c +++ b/modules/rostests/apitests/kernel32/IsDBCSLeadByteEx.c @@ -5,13 +5,7 @@ * PROGRAMMER: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <stdio.h> -#include <winnls.h> +#include "precomp.h" #define MAX_RANGE 4 diff --git a/modules/rostests/apitests/kernel32/LoadLibraryExW.c b/modules/rostests/apitests/kernel32/LoadLibraryExW.c index 2e8d6a114f..7e32f18468 100644 --- a/modules/rostests/apitests/kernel32/LoadLibraryExW.c +++ b/modules/rostests/apitests/kernel32/LoadLibraryExW.c @@ -16,13 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include "precomp.h" HANDLE _CreateActCtxFromFile(LPCWSTR FileName, int line); VOID _ActivateCtx(HANDLE h, ULONG_PTR *cookie, int line); diff --git a/modules/rostests/apitests/kernel32/Mailslot.c b/modules/rostests/apitests/kernel32/Mailslot.c index 4cd701f2f9..d2cc5d1a7b 100644 --- a/modules/rostests/apitests/kernel32/Mailslot.c +++ b/modules/rostests/apitests/kernel32/Mailslot.c @@ -5,10 +5,7 @@ * PROGRAMMER: Nikita Pechenkin (n.pechenkin(a)mail.ru) */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <stdio.h> +#include "precomp.h" #define LMS TEXT("\\\\.\\mailslot\\rostest_slot") #define MSG (0x50DA) diff --git a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c index 00242a6d11..120ce60f90 100644 --- a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c +++ b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c @@ -5,9 +5,7 @@ * PROGRAMMER: Mike "tamlin" Nordell */ -#include <apitest.h> - -#include <winnls.h> +#include "precomp.h" START_TEST(MultiByteToWideChar) { diff --git a/modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c b/modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c index 39fd0a1ef1..fcc557c496 100644 --- a/modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c +++ b/modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c @@ -5,11 +5,9 @@ * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> */ -#include <apitest.h> +#include "precomp.h" -#define WIN32_NO_STATUS #include <ndk/iofuncs.h> -#include <ndk/rtltypes.h> static const WCHAR FileName[] = L"TestFile.xxx"; static const CHAR FileNameA[] = "TestFile.xxx"; diff --git a/modules/rostests/apitests/kernel32/SetConsoleWindowInfo.c b/modules/rostests/apitests/kernel32/SetConsoleWindowInfo.c index 763e99afd3..46db2fa592 100644 --- a/modules/rostests/apitests/kernel32/SetConsoleWindowInfo.c +++ b/modules/rostests/apitests/kernel32/SetConsoleWindowInfo.c @@ -5,8 +5,7 @@ * PROGRAMMER: Hermes Belusca-Maito */ -#include <apitest.h> -#include <wincon.h> +#include "precomp.h" static VOID ResizeTextConsole( diff --git a/modules/rostests/apitests/kernel32/SetCurrentDirectory.c b/modules/rostests/apitests/kernel32/SetCurrentDirectory.c index c19b968afa..f6f862dab0 100644 --- a/modules/rostests/apitests/kernel32/SetCurrentDirectory.c +++ b/modules/rostests/apitests/kernel32/SetCurrentDirectory.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <stdio.h> -#include <ndk/rtltypes.h> +#include "precomp.h" static VOID diff --git a/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c b/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c index ddf6b3f509..fb7e9f7381 100644 --- a/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c +++ b/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c @@ -5,11 +5,8 @@ * PROGRAMMER: Mike "tamlin" Nordell */ -#include <apitest.h> +#include "precomp.h" -#define WIN32_NO_STATUS -#include <stdio.h> -#include <ndk/rtltypes.h> #include <xmmintrin.h> /* diff --git a/modules/rostests/apitests/kernel32/TerminateProcess.c b/modules/rostests/apitests/kernel32/TerminateProcess.c index 1120bea773..cdcfc432b5 100644 --- a/modules/rostests/apitests/kernel32/TerminateProcess.c +++ b/modules/rostests/apitests/kernel32/TerminateProcess.c @@ -5,10 +5,9 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> +#include "precomp.h" #include <ndk/obfuncs.h> -#include <strsafe.h> static HANDLE diff --git a/modules/rostests/apitests/kernel32/TunnelCache.c b/modules/rostests/apitests/kernel32/TunnelCache.c index 74e2e5a2dc..23632a7157 100644 --- a/modules/rostests/apitests/kernel32/TunnelCache.c +++ b/modules/rostests/apitests/kernel32/TunnelCache.c @@ -5,11 +5,7 @@ * PROGRAMMER: Pierre Schweitzer <pierre.schweitzer(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <stdio.h> -#include <ndk/rtlfuncs.h> +#include "precomp.h" static void diff --git a/modules/rostests/apitests/kernel32/WideCharToMultiByte.c b/modules/rostests/apitests/kernel32/WideCharToMultiByte.c index 34881ce554..80b56a6a2e 100644 --- a/modules/rostests/apitests/kernel32/WideCharToMultiByte.c +++ b/modules/rostests/apitests/kernel32/WideCharToMultiByte.c @@ -5,9 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <winnls.h> +#include "precomp.h" #define ntv6(x) (LOBYTE(LOWORD(GetVersion())) >= 6 ? (x) : 0) diff --git a/modules/rostests/apitests/kernel32/dosdev.c b/modules/rostests/apitests/kernel32/dosdev.c index ce393248be..36531c68e1 100644 --- a/modules/rostests/apitests/kernel32/dosdev.c +++ b/modules/rostests/apitests/kernel32/dosdev.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include "precomp.h" #define SUBST_DRIVE_LETTER 'M' #define SUBST_DRIVE "M:" diff --git a/modules/rostests/apitests/kernel32/interlck.c b/modules/rostests/apitests/kernel32/interlck.c index e67fb5fc20..f205977f36 100644 --- a/modules/rostests/apitests/kernel32/interlck.c +++ b/modules/rostests/apitests/kernel32/interlck.c @@ -18,12 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdarg.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" +#include "precomp.h" static void test_InterlockedCompareExchange(void) { diff --git a/modules/rostests/apitests/kernel32/lstrcpynW.c b/modules/rostests/apitests/kernel32/lstrcpynW.c index a6e953b570..6bc49c6320 100644 --- a/modules/rostests/apitests/kernel32/lstrcpynW.c +++ b/modules/rostests/apitests/kernel32/lstrcpynW.c @@ -4,10 +4,7 @@ * PURPOSE: Test for lstrcpynW */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <stdio.h> +#include "precomp.h" START_TEST(lstrcpynW) { diff --git a/modules/rostests/apitests/kernel32/lstrlen.c b/modules/rostests/apitests/kernel32/lstrlen.c index 69db9ae18e..45dbc582c8 100644 --- a/modules/rostests/apitests/kernel32/lstrlen.c +++ b/modules/rostests/apitests/kernel32/lstrlen.c @@ -5,10 +5,7 @@ * PROGRAMMER: Hermes Belusca-Maito */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <stdio.h> +#include "precomp.h" LONG WINAPI VEHandler_1(PEXCEPTION_POINTERS ExceptionInfo) { diff --git a/modules/rostests/apitests/kernel32/precomp.h b/modules/rostests/apitests/kernel32/precomp.h new file mode 100644 index 0000000000..cbc24c78ae --- /dev/null +++ b/modules/rostests/apitests/kernel32/precomp.h @@ -0,0 +1,11 @@ +#ifndef _KERNEL32_APITEST_PRECOMP_H_ +#define _KERNEL32_APITEST_PRECOMP_H_ + +#include <apitest.h> +#include <wincon.h> +#include <winnls.h> +#include <winreg.h> +#include <strsafe.h> +#include <ndk/umtypes.h> + +#endif /* _KERNEL32_APITEST_PRECOMP_H_ */

1 0

[reactos] 01/01: [COM_APITEST] Improve the existing PCH and make use of it.
by Amine Khaldi 12 Dec '17

12 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3543c43252fd6a3db0896… commit 3543c43252fd6a3db0896561ae1fddb02393893b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Tue Dec 12 13:01:03 2017 +0100 [COM_APITEST] Improve the existing PCH and make use of it. --- modules/rostests/apitests/com/CMakeLists.txt | 5 +++-- modules/rostests/apitests/com/com_apitest.c | 6 ++++++ modules/rostests/apitests/com/com_apitest.h | 19 ++++++------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/rostests/apitests/com/CMakeLists.txt b/modules/rostests/apitests/com/CMakeLists.txt index 1bd1adc47d..76e6efef8c 100644 --- a/modules/rostests/apitests/com/CMakeLists.txt +++ b/modules/rostests/apitests/com/CMakeLists.txt @@ -10,10 +10,11 @@ list(APPEND SOURCE shdocvw.c shell32.c com_apitest.c - testlist.c) + com_apitest.h) -add_executable(com_apitest ${SOURCE}) +add_executable(com_apitest ${SOURCE} testlist.c) target_link_libraries(com_apitest wine uuid) set_module_type(com_apitest win32cui) add_importlibs(com_apitest advapi32 ole32 shlwapi shell32 msvcrt kernel32 ntdll) +add_pch(com_apitest com_apitest.h SOURCE) add_rostests_file(TARGET com_apitest) diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c index 0f9e5924f5..7f72b0b835 100644 --- a/modules/rostests/apitests/com/com_apitest.c +++ b/modules/rostests/apitests/com/com_apitest.c @@ -7,6 +7,12 @@ #include "com_apitest.h" +#include <mshtmhst.h> +#include <shlwapi.h> +#include <commoncontrols.h> +#include <activscp.h> +#include <ndk/rtlfuncs.h> + #define NDEBUG #include <debug.h> diff --git a/modules/rostests/apitests/com/com_apitest.h b/modules/rostests/apitests/com/com_apitest.h index dd26a93dff..f841e58121 100644 --- a/modules/rostests/apitests/com/com_apitest.h +++ b/modules/rostests/apitests/com/com_apitest.h @@ -5,7 +5,8 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#pragma once +#ifndef _COM_APITEST_H_ +#define _COM_APITEST_H_ /* Define this if you're adding new classes - the test will auto-generate the * interface table entries for you ;) */ @@ -17,33 +18,23 @@ #define COBJMACROS #define WIN32_NO_STATUS + #include <wine/test.h> + #include <objbase.h> #include <objsafe.h> #include <oleacc.h> #include <oledb.h> -#include <oaidl.h> -#include <dispex.h> #include <netcon.h> #include <netcfgx.h> #include <netcfgn.h> -#include <mshtmhst.h> #include <perhist.h> #include <shlguid.h> -#include <shlobj.h> -#include <shobjidl.h> -#include <shldisp.h> #include <shdeprecated.h> -#include <shlobj_undoc.h> #include <shlguid_undoc.h> -#include <shlwapi.h> -#include <commoncontrols.h> -#include <activscp.h> #include <urlhist.h> #include <htiface.h> -#include <htiframe.h> #include <mshtml.h> -#include <ndk/rtlfuncs.h> #include <initguid.h> typedef IUnknown *PUNKNOWN; @@ -202,3 +193,5 @@ DEFINE_GUID(IID_DFConstraint, 0x403df050, 0x23bd, 0x11d2, 0x93, 0x9 DEFINE_GUID(IID_CDefView, 0x4434ff80, 0xef4c, 0x11ce, 0xae, 0x65, 0x08, 0x00, 0x2b, 0xe2, 0x12, 0x62); DEFINE_GUID(IID_FolderItems2, 0xc94f0ad0, 0xf363, 0x11d2, 0xa3, 0x27, 0x00, 0xc0, 0x4f, 0x8e, 0xec, 0x7f); DEFINE_GUID(IID_FolderItems3, 0xeaa7c309, 0xbbec, 0x49d5, 0x82, 0x1d, 0x64, 0xd9, 0x66, 0xcb, 0x66, 0x7f); + +#endif /* _COM_APITEST_H_ */

1 0

[reactos] 01/01: [ADVAPI32_APITEST] Add a PCH.
by Amine Khaldi 12 Dec '17

12 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24f894695692800754a22… commit 24f894695692800754a22e802860e7add1ed58c2 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Tue Dec 12 12:44:32 2017 +0100 [ADVAPI32_APITEST] Add a PCH. --- modules/rostests/apitests/advapi32/CMakeLists.txt | 5 +++-- modules/rostests/apitests/advapi32/CreateService.c | 6 +----- modules/rostests/apitests/advapi32/DuplicateTokenEx.c | 4 +--- modules/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c | 6 +----- modules/rostests/apitests/advapi32/IsTextUnicode.c | 7 +------ modules/rostests/apitests/advapi32/LockServiceDatabase.c | 5 +---- modules/rostests/apitests/advapi32/QueryServiceConfig2.c | 6 +----- modules/rostests/apitests/advapi32/RegEnumKey.c | 5 +---- modules/rostests/apitests/advapi32/RegEnumValueW.c | 5 +---- modules/rostests/apitests/advapi32/RegOpenKeyExW.c | 6 +----- modules/rostests/apitests/advapi32/RegQueryInfoKey.c | 5 +---- modules/rostests/apitests/advapi32/RegQueryValueExW.c | 4 +--- modules/rostests/apitests/advapi32/RtlEncryptMemory.c | 6 +----- modules/rostests/apitests/advapi32/SaferIdentifyLevel.c | 5 +---- modules/rostests/apitests/advapi32/ServiceArgs.c | 5 +---- modules/rostests/apitests/advapi32/ServiceEnv.c | 4 ++-- modules/rostests/apitests/advapi32/eventlog.c | 5 +---- modules/rostests/apitests/advapi32/precomp.h | 12 ++++++++++++ modules/rostests/apitests/advapi32/svchlp.c | 5 +---- modules/rostests/apitests/advapi32/svchlp.h | 3 +-- 20 files changed, 34 insertions(+), 75 deletions(-) diff --git a/modules/rostests/apitests/advapi32/CMakeLists.txt b/modules/rostests/apitests/advapi32/CMakeLists.txt index d78ba867cb..e34f682676 100644 --- a/modules/rostests/apitests/advapi32/CMakeLists.txt +++ b/modules/rostests/apitests/advapi32/CMakeLists.txt @@ -17,10 +17,11 @@ list(APPEND SOURCE ServiceArgs.c ServiceEnv.c svchlp.c - testlist.c) + precomp.h) -add_executable(advapi32_apitest ${SOURCE}) +add_executable(advapi32_apitest ${SOURCE} testlist.c) target_link_libraries(advapi32_apitest wine ${PSEH_LIB}) set_module_type(advapi32_apitest win32cui) add_importlibs(advapi32_apitest advapi32 msvcrt kernel32 ntdll) +add_pch(advapi32_apitest precomp.h SOURCE) add_rostests_file(TARGET advapi32_apitest) diff --git a/modules/rostests/apitests/advapi32/CreateService.c b/modules/rostests/apitests/advapi32/CreateService.c index ee2f15c3a0..a3c5aa04e8 100644 --- a/modules/rostests/apitests/advapi32/CreateService.c +++ b/modules/rostests/apitests/advapi32/CreateService.c @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#include <winreg.h> -#include <winsvc.h> -#include <strsafe.h> +#include "precomp.h" static int MakeService(SC_HANDLE hScm, const wchar_t *serviceName, SC_HANDLE *hService, DWORD *tag) { diff --git a/modules/rostests/apitests/advapi32/DuplicateTokenEx.c b/modules/rostests/apitests/advapi32/DuplicateTokenEx.c index b8e64c6957..252faf7261 100644 --- a/modules/rostests/apitests/advapi32/DuplicateTokenEx.c +++ b/modules/rostests/apitests/advapi32/DuplicateTokenEx.c @@ -5,9 +5,7 @@ * PROGRAMMER: Jérôme Gardou <jerome.gardou(a)reactos.org> */ -#include <apitest.h> -#include <winbase.h> -#include <rtlfuncs.h> +#include "precomp.h" #define ok_luid_equal(Luid, Expected) \ ok(RtlEqualLuid((Luid), (Expected)), "Got wrong LUID %08lx%08lx, expected (%08lx%08lx).\n", \ diff --git a/modules/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c b/modules/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c index c65e76abbe..cec975f5b0 100644 --- a/modules/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c +++ b/modules/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c @@ -5,13 +5,9 @@ * PROGRAMMER: Jérôme Gardou <jerome.gardou(a)reactos.org> */ -#include <apitest.h> +#include "precomp.h" -#define WIN32_NO_STATUS -#include <winreg.h> -#include <ndk/rtlfuncs.h> #include <ndk/cmfuncs.h> -#include <ndk/cmtypes.h> #define IS_HKCR(hk) (((UINT_PTR)hk & 3) == 2) diff --git a/modules/rostests/apitests/advapi32/IsTextUnicode.c b/modules/rostests/apitests/advapi32/IsTextUnicode.c index 5b51e3b385..9bd170cefb 100644 --- a/modules/rostests/apitests/advapi32/IsTextUnicode.c +++ b/modules/rostests/apitests/advapi32/IsTextUnicode.c @@ -6,13 +6,8 @@ * Dmitry Chapyshev */ -#include <apitest.h> +#include "precomp.h" -#define WIN32_NO_STATUS -#include <ndk/rtlfuncs.h> -#include <winbase.h> -#include <winnls.h> -#include <wincon.h> #include <stdio.h> PVOID LoadCodePageData(ULONG Code) diff --git a/modules/rostests/apitests/advapi32/LockServiceDatabase.c b/modules/rostests/apitests/advapi32/LockServiceDatabase.c index 5bd2ad7b97..850cc4c70a 100644 --- a/modules/rostests/apitests/advapi32/LockServiceDatabase.c +++ b/modules/rostests/apitests/advapi32/LockServiceDatabase.c @@ -5,10 +5,7 @@ * PROGRAMMER: Hermès BÉLUSCA - MAÏTO */ -#include <apitest.h> - -#include <winsvc.h> -#include <strsafe.h> +#include "precomp.h" #define TESTING_SERVICE L"Spooler" diff --git a/modules/rostests/apitests/advapi32/QueryServiceConfig2.c b/modules/rostests/apitests/advapi32/QueryServiceConfig2.c index 133b9a26ac..a9bc478efc 100644 --- a/modules/rostests/apitests/advapi32/QueryServiceConfig2.c +++ b/modules/rostests/apitests/advapi32/QueryServiceConfig2.c @@ -5,11 +5,7 @@ * PROGRAMMER: Hermès BÉLUSCA - MAÏTO */ -#include <apitest.h> - -#include <winreg.h> -#include <winsvc.h> -#include <strsafe.h> +#include "precomp.h" #define TESTING_SERVICEW L"Spooler" #define TESTING_SERVICEA "Spooler" diff --git a/modules/rostests/apitests/advapi32/RegEnumKey.c b/modules/rostests/apitests/advapi32/RegEnumKey.c index 23ba958b62..b303e91bdb 100644 --- a/modules/rostests/apitests/advapi32/RegEnumKey.c +++ b/modules/rostests/apitests/advapi32/RegEnumKey.c @@ -5,10 +5,7 @@ * PROGRAMMER: Thomas Faber & Doug Lyons */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <winreg.h> +#include "precomp.h" START_TEST(RegEnumKey) { diff --git a/modules/rostests/apitests/advapi32/RegEnumValueW.c b/modules/rostests/apitests/advapi32/RegEnumValueW.c index 51da24bb62..95f10d21ca 100644 --- a/modules/rostests/apitests/advapi32/RegEnumValueW.c +++ b/modules/rostests/apitests/advapi32/RegEnumValueW.c @@ -5,10 +5,7 @@ * PROGRAMMER: Jérôme Gardou <jerome.gardou(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <winreg.h> +#include "precomp.h" START_TEST(RegEnumValueW) { diff --git a/modules/rostests/apitests/advapi32/RegOpenKeyExW.c b/modules/rostests/apitests/advapi32/RegOpenKeyExW.c index c84989072e..11ebdc9e3e 100644 --- a/modules/rostests/apitests/advapi32/RegOpenKeyExW.c +++ b/modules/rostests/apitests/advapi32/RegOpenKeyExW.c @@ -4,15 +4,11 @@ * PURPOSE: Test for the RegOpenKeyExW alignment * PROGRAMMER: Mark Jansen (mark.jansen(a)reactos.org) */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <winreg.h> +#include "precomp.h" #define TEST_STR L".exe" - START_TEST(RegOpenKeyExW) { char GccShouldNotAlignThis[20 * 2]; diff --git a/modules/rostests/apitests/advapi32/RegQueryInfoKey.c b/modules/rostests/apitests/advapi32/RegQueryInfoKey.c index 024f3d15b0..0bda2cd57d 100644 --- a/modules/rostests/apitests/advapi32/RegQueryInfoKey.c +++ b/modules/rostests/apitests/advapi32/RegQueryInfoKey.c @@ -5,10 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <winreg.h> +#include "precomp.h" #define TestKeyAccess(da, er, es) TestKeyAccess_(__FILE__, __LINE__, da, er, es) static diff --git a/modules/rostests/apitests/advapi32/RegQueryValueExW.c b/modules/rostests/apitests/advapi32/RegQueryValueExW.c index ada53d85d9..1438457069 100644 --- a/modules/rostests/apitests/advapi32/RegQueryValueExW.c +++ b/modules/rostests/apitests/advapi32/RegQueryValueExW.c @@ -4,10 +4,8 @@ * PURPOSE: Test for the RegQueryValueW API * PROGRAMMER: Victor Martinez Calvo <victor.martinez(a)reactos.org> */ -#include <apitest.h> -#define WIN32_NO_STATUS -#include <winreg.h> +#include "precomp.h" static DWORD delete_key(HKEY hkey) { diff --git a/modules/rostests/apitests/advapi32/RtlEncryptMemory.c b/modules/rostests/apitests/advapi32/RtlEncryptMemory.c index 7a0b3d3b35..8cc5036962 100644 --- a/modules/rostests/apitests/advapi32/RtlEncryptMemory.c +++ b/modules/rostests/apitests/advapi32/RtlEncryptMemory.c @@ -5,12 +5,8 @@ * PROGRAMMER: Timo Kreuzer <timo.kreuzer(a)reactos.org> */ -#include <apitest.h> +#include "precomp.h" -#define WIN32_NO_STATUS -#include <windows.h> -#include <ndk/ntndk.h> -#include <winsafer.h> #include <ntsecapi.h> START_TEST(RtlEncryptMemory) diff --git a/modules/rostests/apitests/advapi32/SaferIdentifyLevel.c b/modules/rostests/apitests/advapi32/SaferIdentifyLevel.c index c704dccb60..1aea94f2c3 100644 --- a/modules/rostests/apitests/advapi32/SaferIdentifyLevel.c +++ b/modules/rostests/apitests/advapi32/SaferIdentifyLevel.c @@ -5,11 +5,8 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> +#include "precomp.h" -#define WIN32_NO_STATUS -#include <windows.h> -#include <ndk/ntndk.h> #include <winsafer.h> #define SaferIdentifyLevel(c, p, h, r) SaferIdentifyLevel(c, (PSAFER_CODE_PROPERTIES)(p), h, r) diff --git a/modules/rostests/apitests/advapi32/ServiceArgs.c b/modules/rostests/apitests/advapi32/ServiceArgs.c index 16d675a297..18d9b82096 100644 --- a/modules/rostests/apitests/advapi32/ServiceArgs.c +++ b/modules/rostests/apitests/advapi32/ServiceArgs.c @@ -6,10 +6,7 @@ * Thomas Faber <thomas.faber(a)reactos.org> */ -#include <apitest.h> -#include <winnls.h> -#include <winsvc.h> -#include <strsafe.h> +#include "precomp.h" static char **argv; static int argc; diff --git a/modules/rostests/apitests/advapi32/ServiceEnv.c b/modules/rostests/apitests/advapi32/ServiceEnv.c index 0e8aa2bac6..b98a076b30 100644 --- a/modules/rostests/apitests/advapi32/ServiceEnv.c +++ b/modules/rostests/apitests/advapi32/ServiceEnv.c @@ -5,8 +5,8 @@ * PROGRAMMER: Hermes Belusca-Maito */ -#include <apitest.h> -#include <winsvc.h> +#include "precomp.h" + #include "svchlp.h" diff --git a/modules/rostests/apitests/advapi32/eventlog.c b/modules/rostests/apitests/advapi32/eventlog.c index c4aa9c08d3..d7860a9887 100644 --- a/modules/rostests/apitests/advapi32/eventlog.c +++ b/modules/rostests/apitests/advapi32/eventlog.c @@ -5,10 +5,7 @@ * PROGRAMMER: Hermes Belusca-Maito */ -#include <apitest.h> - -#define WIN32_NO_STATUS -#include <winbase.h> +#include "precomp.h" START_TEST(eventlog) { diff --git a/modules/rostests/apitests/advapi32/precomp.h b/modules/rostests/apitests/advapi32/precomp.h new file mode 100644 index 0000000000..503d956465 --- /dev/null +++ b/modules/rostests/apitests/advapi32/precomp.h @@ -0,0 +1,12 @@ +#ifndef _ADVAPI32_APITEST_PRECOMP_H_ +#define _ADVAPI32_APITEST_PRECOMP_H_ + +#include <apitest.h> +#include <winreg.h> +#include <winsvc.h> +#include <winnls.h> +#include <strsafe.h> +#include <ntstatus.h> +#include <ndk/rtlfuncs.h> + +#endif /* _ADVAPI32_APITEST_PRECOMP_H_ */ diff --git a/modules/rostests/apitests/advapi32/svchlp.c b/modules/rostests/apitests/advapi32/svchlp.c index 764c5d8359..7a3aca65e7 100644 --- a/modules/rostests/apitests/advapi32/svchlp.c +++ b/modules/rostests/apitests/advapi32/svchlp.c @@ -13,10 +13,7 @@ * the service process, without really passing it */ -#include <apitest.h> -#include <winnls.h> -#include <winsvc.h> -#include <strsafe.h> +#include "precomp.h" static HANDLE hClientPipe = INVALID_HANDLE_VALUE; static WCHAR named_pipe_name[100]; // Shared: FIXME! diff --git a/modules/rostests/apitests/advapi32/svchlp.h b/modules/rostests/apitests/advapi32/svchlp.h index 3e503f8b49..0adb20fe55 100644 --- a/modules/rostests/apitests/advapi32/svchlp.h +++ b/modules/rostests/apitests/advapi32/svchlp.h @@ -7,8 +7,7 @@ * Hermes Belusca-Maito */ -// #include <apitest.h> - +#pragma once /********** S E R V I C E ( C L I E N T ) M O D U L E S I D E *********/

1 0

[reactos] 01/01: [NTOS] Add some header guards.
by Amine Khaldi 12 Dec '17

12 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24f35397c6512bb142670… commit 24f35397c6512bb142670378609c02df5527b269 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Tue Dec 12 12:42:13 2017 +0100 [NTOS] Add some header guards. --- ntoskrnl/include/internal/kd64.h | 2 ++ ntoskrnl/mm/ARM3/miarm.h | 2 ++ ntoskrnl/mm/ARM3/miavl.h | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/kd64.h b/ntoskrnl/include/internal/kd64.h index 7957823724..6917845a1b 100644 --- a/ntoskrnl/include/internal/kd64.h +++ b/ntoskrnl/include/internal/kd64.h @@ -6,6 +6,8 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ +#pragma once + // // Default size of the DbgPrint log buffer // diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index 320389e580..c1d81807f6 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -6,6 +6,8 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ +#pragma once + #define MI_LOWEST_VAD_ADDRESS (PVOID)MM_LOWEST_USER_ADDRESS /* Make the code cleaner with some definitions for size multiples */ diff --git a/ntoskrnl/mm/ARM3/miavl.h b/ntoskrnl/mm/ARM3/miavl.h index ae4146f49f..f93bb2f329 100644 --- a/ntoskrnl/mm/ARM3/miavl.h +++ b/ntoskrnl/mm/ARM3/miavl.h @@ -6,7 +6,7 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +#pragma once /* * This is the glue code for the Memory Manager version of AVL Trees that is used

1 0

[reactos] 01/01: [TRANSLATION] Fix Simplified Chinese Translations (#187)
by Li Keqing 11 Dec '17

11 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f461c451a183360c25645… commit f461c451a183360c25645190726754db34345df3 Author: Li Keqing <forucial(a)icloud.com> AuthorDate: Mon Dec 11 17:35:59 2017 +0800 [TRANSLATION] Fix Simplified Chinese Translations (#187) * Fix the Simplified Translation of Rapps * Fix the Simplified Translation of msconfig_new * Fix the Simplified Translation of charmap_new * Fix the Simplified Translation of winmine * Fix the Simplified Translation of kbswitch * Fix Simplified Chinese Translation of logoff * Fix Simplified Chinese Translation of eventvwr * Fix Simplified Chinese Translation of sysdm * Update Simplified Chinese Translation for dxdiag --- base/applications/charmap_new/lang/zh-CN.rc | 22 ++++ base/applications/dxdiag/lang/zh-CN.rc | 136 +++++++++++----------- base/applications/games/winmine/lang/zh-CN.rc | 8 +- base/applications/kbswitch/lang/zh-CN.rc | 2 +- base/applications/logoff/lang/zh-CN.rc | 11 +- base/applications/msconfig_new/lang/zh-CN.rc | 2 +- base/applications/mscutils/eventvwr/lang/zh-CN.rc | 68 +++++------ base/applications/rapps/lang/zh-CN.rc | 18 +-- dll/cpl/sysdm/lang/zh-CN.rc | 18 +-- 9 files changed, 154 insertions(+), 131 deletions(-) diff --git a/base/applications/charmap_new/lang/zh-CN.rc b/base/applications/charmap_new/lang/zh-CN.rc new file mode 100644 index 0000000000..b3f500c38d --- /dev/null +++ b/base/applications/charmap_new/lang/zh-CN.rc @@ -0,0 +1,22 @@ +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_CHARMAP DIALOGEX 6, 6, 290, 224 +FONT 8, "MS Shell Dlg", 0, 0 +STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX +CAPTION "ReactOS 字符映射表" +BEGIN + LTEXT "字体：", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE | + WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + LTEXT "待复制的字符：", IDC_STATIC, 6, 188, 66, 9 + CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 + DEFPUSHBUTTON "选择", IDC_SELECT, 194, 186, 44, 13 + PUSHBUTTON "复制", IDC_COPY, 242, 186, 44, 13, WS_DISABLED +END + +STRINGTABLE +BEGIN + IDS_ABOUT "关于(&B)..." + IDS_TITLE "字符映射表" +END diff --git a/base/applications/dxdiag/lang/zh-CN.rc b/base/applications/dxdiag/lang/zh-CN.rc index d376be5a88..6b2620b833 100644 --- a/base/applications/dxdiag/lang/zh-CN.rc +++ b/base/applications/dxdiag/lang/zh-CN.rc @@ -26,20 +26,20 @@ IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" BEGIN - LTEXT "该工具会有关 ReactX 组件和安装在系统上的驱动程序的详细信息。", IDC_STATIC, 5, 0, 443, 17 - LTEXT "如果你知道是哪个部分引起的错误，请单击上面适当的选项卡。否则，你可以使用下面的“下一页”按钮按顺序查阅每一页。 ", IDC_STATIC, 5, 15, 443, 25 + LTEXT "该工具报告有关 ReactX 组件和安装在系统上的驱动程序的详细信息。", IDC_STATIC, 5, 0, 443, 17 + LTEXT "如果您知道是哪个部分引起的错误，请单击上面适当的选项卡。否则，您可以使用下面的“下一页”按钮按顺序查阅每一页。 ", IDC_STATIC, 5, 15, 443, 25 GROUPBOX "系统信息", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT - LTEXT "当前日期/时间:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT - LTEXT "计算机名:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT - LTEXT "操作系统:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT - LTEXT "语言:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT - LTEXT "系统制造商:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT - LTEXT "系统型号:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT - LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT - LTEXT "处理器:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT - LTEXT "内存:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT - LTEXT "页面文件:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT - LTEXT "ReactX 版本:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT + LTEXT "当前日期/时间：", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT + LTEXT "计算机名：", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT + LTEXT "操作系统：", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT + LTEXT "语言：", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT + LTEXT "系统制造商：", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT + LTEXT "系统型号：", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT + LTEXT "BIOS：", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT + LTEXT "处理器：", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT + LTEXT "内存：", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT + LTEXT "页面文件：", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT + LTEXT "ReactX 版本：", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -51,7 +51,7 @@ BEGIN EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "检查 WHQL 数字签名", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED + CHECKBOX "查找 WHQL 数字签名", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -59,13 +59,13 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "设备", IDC_STATIC, 5, 0, 250, 95 - RTEXT "名称:", IDC_STATIC, 20, 10, 70, 10 - RTEXT "制造商:", IDC_STATIC, 20, 20, 70, 10 - RTEXT "芯片类型:", IDC_STATIC, 20, 30, 70, 10 - RTEXT "DAC 类型:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "总内存约为:", IDC_STATIC, 20, 50, 70, 10 - RTEXT "当前显示模式:", IDC_STATIC, 20, 60, 70, 10 - RTEXT "监视器:", IDC_STATIC, 20, 70, 70, 10 + RTEXT "名称：", IDC_STATIC, 20, 10, 70, 10 + RTEXT "制造商：", IDC_STATIC, 20, 20, 70, 10 + RTEXT "芯片类型：", IDC_STATIC, 20, 30, 70, 10 + RTEXT "DAC 类型：", IDC_STATIC, 20, 40, 70, 10 + RTEXT "估计内存总数：", IDC_STATIC, 20, 50, 70, 10 + RTEXT "当前显示模式：", IDC_STATIC, 20, 60, 70, 10 + RTEXT "监视器：", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -74,13 +74,13 @@ BEGIN EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "驱动程序", IDC_STATIC, 260, 0, 197, 95 - RTEXT "主驱动程序:", IDC_STATIC, 275, 10, 55, 10 - RTEXT "版本:", IDC_STATIC, 275, 20, 55, 10 - RTEXT "日期:", IDC_STATIC, 275, 30, 55, 10 - RTEXT "WHQL 徽标:", IDC_STATIC, 275, 40, 55, 10 - RTEXT "迷你 VDD:", IDC_STATIC, 275, 50, 55, 10 - RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10 - RTEXT "DDI 版本:", IDC_STATIC, 275, 70, 55, 10 + RTEXT "主驱动程序：", IDC_STATIC, 275, 10, 55, 10 + RTEXT "版本：", IDC_STATIC, 275, 20, 55, 10 + RTEXT "日期：", IDC_STATIC, 275, 30, 55, 10 + RTEXT "WHQL 签名：", IDC_STATIC, 275, 40, 55, 10 + RTEXT "迷你 VDD：", IDC_STATIC, 275, 50, 55, 10 + RTEXT "VDD：", IDC_STATIC, 275, 60, 55, 10 + RTEXT "DDI 版本：", IDC_STATIC, 275, 70, 55, 10 EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -89,9 +89,9 @@ BEGIN EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX 功能", IDC_STATIC, 5, 97, 452, 70 - RTEXT "DirectDraw 加速:", IDC_STATIC, 15, 115, 110, 12 - RTEXT "Direct3D 加速:", IDC_STATIC, 15, 130, 110, 12 - RTEXT "AGP 纹理加速:", IDC_STATIC, 15, 145, 110, 12 + RTEXT "DirectDraw 加速：", IDC_STATIC, 15, 115, 110, 12 + RTEXT "Direct3D 加速：", IDC_STATIC, 15, 130, 110, 12 + RTEXT "AGP 纹理加速：", IDC_STATIC, 15, 145, 110, 12 LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10 LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10 LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10 @@ -100,7 +100,7 @@ BEGIN PUSHBUTTON "启用", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED PUSHBUTTON "测试 DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14 PUSHBUTTON "测试 Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14 - GROUPBOX "笔记", IDC_STATIC, 5, 170, 452, 50 + GROUPBOX "说明", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -109,12 +109,12 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "设备", IDC_STATIC, 5, 0, 250, 95 - RTEXT "名称:", IDC_STATIC, 20, 10, 70, 10 - RTEXT "硬件 ID:", IDC_STATIC, 20, 20, 70, 10 - RTEXT "制造商 ID:", IDC_STATIC, 20, 30, 70, 10 - RTEXT "产品 ID:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "类型:", IDC_STATIC, 20, 50, 70, 10 - RTEXT "默认设备:", IDC_STATIC, 20, 60, 70, 10 + RTEXT "名称：", IDC_STATIC, 20, 10, 70, 10 + RTEXT "硬件 ID：", IDC_STATIC, 20, 20, 70, 10 + RTEXT "制造商 ID：", IDC_STATIC, 20, 30, 70, 10 + RTEXT "产品 ID：", IDC_STATIC, 20, 40, 70, 10 + RTEXT "类型：", IDC_STATIC, 20, 50, 70, 10 + RTEXT "默认设备：", IDC_STATIC, 20, 60, 70, 10 EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -122,12 +122,12 @@ BEGIN EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "驱动程序", IDC_STATIC, 260, 0, 197, 95 - RTEXT "名称:", IDC_STATIC, 275, 10, 55, 10 - RTEXT "版本:", IDC_STATIC, 275, 20, 55, 10 - RTEXT "日期:", IDC_STATIC, 275, 30, 55, 10 - RTEXT "WHQL 徽标:", IDC_STATIC, 275, 40, 55, 10 - RTEXT "其他文件:", IDC_STATIC, 275, 50, 55, 10 - RTEXT "提供程序:", IDC_STATIC, 275, 60, 55, 10 + RTEXT "名称：", IDC_STATIC, 275, 10, 55, 10 + RTEXT "版本：", IDC_STATIC, 275, 20, 55, 10 + RTEXT "日期：", IDC_STATIC, 275, 30, 55, 10 + RTEXT "WHQL 签名：", IDC_STATIC, 275, 40, 55, 10 + RTEXT "其他文件：", IDC_STATIC, 275, 50, 55, 10 + RTEXT "提供商：", IDC_STATIC, 275, 60, 55, 10 EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -136,9 +136,9 @@ BEGIN EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX 功能", IDC_STATIC, 5, 97, 452, 70 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17 - RTEXT "硬体音效\n加速等级:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED + RTEXT "硬体的声音加速等级：", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED PUSHBUTTON "测试 DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED - GROUPBOX "笔记", IDC_STATIC, 5, 170, 452, 50 + GROUPBOX "说明", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -150,13 +150,13 @@ BEGIN EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "音乐端口", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX 功能", IDC_STATIC, 5, 97, 452, 70 - LTEXT "默认端口加速:", IDC_STATIC, 15, 120, 95, 17 + LTEXT "默认端口加速：", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "禁用", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "使用此端口的测试：", IDC_STATIC, 180, 105, 100, 10 + LTEXT "使用此端口测试：", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "测试 DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED - GROUPBOX "备注", IDC_STATIC, 5, 170, 452, 50 + GROUPBOX "说明", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -169,7 +169,7 @@ BEGIN GROUPBOX "与输入相关的设备", IDC_STATIC, 5, 87, 452, 81 CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200 - GROUPBOX "备注", IDC_STATIC, 5, 170, 452, 50 + GROUPBOX "说明", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -177,13 +177,13 @@ IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "已注册的 DirectPlay 服务提供者:", IDC_STATIC, 5, 0, 452, 75 + GROUPBOX "已注册的 DirectPlay 服务提供程序", IDC_STATIC, 5, 0, 452, 75 CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55 - GROUPBOX "注册 Lobbyable DirectPlay 应用程序", IDC_STATIC, 5, 77, 452, 55 + GROUPBOX "已注册的 Lobbyable DirectPlay 应用程序", IDC_STATIC, 5, 77, 452, 55 GROUPBOX "ReactX 功能", IDC_STATIC, 5, 133, 452, 35 - PUSHBUTTON "DirectPlay 语音选项", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED + PUSHBUTTON "DirectPlay 声音选项", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED PUSHBUTTON "测试 DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED - GROUPBOX "备注", IDC_STATIC, 5, 170, 452, 50 + GROUPBOX "说明", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -194,8 +194,8 @@ BEGIN LTEXT "仍然找不到你要找的信息吗？下面是一些其他的事情你可以做：", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "系统信息", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED LTEXT "显示附加的系统信息", IDC_STATIC, 90, 23, 300, 10 - PUSHBUTTON "刷新率重写", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "重写 DirectDraw 的刷新率", IDC_STATIC, 90, 43, 300, 10 + PUSHBUTTON "刷新频率替换", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED + LTEXT "替代 DirectDraw 的刷新频率", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE @@ -207,7 +207,7 @@ BEGIN IDS_MUSIC_DIALOG "音乐" IDS_INPUT_DIALOG "输入" IDS_NETWORK_DIALOG "网络" - IDS_HELP_DIALOG "说明" + IDS_HELP_DIALOG "帮助" IDS_FORMAT_MB "%I64uMB RAM" IDS_FORMAT_SWAP "已使用 %I64u MB，还有 %I64u MB 可用" IDS_FORMAT_UNIPROC "%s (%u CPU)" @@ -225,7 +225,7 @@ BEGIN IDS_NOT_APPLICABLE "不可用" IDS_OPTION_YES "是" IDS_DIRECTPLAY_COL_NAME1 "名称" - IDS_DIRECTPLAY_COL_NAME2 "登录" + IDS_DIRECTPLAY_COL_NAME2 "注册表" IDS_DIRECTPLAY_COL_NAME3 "文件" IDS_DIRECTPLAY_COL_NAME4 "版本" IDS_DIRECTPLAY8_MODEMSP "DirectPlay8 调制解调器服务提供者" @@ -239,18 +239,18 @@ BEGIN IDS_REG_SUCCESS "确认" IDS_REG_FAIL "错误" IDS_DDTEST_ERROR "测试失败！" - IDS_DDTEST_DESCRIPTION "这将启动 DirectDraw 界面测试。要继续？" - IDS_DDPRIMARY_DESCRIPTION "此测试将使用 DirectDraw 在主表面上绘图。你应该会看见黑色和白色的矩形。要继续？" - IDS_DDPRIMARY_RESULT "你看见黑色和白色的矩形吗？" - IDS_DDOFFSCREEN_DESCRIPTION "此测试将使用 DirectDraw 在离屏表面上绘图。你应该会看见在移动的白色矩形。要继续？" - IDS_DDOFFSCREEN_RESULT "你看见在移动的白色矩形吗？" - IDS_DDFULLSCREEN_DESCRIPTION "此测试将使用 DirectDraw 在全屏幕模式绘图。你应该会看见在移动的白色矩形。要继续？" - IDS_DDFULLSCREEN_RESULT "你在全屏幕模式中看见在移动的白色矩形吗？" + IDS_DDTEST_DESCRIPTION "这将启动 DirectDraw 界面测试。是否继续？" + IDS_DDPRIMARY_DESCRIPTION "此测试将使用 DirectDraw 在主表面上绘图。您应该会看到黑白方块。是否继续？" + IDS_DDPRIMARY_RESULT "您是否看到黑白方块？" + IDS_DDOFFSCREEN_DESCRIPTION "此测试将使用 DirectDraw 在外表面上绘图。您应该会看到移动的白方块。是否继续？" + IDS_DDOFFSCREEN_RESULT "您是否看到移动的白方块？" + IDS_DDFULLSCREEN_DESCRIPTION "此测试将使用 DirectDraw 在全屏模式绘图。您应该会看到移动的白方块。是否继续？" + IDS_DDFULLSCREEN_RESULT "您是否在全屏模式中看到移动的白色矩形？" IDS_FORMAT_ADAPTER_MEM "%u MB" IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "否" - IDS_D3DTEST_DESCRIPTION "这将启动 Direct3D 界面测试。要继续？" - IDS_D3DTEST_D3Dx "此测试将使用硬体加速的 Direct3D %u 界面。" + IDS_D3DTEST_DESCRIPTION "这将启动 Direct3D 表面测试。是否继续？" + IDS_D3DTEST_D3Dx "此测试将使用硬体加速的 Direct3D %u 接口。" IDS_OS_VERSION "%s %s (%d.%d, Build %d)" IDS_DMUSIC_DESC "描述" IDS_DMUSIC_TYPE "类型" @@ -259,5 +259,5 @@ BEGIN IDS_DMUSIC_DLS "支持 DLS" IDS_DMUSIC_EXT "外部" IDS_DMUSIC_PORT "默认端口" - IDS_DDDISABLE_MSG "这将禁用 DirectDraw 所有的显示设备上的所有硬件加速\n。您要继续吗？\n" + IDS_DDDISABLE_MSG "这将禁用所有的显示设备上所有的 DirectDraw 硬件加速\n。是否继续？\n" END diff --git a/base/applications/games/winmine/lang/zh-CN.rc b/base/applications/games/winmine/lang/zh-CN.rc index a817f86972..1bb58da5a3 100644 --- a/base/applications/games/winmine/lang/zh-CN.rc +++ b/base/applications/games/winmine/lang/zh-CN.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - IDS_APPNAME "Wine地雷" + IDS_APPNAME "Wine 扫雷" IDS_NOBODY "无人" IDS_ABOUT "版权所有 2000 Joshua Thielen" END @@ -49,10 +49,10 @@ END DLG_CONGRATS DIALOGEX 0, 0, 160, 60 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "祝贺！" +CAPTION "恭喜！" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "请输入你的名字", -1, 10, 10, 150, 10 + LTEXT "请输入您的大名", -1, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 DEFPUSHBUTTON "确定", IDOK, 60, 40, 40, 15 END @@ -64,7 +64,7 @@ FONT 9, "MS Shell Dlg" BEGIN LTEXT "行", -1, 5, 5, 30, 10 LTEXT "列", -1, 5, 35, 30, 10 - LTEXT "地雷", -1, 5, 65, 30, 10 + LTEXT "地雷数", -1, 5, 65, 30, 10 EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER diff --git a/base/applications/kbswitch/lang/zh-CN.rc b/base/applications/kbswitch/lang/zh-CN.rc index 3f3a951e95..7d19349619 100644 --- a/base/applications/kbswitch/lang/zh-CN.rc +++ b/base/applications/kbswitch/lang/zh-CN.rc @@ -14,6 +14,6 @@ BEGIN BEGIN MENUITEM "选项(&P)...", ID_PREFERENCES MENUITEM SEPARATOR - MENUITEM "结束(&E)", ID_EXIT + MENUITEM "退出(&E)", ID_EXIT END END diff --git a/base/applications/logoff/lang/zh-CN.rc b/base/applications/logoff/lang/zh-CN.rc index 98297f53d5..43dd30efa1 100644 --- a/base/applications/logoff/lang/zh-CN.rc +++ b/base/applications/logoff/lang/zh-CN.rc @@ -4,16 +4,17 @@ * FILE: base/applications/logoff/lang/zh-CN.rc * PURPOSE: Chinese (Simplified) Language File for Logout * TRANSLATOR: Elton Chung aka MfldElton <elton328(a)gmail.com> + * Li Keqing <auroracloud4096(a)gmail.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN - IDS_USAGE "终止一个阶段。\n\n\ - /v\t\t显示有关已执行动作的资讯。\n\ - /?\t\t显示此资讯。\n\n" - IDS_LOGOFF_REMOTE "正在终止远端机器的阶段。" - IDS_LOGOFF_LOCAL "正在终止本机器的当前阶段。" + IDS_USAGE "终止一个会话。\n\n\ + /v\t\t显示已执行操作的信息。\n\ + /?\t\t显示该信息。\n\n" + IDS_LOGOFF_REMOTE "正在终止远程端的会话。" + IDS_LOGOFF_LOCAL "正在终止本机的当前会话。" IDS_ILLEGAL_PARAM "无效参数\n" END diff --git a/base/applications/msconfig_new/lang/zh-CN.rc b/base/applications/msconfig_new/lang/zh-CN.rc index d3f14d2a8e..6cc0e448ef 100644 --- a/base/applications/msconfig_new/lang/zh-CN.rc +++ b/base/applications/msconfig_new/lang/zh-CN.rc @@ -200,7 +200,7 @@ STRINGTABLE BEGIN IDS_MSCONFIG "系统配置实用程序" IDS_MSCONFIG_2 "系统配置" - IDS_ABOUT "关于...(&A)\tShift+F1" + IDS_ABOUT "关于(&A)...\tShift+F1" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/zh-CN.rc b/base/applications/mscutils/eventvwr/lang/zh-CN.rc index ec0c7bd5b9..e7ecf82832 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-CN.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-CN.rc @@ -6,34 +6,34 @@ IDM_EVENTVWR MENU BEGIN POPUP "日志(&L)" BEGIN - MENUITEM "Open...(&O)", IDM_OPEN_EVENTLOG - MENUITEM "Save Event Log as...(&E)", IDM_SAVE_EVENTLOG - MENUITEM "Close(&C)", IDM_CLOSE_EVENTLOG + MENUITEM "打开(&O)...", IDM_OPEN_EVENTLOG + MENUITEM "保存日志为(&E)...", IDM_SAVE_EVENTLOG + MENUITEM "关闭(&C)", IDM_CLOSE_EVENTLOG MENUITEM SEPARATOR MENUITEM "清除所有事件(&L)", IDM_CLEAR_EVENTS - MENUITEM "Rename(&R)\tF2", IDM_RENAME_EVENTLOG - MENUITEM "Log Settings...(&T)", IDM_EVENTLOG_SETTINGS + MENUITEM "重命名(&R)\tF2", IDM_RENAME_EVENTLOG + MENUITEM "记录选项(&T)...", IDM_EVENTLOG_SETTINGS MENUITEM SEPARATOR MENUITEM "退出(&X)", IDM_EXIT END POPUP "查看(&V)" BEGIN - MENUITEM "Newest first (&N)", IDM_LIST_NEWEST - MENUITEM "Oldest first (&O)", IDM_LIST_OLDEST + MENUITEM "后进先出(&N)", IDM_LIST_NEWEST + MENUITEM "先进先出(&O)", IDM_LIST_OLDEST MENUITEM SEPARATOR - MENUITEM "Details... (&D)\tEnter", IDM_EVENT_DETAILS + MENUITEM "详情(&D)...\tEnter", IDM_EVENT_DETAILS MENUITEM SEPARATOR MENUITEM "刷新(&R)\tF5", IDM_REFRESH END POPUP "选项(&O)" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "显示日志详情视图(&S)", IDM_SHOW_EVENT_DETAILS_VIEW END POPUP "帮助(&H)" BEGIN MENUITEM "帮助内容(&E)", IDM_HELP MENUITEM SEPARATOR - MENUITEM "关于... (&A)", IDM_ABOUT + MENUITEM "关于(&A)...", IDM_ABOUT END END @@ -92,53 +92,53 @@ END IDD_LOGPROPERTIES_GENERAL DIALOGEX 0, 0, 252, 234 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "General" +CAPTION "通用" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Display name:", IDC_STATIC, 7, 9, 60, 8 + LTEXT "显示名称(&D)：", IDC_STATIC, 7, 9, 60, 8 EDITTEXT IDC_DISPLAYNAME, 67, 7, 178, 12, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "&Log name:", IDC_STATIC, 7, 25, 60, 8 + LTEXT "日志名(&L)：", IDC_STATIC, 7, 25, 60, 8 EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 + LTEXT "日志文件(&F)：", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 + LTEXT "大小：", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "创建时间：", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "修改时间：", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "访问时间：", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 - LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 + GROUPBOX "日志大小", IDC_STATIC, 7, 106, 238, 99 + LTEXT "日志大小上限(&M)：", IDC_STATIC, 17, 122, 58, 8 EDITTEXT IDC_EDIT_MAXLOGSIZE, 80, 119, 40, 14, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_MAXLOGSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 119, 10, 14 LTEXT "KB", IDC_STATIC, 130, 122, 20, 8 - LTEXT "When maximum log size is reached:", IDC_STATIC, 17, 140, 219, 8 - CONTROL "&Overwrite events as needed", IDC_OVERWRITE_AS_NEEDED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 155, 219, 10 - CONTROL "O&verwrite events older than", IDC_OVERWRITE_OLDER_THAN, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 168, 102, 10 + LTEXT "达到日志大小上限时：", IDC_STATIC, 17, 140, 219, 8 + CONTROL "按需要覆盖事件(&O)", IDC_OVERWRITE_AS_NEEDED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 155, 219, 10 + CONTROL "覆盖时间超过(&V)", IDC_OVERWRITE_OLDER_THAN, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 168, 102, 10 EDITTEXT IDC_EDIT_EVENTS_AGE, 122, 165, 35, 14, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_EVENTS_AGE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 157, 165, 10, 14 - LTEXT "days", IDC_STATIC, 162, 168, 20, 8 - CONTROL "Do &not overwrite events\n(clear log manually)", IDC_NO_OVERWRITE, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | WS_TABSTOP, 17, 180, 143, 20 - PUSHBUTTON "&Restore Defaults", IDC_RESTOREDEFAULTS, 166, 183, 70, 14 - AUTOCHECKBOX "Using a lo&w-speed connection", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10 - PUSHBUTTON "&Clear Log", ID_CLEARLOG, 195, 213, 50, 14 + LTEXT "天的事件", IDC_STATIC, 162, 168, 20, 8 + CONTROL "不覆盖事件(&N)\n（手动清除日志）", IDC_NO_OVERWRITE, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | WS_TABSTOP, 17, 180, 143, 20 + PUSHBUTTON "还原为默认值(&R)", IDC_RESTOREDEFAULTS, 166, 183, 70, 14 + AUTOCHECKBOX "使用低速连接(&W)", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10 + PUSHBUTTON "清除日志(&C)", ID_CLEARLOG, 195, 213, 50, 14 END STRINGTABLE BEGIN IDS_COPYRIGHT "版权所有 (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "事件查看器" - IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" + IDS_APP_TITLE_EX "%s - %s 已登录 \\\\" + IDS_STATUS_MSG "%s 中有 %lu 个事件（已列出：%lu）" IDS_LOADING_WAIT "正在载入日志。请稍候..." - IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." - IDS_EVENTLOG_SYSTEM "System Logs" - IDS_EVENTLOG_APP "Application Logs" - IDS_EVENTLOG_USER "User Logs" + IDS_NO_ITEMS "视图中没有可供显示的项目。" // "日志中没有事件。" + IDS_EVENTLOG_SYSTEM "系统日志" + IDS_EVENTLOG_APP "程序日志" + IDS_EVENTLOG_USER "用户日志" IDS_EVENTSTRINGIDNOTFOUND "来源 ( %s ) 中的事件 ID ( %lu ) 的描述无法找到。本地计算机可能没有显示来自远程计算机消息所必需的注册表信息或消息 DLL 文件。\n\nThe following information is part of the event:\n\n" IDS_CLEAREVENTS_MSG "你想要在清除之前保存此事件日志吗？" IDS_SAVE_FILTER "事件日志 (*.evt)\0*.evt\0" diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 9fa791688f..5745b66746 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -59,7 +59,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "设置" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "普通", -1, 4, 2, 240, 61 + GROUPBOX "常规", -1, 4, 2, 240, 61 AUTOCHECKBOX "保存窗口位置(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 AUTOCHECKBOX "启动时更新可获得的程序列表(&U)", IDC_UPDATE_AVLIST, 15, 29, 222, 12 AUTOCHECKBOX "将程序的安装和卸载记录到日志(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12 @@ -82,17 +82,17 @@ END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "安装程序" +CAPTION "程序安装" FONT 9, "MS Shell Dlg" BEGIN LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 - AUTORADIOBUTTON "从存储设备安装 (CD 或 DVD)(&I)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "从磁盘安装 (CD 或 DVD)(&I)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "下载并安装(&D)", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP PUSHBUTTON "确定", IDOK, 86, 78, 60, 14 PUSHBUTTON "取消", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "正在下载 %ls..." FONT 9, "MS Shell Dlg" @@ -189,8 +189,8 @@ BEGIN IDS_INSTALL "安装" IDS_UNINSTALL "卸载" IDS_MODIFY "修改" - IDS_APPS_COUNT "程序个数：%d; Selected: %d" - IDS_WELCOME_TITLE "欢迎来到 ReactOS 程序管理器！\n\n" + IDS_APPS_COUNT "程序数量：%d；已选：%d" + IDS_WELCOME_TITLE "欢迎使用 ReactOS 程序管理器！\n\n" IDS_WELCOME_TEXT "从左栏选择一个类别，然后选择要安装或卸载的程序。\nReactOS 网站：" IDS_WELCOME_URL "http://www.reactos.org" IDS_INSTALLED "已安装" @@ -198,10 +198,10 @@ BEGIN IDS_UPDATES "更新" IDS_APPLICATIONS "应用程序" IDS_CHOOSE_FOLDER_TEXT "请选择用来保存下载文件的文件夹：" - IDS_CHOOSE_FOLDER_ERROR "您选择的文件夹不存在。创建吗？" + IDS_CHOOSE_FOLDER_ERROR "您选择的文件夹不存在。是否创建？" IDS_APP_REG_REMOVE "您确定要从注册表删除该程序的数据吗？" IDS_INFORMATION "信息" - IDS_UNABLE_TO_DOWNLOAD "无法下载该软件包！找不到网络的地址！" + IDS_UNABLE_TO_DOWNLOAD "无法下载该软件包！找不到网络的地址！" IDS_UNABLE_TO_DOWNLOAD2 "无法下载该软件包！请检查网络连接！" IDS_UNABLE_TO_REMOVE "无法从注册表删除该程序的数据！" IDS_UNABLE_TO_INSTALL "无法打开安装程序！" @@ -238,7 +238,7 @@ BEGIN IDS_LANGUAGE_AVAILABLE_TRANSLATION "支持您的语言" IDS_LANGUAGE_NO_TRANSLATION "支持其他语言" IDS_LANGUAGE_ENGLISH_TRANSLATION "支持英语" - IDS_LANGUAGE_SINGLE "但语言" + IDS_LANGUAGE_SINGLE "单语言" IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d 及更多)" IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d 可用)" END diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index edea415594..c43eda38eb 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -20,7 +20,7 @@ BEGIN LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 CONTROL "请访问<A HREF=""http://www.reactos.org/"">ReactOS 主页</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 - PUSHBUTTON "查看版权信息(&L)...", IDC_LICENCE, 170, 199, 78, 13 + PUSHBUTTON "查看协议(&L)...", IDC_LICENCE, 170, 199, 78, 13 END IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 @@ -52,7 +52,7 @@ BEGIN LTEXT "性能选项控制应用程序如何使用内存。这将会影响到计算机运行速度。", IDC_STATIC, 16, 29, 228, 17 PUSHBUTTON "设置", IDC_PERFOR, 194, 48, 50, 15 GROUPBOX "用户配置文件", IDC_STATIC, 6, 75, 244, 48 - LTEXT "与您登陆相关的桌面设置", IDC_STATIC, 16, 88, 228, 20 + LTEXT "与您登录相关的桌面设置", IDC_STATIC, 16, 88, 228, 20 PUSHBUTTON "设置", IDC_USERPROFILE, 194, 103, 50, 15 GROUPBOX "启动和故障恢复", IDC_STATIC, 6, 131, 244, 52 LTEXT "启动和故障恢复选项指定计算机如何启动并设定系统失败时所需要采取的动作。", IDC_STATIC, 16, 144, 228, 19 @@ -68,8 +68,8 @@ CAPTION "系统设置" FONT 9, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "版本信息", IDC_STATIC, 6, 3, 210, 73 - CONTROL "作为工作站的报告", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 - LTEXT "ReactOS建作为服务器操作系统并没有这样的报告。选中此框可更改此仅对应用程序而已。", IDC_STATIC, 15, 15, 183, 41 + CONTROL "报告为工作站(&R)", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 + LTEXT "ReactOS 作为服务器操作系统而被构建，并如此被报告。选中此框可更改（仅对于应用程序有效）。", IDC_STATIC, 15, 15, 183, 41 PUSHBUTTON "确定", IDOK, 166, 83, 50, 14 END @@ -265,7 +265,7 @@ BEGIN END IDD_LICENCE DIALOGEX 6, 5, 267, 159 -CAPTION "版权" +CAPTION "协议" FONT 9, "MS Shell Dlg", 0, 0, 0x0 STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN @@ -277,10 +277,10 @@ STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "系统" IDS_CPLSYSTEMDESCRIPTION "查看您的计算机系统的信息并更改各种系统及硬件设置" - IDS_MEGABYTE "MB内存" - IDS_GIGABYTE "GB内存" - IDS_TERABYTE "TB内存" - IDS_PETABYTE "PB内存" + IDS_MEGABYTE "MB 内存" + IDS_GIGABYTE "GB 内存" + IDS_TERABYTE "TB 内存" + IDS_PETABYTE "PB 内存" IDS_VARIABLE "变量" IDS_VALUE "值" IDS_NO_DUMP "(无)"

1 0

[reactos] 01/01: [VCDCLI] Fix typo
by Pierre Schweitzer 10 Dec '17

10 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f2db8fab98e3f9840b1a… commit 1f2db8fab98e3f9840b1af779d2400d8bad76c51 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 10 23:42:25 2017 +0100 [VCDCLI] Fix typo --- modules/rosapps/applications/cmdutils/vcdcli/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rosapps/applications/cmdutils/vcdcli/CMakeLists.txt b/modules/rosapps/applications/cmdutils/vcdcli/CMakeLists.txt index 528bfb6d47..c0a3348c79 100644 --- a/modules/rosapps/applications/cmdutils/vcdcli/CMakeLists.txt +++ b/modules/rosapps/applications/cmdutils/vcdcli/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/modules/rosapps/drivers/vcdrom) -add_executable(vcdcli vcdcli vcdcli.rc) +add_executable(vcdcli vcdcli.c vcdcli.rc) set_module_type(vcdcli win32cui UNICODE) add_importlibs(vcdcli advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET vcdcli DESTINATION reactos/system32 FOR all)

1 0

[reactos] 01/01: [KERNEL32] Update some console API prototypes.
by Hermès Bélusca-Maïto 10 Dec '17

10 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=197ec4c5b8f807ee64f32… commit 197ec4c5b8f807ee64f323d1461295841bd31c59 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 10 17:04:29 2017 +0100 [KERNEL32] Update some console API prototypes. --- dll/win32/kernel32/client/console/console.c | 4 ++-- dll/win32/kernel32/client/console/history.c | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dll/win32/kernel32/client/console/console.c b/dll/win32/kernel32/client/console/console.c index 71da03a83d..6547c0c2c3 100644 --- a/dll/win32/kernel32/client/console/console.c +++ b/dll/win32/kernel32/client/console/console.c @@ -2787,7 +2787,7 @@ SetConsoleIcon(HICON hIcon) BOOL WINAPI DECLSPEC_HOTPATCH -SetConsoleInputExeNameW(IN LPWSTR lpExeName) +SetConsoleInputExeNameW(IN LPCWSTR lpExeName) { DWORD ExeLength; @@ -2827,7 +2827,7 @@ SetConsoleInputExeNameW(IN LPWSTR lpExeName) BOOL WINAPI DECLSPEC_HOTPATCH -SetConsoleInputExeNameA(IN LPSTR lpExeName) +SetConsoleInputExeNameA(IN LPCSTR lpExeName) { NTSTATUS Status; #ifdef USE_TEB_STATIC_USTR diff --git a/dll/win32/kernel32/client/console/history.c b/dll/win32/kernel32/client/console/history.c index e874ca4dbb..b4513ea632 100644 --- a/dll/win32/kernel32/client/console/history.c +++ b/dll/win32/kernel32/client/console/history.c @@ -247,7 +247,7 @@ IntSetConsoleNumberOfCommands(DWORD dwNumCommands, VOID WINAPI DECLSPEC_HOTPATCH -ExpungeConsoleCommandHistoryW(LPCWSTR lpExeName) +ExpungeConsoleCommandHistoryW(IN LPCWSTR lpExeName) { IntExpungeConsoleCommandHistory(lpExeName, TRUE); } @@ -259,7 +259,7 @@ ExpungeConsoleCommandHistoryW(LPCWSTR lpExeName) VOID WINAPI DECLSPEC_HOTPATCH -ExpungeConsoleCommandHistoryA(LPCSTR lpExeName) +ExpungeConsoleCommandHistoryA(IN LPCSTR lpExeName) { IntExpungeConsoleCommandHistory(lpExeName, FALSE); } @@ -271,9 +271,9 @@ ExpungeConsoleCommandHistoryA(LPCSTR lpExeName) DWORD WINAPI DECLSPEC_HOTPATCH -GetConsoleCommandHistoryW(LPWSTR lpHistory, - DWORD cbHistory, - LPCWSTR lpExeName) +GetConsoleCommandHistoryW(OUT LPWSTR lpHistory, + IN DWORD cbHistory, + IN LPCWSTR lpExeName) { return IntGetConsoleCommandHistory(lpHistory, cbHistory, lpExeName, TRUE); } @@ -285,9 +285,9 @@ GetConsoleCommandHistoryW(LPWSTR lpHistory, DWORD WINAPI DECLSPEC_HOTPATCH -GetConsoleCommandHistoryA(LPSTR lpHistory, - DWORD cbHistory, - LPCSTR lpExeName) +GetConsoleCommandHistoryA(OUT LPSTR lpHistory, + IN DWORD cbHistory, + IN LPCSTR lpExeName) { return IntGetConsoleCommandHistory(lpHistory, cbHistory, lpExeName, FALSE); } @@ -299,7 +299,7 @@ GetConsoleCommandHistoryA(LPSTR lpHistory, DWORD WINAPI DECLSPEC_HOTPATCH -GetConsoleCommandHistoryLengthW(LPCWSTR lpExeName) +GetConsoleCommandHistoryLengthW(IN LPCWSTR lpExeName) { return IntGetConsoleCommandHistoryLength(lpExeName, TRUE); } @@ -311,7 +311,7 @@ GetConsoleCommandHistoryLengthW(LPCWSTR lpExeName) DWORD WINAPI DECLSPEC_HOTPATCH -GetConsoleCommandHistoryLengthA(LPCSTR lpExeName) +GetConsoleCommandHistoryLengthA(IN LPCSTR lpExeName) { return IntGetConsoleCommandHistoryLength(lpExeName, FALSE); } @@ -323,8 +323,8 @@ GetConsoleCommandHistoryLengthA(LPCSTR lpExeName) BOOL WINAPI DECLSPEC_HOTPATCH -SetConsoleNumberOfCommandsW(DWORD dwNumCommands, - LPCWSTR lpExeName) +SetConsoleNumberOfCommandsW(IN DWORD dwNumCommands, + IN LPCWSTR lpExeName) { return IntSetConsoleNumberOfCommands(dwNumCommands, lpExeName, TRUE); } @@ -336,8 +336,8 @@ SetConsoleNumberOfCommandsW(DWORD dwNumCommands, BOOL WINAPI DECLSPEC_HOTPATCH -SetConsoleNumberOfCommandsA(DWORD dwNumCommands, - LPCSTR lpExeName) +SetConsoleNumberOfCommandsA(IN DWORD dwNumCommands, + IN LPCSTR lpExeName) { return IntSetConsoleNumberOfCommands(dwNumCommands, lpExeName, FALSE); }

1 0

[reactos] 03/03: [NTOS:KD] Protect against invalid user arguments for BREAKPOINT_LOAD_SYMBOLS. CORE-14057
by Thomas Faber 10 Dec '17

10 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68ebcf16b8472a61e23a0… commit 68ebcf16b8472a61e23a03fd44a9ba98155f53cd Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Dec 8 14:45:26 2017 +0100 [NTOS:KD] Protect against invalid user arguments for BREAKPOINT_LOAD_SYMBOLS. CORE-14057 --- ntoskrnl/kd/kdmain.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index a6627b8ec0..52b8babbce 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -153,11 +153,38 @@ KdpEnterDebuggerException(IN PKTRAP_FRAME TrapFrame, #ifdef KDBG else if (ExceptionCommand == BREAKPOINT_LOAD_SYMBOLS) { + PKD_SYMBOLS_INFO SymbolsInfo; + KD_SYMBOLS_INFO CapturedSymbolsInfo; PLDR_DATA_TABLE_ENTRY LdrEntry; - /* Load symbols. Currently implemented only for KDBG! */ - if(KdbpSymFindModule(((PKD_SYMBOLS_INFO)ExceptionRecord->ExceptionInformation[2])->BaseOfDll, NULL, -1, &LdrEntry)) - KdbSymProcessSymbols(LdrEntry); + SymbolsInfo = (PKD_SYMBOLS_INFO)ExceptionRecord->ExceptionInformation[2]; + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForRead(SymbolsInfo, + sizeof(*SymbolsInfo), + 1); + RtlCopyMemory(&CapturedSymbolsInfo, + SymbolsInfo, + sizeof(*SymbolsInfo)); + SymbolsInfo = &CapturedSymbolsInfo; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SymbolsInfo = NULL; + } + _SEH2_END; + } + + if (SymbolsInfo != NULL) + { + /* Load symbols. Currently implemented only for KDBG! */ + if (KdbpSymFindModule(SymbolsInfo->BaseOfDll, NULL, -1, &LdrEntry)) + { + KdbSymProcessSymbols(LdrEntry); + } + } } else if (ExceptionCommand == BREAKPOINT_PROMPT) {

1 0

[reactos] 02/03: [NTOS:KD] Protect against invalid user arguments in KdpPrintString. CORE-14057
by Thomas Faber 10 Dec '17

10 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34ccecbce889ec2d8ce65… commit 34ccecbce889ec2d8ce659e6fcdf9719775fd960 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Dec 8 14:41:41 2017 +0100 [NTOS:KD] Protect against invalid user arguments in KdpPrintString. CORE-14057 --- ntoskrnl/include/internal/kd.h | 4 ++-- ntoskrnl/kd/kdio.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 9bb744319a..05179ea6d3 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -193,8 +193,8 @@ KdpCallGdb( ULONG NTAPI KdpPrintString( - LPSTR String, - ULONG Length); + _In_reads_bytes_(Length) PCHAR UnsafeString, + _In_ ULONG Length); ULONG NTAPI diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 8dc3366f03..3fedfd7ca5 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -567,14 +567,38 @@ KdpScreenInit(PKD_DISPATCH_TABLE DispatchTable, ULONG NTAPI -KdpPrintString(LPSTR String, - ULONG Length) +KdpPrintString( + _In_reads_bytes_(Length) PCHAR UnsafeString, + _In_ ULONG Length) { PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; + PCHAR String; if (!KdpDebugMode.Value) return 0; + Length = min(Length, 512); + + if (ExGetPreviousMode() != KernelMode) + { + _SEH2_TRY + { + ProbeForRead(UnsafeString, Length, 1); + String = _alloca(Length + 1); + RtlCopyMemory(String, UnsafeString, Length); + String[Length] = ANSI_NULL; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + return 0; + } + _SEH2_END; + } + else + { + String = UnsafeString; + } + /* Call the registered handlers */ CurrentEntry = KdProviders.Flink; while (CurrentEntry != &KdProviders)

1 0

[reactos] 01/03: [NTOS:KD] Protect against invalid user arguments in KdpPrompt. CORE-14057
by Thomas Faber 10 Dec '17

10 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a38c76266b30b9895563… commit 1a38c76266b30b9895563b57d398beac108fd729 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Dec 8 14:39:31 2017 +0100 [NTOS:KD] Protect against invalid user arguments in KdpPrompt. CORE-14057 --- ntoskrnl/include/internal/kd.h | 9 +++--- ntoskrnl/kd/kdmain.c | 3 +- ntoskrnl/kdbg/kdb_cli.c | 72 +++++++++++++++++++++++++++++++++++++++--- 3 files changed, 75 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index d3daabfeb7..9bb744319a 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -199,10 +199,11 @@ KdpPrintString( ULONG NTAPI KdpPrompt( - IN LPSTR InString, - IN USHORT InStringLength, - OUT LPSTR OutString, - IN USHORT OutStringLength + _In_reads_bytes_(InStringLength) PCHAR UnsafeInString, + _In_ USHORT InStringLength, + _Out_writes_bytes_(OutStringLength) PCHAR UnsafeOutString, + _In_ USHORT OutStringLength, + _In_ KPROCESSOR_MODE PreviousMode ); BOOLEAN diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index aca1961bb0..a6627b8ec0 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -175,7 +175,8 @@ KdpEnterDebuggerException(IN PKTRAP_FRAME TrapFrame, (USHORT)ExceptionRecord-> ExceptionInformation[2], OutString, - OutStringLength); + OutStringLength, + PreviousMode); /* Return the number of characters that we received */ Context->Eax = ReturnValue; diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index d5e7fde4d2..db7dae7981 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3662,15 +3662,61 @@ extern KSPIN_LOCK KdpSerialSpinLock; ULONG NTAPI -KdpPrompt(IN LPSTR InString, - IN USHORT InStringLength, - OUT LPSTR OutString, - IN USHORT OutStringLength) +KdpPrompt( + _In_reads_bytes_(InStringLength) PCHAR UnsafeInString, + _In_ USHORT InStringLength, + _Out_writes_bytes_(OutStringLength) PCHAR UnsafeOutString, + _In_ USHORT OutStringLength, + _In_ KPROCESSOR_MODE PreviousMode) { USHORT i; CHAR Response; ULONG DummyScanCode; KIRQL OldIrql; + PCHAR InString; + PCHAR OutString; + + /* Normalize the lengths */ + InStringLength = min(InStringLength, + 512); + OutStringLength = min(OutStringLength, + 512); + + /* Check if we need to verify the string */ + if (PreviousMode != KernelMode) + { + /* Handle user-mode buffers safely */ + _SEH2_TRY + { + /* Probe the prompt */ + ProbeForRead(UnsafeInString, + InStringLength, + 1); + + /* Capture prompt */ + InString = _alloca(InStringLength); + RtlCopyMemory(InString, + UnsafeInString, + InStringLength); + + /* Probe and make room for response */ + ProbeForWrite(UnsafeOutString, + OutStringLength, + 1); + OutString = _alloca(OutStringLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Bad string pointer, bail out */ + _SEH2_YIELD(return 0); + } + _SEH2_END; + } + else + { + InString = UnsafeInString; + OutString = UnsafeOutString; + } /* Acquire the printing spinlock without waiting at raised IRQL */ while (TRUE) @@ -3779,6 +3825,24 @@ KdpPrompt(IN LPSTR InString, /* Lower IRQL back */ KeLowerIrql(OldIrql); + /* Copy back response if required */ + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + /* Safely copy back response to user mode */ + RtlCopyMemory(UnsafeOutString, + OutString, + i); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* String became invalid after we exited, fail */ + _SEH2_YIELD(return 0); + } + _SEH2_END; + } + /* Return the length */ return i; }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2017