Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[ekohl] 58816: [LSASRV] Open the caller process using more access rights in order to be able to allocate memory in the callers address space and to be able to write into the allocated memory.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Apr 21 20:05:26 2013 New Revision: 58816 URL: http://svn.reactos.org/svn/reactos?rev=58816&view=rev Log: [LSASRV] Open the caller process using more access rights in order to be able to allocate memory in the callers address space and to be able to write into the allocated memory. Modified: trunk/reactos/dll/win32/lsasrv/authport.c Modified: trunk/reactos/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authport.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] Sun Apr 21 20:05:26 2013 @@ -59,7 +59,7 @@ NULL); Status = NtOpenProcess(&ProcessHandle, - PROCESS_VM_READ, + PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_VM_OPERATION, &ObjectAttributes, &RequestMsg->h.ClientId); if (!NT_SUCCESS(Status))

11 years, 8 months

[ekohl] 58815: [LSALIB] - Fix LsaFreeReturnBuffer. It is used to free virtual memory instead of heap memory because Buffer is a pointer to a virtual memory buffer that has been allocated by an auth...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Apr 21 19:44:54 2013 New Revision: 58815 URL: http://svn.reactos.org/svn/reactos?rev=58815&view=rev Log: [LSALIB] - Fix LsaFreeReturnBuffer. It is used to free virtual memory instead of heap memory because Buffer is a pointer to a virtual memory buffer that has been allocated by an authentication package. - Fix several DataLength calculations and a typo. Modified: trunk/reactos/lib/lsalib/lsa.c Modified: trunk/reactos/lib/lsalib/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lsalib/lsa.c?rev=58815… ============================================================================== --- trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] (original) +++ trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] Sun Apr 21 19:44:54 2013 @@ -11,6 +11,7 @@ #include <ndk/lpctypes.h> #include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/obfuncs.h> #include <psdk/ntsecapi.h> @@ -37,7 +38,7 @@ DPRINT1("LsaDeregisterLogonProcess()\n"); ApiMessage.ApiNumber = LSASS_REQUEST_DEREGISTER_LOGON_PROCESS; - ApiMessage.h.u1.s1.DataLength = LSA_PORT_DATA_SIZE(ApiMessage.DeregisterLogonProcess.Request); + ApiMessage.h.u1.s1.DataLength = LSA_PORT_DATA_SIZE(ApiMessage.DeregisterLogonProcess); ApiMessage.h.u1.s1.TotalLength = LSA_PORT_MESSAGE_SIZE; ApiMessage.h.u2.ZeroInit = 0; @@ -93,7 +94,7 @@ DPRINT1("LsaCallAuthenticationPackage()\n"); ApiMessage.ApiNumber = LSASS_REQUEST_CALL_AUTHENTICATION_PACKAGE; - ApiMessage.h.u1.s1.DataLength = LSA_PORT_DATA_SIZE(ApiMessage.CallAuthenticationPackage.Request); + ApiMessage.h.u1.s1.DataLength = LSA_PORT_DATA_SIZE(ApiMessage.CallAuthenticationPackage); ApiMessage.h.u1.s1.TotalLength = LSA_PORT_MESSAGE_SIZE; ApiMessage.h.u2.ZeroInit = 0; @@ -180,7 +181,12 @@ NTSTATUS WINAPI LsaFreeReturnBuffer(PVOID Buffer) { - return RtlFreeHeap(Secur32Heap, 0, Buffer); + ULONG Length = 0; + + return ZwFreeVirtualMemory(NtCurrentProcess(), + &Buffer, + &Length, + MEM_RELEASE); } @@ -202,7 +208,7 @@ } ApiMessage.ApiNumber = LSASS_REQUEST_LOOKUP_AUTHENTICATION_PACKAGE; - ApiMessage.h.u1.s1.DataLength = LSA_PORT_DATA_SIZE(ApiMessage.LookupAuthenticationPackage.Request); + ApiMessage.h.u1.s1.DataLength = LSA_PORT_DATA_SIZE(ApiMessage.LookupAuthenticationPackage); ApiMessage.h.u1.s1.TotalLength = LSA_PORT_MESSAGE_SIZE; ApiMessage.h.u2.ZeroInit = 0; @@ -254,7 +260,7 @@ NTSTATUS Status; ApiMessage.ApiNumber = LSASS_REQUEST_LOGON_USER; - ApiMessage.h.u1.s1.DataLength = LSA_PORT_DATA_SIZE(ApiMessage.LogonUser.Request); + ApiMessage.h.u1.s1.DataLength = LSA_PORT_DATA_SIZE(ApiMessage.LogonUser); ApiMessage.h.u1.s1.TotalLength = LSA_PORT_MESSAGE_SIZE; ApiMessage.h.u2.ZeroInit = 0; @@ -267,7 +273,7 @@ if (LocalGroups != NULL) ApiMessage.LogonUser.Request.LocalGroupsCount = LocalGroups->GroupCount; else - ApiMessage.LogonUser.Request.LocalGroups = 0; + ApiMessage.LogonUser.Request.LocalGroupsCount = 0; ApiMessage.LogonUser.Request.SourceContext = *SourceContext; Status = ZwRequestWaitReplyPort(LsaHandle,

11 years, 8 months

[pschweitzer] 58814: [KERNEL32] Implement support for WC translation to DOS so that they are correctly passed to FsRtlIs*InExpression() Please retest issues CORE-5125 and CORE-7100

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 21 19:01:09 2013 New Revision: 58814 URL: http://svn.reactos.org/svn/reactos?rev=58814&view=rev Log: [KERNEL32] Implement support for WC translation to DOS so that they are correctly passed to FsRtlIs*InExpression() Please retest issues CORE-5125 and CORE-7100 Modified: trunk/reactos/dll/win32/kernel32/client/file/find.c Modified: trunk/reactos/dll/win32/kernel32/client/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] Sun Apr 21 19:01:09 2013 @@ -817,6 +817,46 @@ { FilePattern.Length = 2; } + else + { + /* Translate wildcard from "real" world to DOS world for lower interpretation */ + USHORT PatternIndex = 0; + while (PatternIndex < FilePattern.Length / sizeof(WCHAR)) + { + if (PatternIndex > 0) + { + if (FilePattern.Buffer[PatternIndex] == L'.' && + FilePattern.Buffer[PatternIndex - 1] == L'*') + { + FilePattern.Buffer[PatternIndex - 1] = L'<'; + } + } + + if (FilePattern.Buffer[PatternIndex] == L'?') + { + FilePattern.Buffer[PatternIndex] = L'>'; + if (PatternIndex > 0) + { + if (FilePattern.Buffer[PatternIndex - 1] == L'.') + { + FilePattern.Buffer[PatternIndex - 1] = L'\"'; + } + } + } + else if (FilePattern.Buffer[PatternIndex] == L'*') + { + if (PatternIndex > 0) + { + if (FilePattern.Buffer[PatternIndex - 1] == L'.') + { + FilePattern.Buffer[PatternIndex - 1] = L'\"'; + } + } + } + + PatternIndex++; + } + } Status = NtQueryDirectoryFile(hDirectory, NULL, NULL, NULL,

11 years, 8 months

[tfaber] 58813: [KMTESTS] - Add a kernel32 test (I know right) to check how FindFirstFile* modifies wildcards ROSTESTS-104 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 21 19:00:10 2013 New Revision: 58813 URL: http://svn.reactos.org/svn/reactos?rev=58813&view=rev Log: [KMTESTS] - Add a kernel32 test (I know right) to check how FindFirstFile* modifies wildcards ROSTESTS-104 #resolve Added: trunk/rostests/kmtests/kernel32/ (with props) trunk/rostests/kmtests/kernel32/CMakeLists.txt (with props) trunk/rostests/kmtests/kernel32/FindFile.h (with props) trunk/rostests/kmtests/kernel32/FindFile_drv.c (with props) trunk/rostests/kmtests/kernel32/FindFile_user.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Sun Apr 21 19:00:10 2013 @@ -5,6 +5,7 @@ # subdirectories containing special-purpose drivers # add_subdirectory(example) +add_subdirectory(kernel32) add_subdirectory(ntos_io) list(APPEND COMMON_SOURCE @@ -87,6 +88,7 @@ kmtest/testlist.c example/Example_user.c + kernel32/FindFile_user.c ntos_io/IoDeviceObject_user.c ${COMMON_SOURCE} Propchange: trunk/rostests/kmtests/kernel32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Apr 21 19:00:10 2013 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/kmtests/kernel32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/kmtests/kernel32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/kmtests/kernel32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/kmtests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/CMakeLis… ============================================================================== --- trunk/rostests/kmtests/kernel32/CMakeLists.txt (added) +++ trunk/rostests/kmtests/kernel32/CMakeLists.txt [iso-8859-1] Sun Apr 21 19:00:10 2013 @@ -1,0 +1,16 @@ +include_directories( + ../include) + +list(APPEND FINDFILE_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + FindFile_drv.c) + +add_library(findfile_drv SHARED ${FINDFILE_DRV_SOURCE}) + +set_module_type(findfile_drv kernelmodedriver) +target_link_libraries(findfile_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(findfile_drv ntoskrnl hal) +add_target_compile_definitions(findfile_drv KMT_STANDALONE_DRIVER) +#add_pch(findfile_drv ../include/kmt_test.h) + +add_cd_file(TARGET findfile_drv DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/kmtests/kernel32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/kernel32/FindFile.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/FindFile… ============================================================================== --- trunk/rostests/kmtests/kernel32/FindFile.h (added) +++ trunk/rostests/kmtests/kernel32/FindFile.h [iso-8859-1] Sun Apr 21 19:00:10 2013 @@ -1,0 +1,13 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: FindFirstFile wildcard substitution test declarations + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#ifndef _KMTEST_FINDFILE_H_ +#define _KMTEST_FINDFILE_H_ + +#define IOCTL_EXPECT 1 + +#endif /* !defined _KMTEST_FINDFILE_H_ */ Propchange: trunk/rostests/kmtests/kernel32/FindFile.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/kernel32/FindFile_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/FindFile… ============================================================================== --- trunk/rostests/kmtests/kernel32/FindFile_drv.c (added) +++ trunk/rostests/kmtests/kernel32/FindFile_drv.c [iso-8859-1] Sun Apr 21 19:00:10 2013 @@ -1,0 +1,123 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test driver for FindFirstFile's wildcard substitution + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +#include "FindFile.h" + +static KMT_MESSAGE_HANDLER TestMessageHandler; +static KMT_IRP_HANDLER TestIrpHandler; + +static UNICODE_STRING ExpectedExpression = RTL_CONSTANT_STRING(L"<not set>"); +static WCHAR ExpressionBuffer[MAX_PATH]; + +NTSTATUS +TestEntry( + IN PDRIVER_OBJECT DriverObject, + IN PCUNICODE_STRING RegistryPath, + OUT PCWSTR *DeviceName, + IN OUT INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + *DeviceName = L"FindFile"; + *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE; + + KmtRegisterIrpHandler(IRP_MJ_DIRECTORY_CONTROL, NULL, TestIrpHandler); + KmtRegisterMessageHandler(0, NULL, TestMessageHandler); + + return Status; +} + +VOID +TestUnload( + IN PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); +} + +static +NTSTATUS +TestMessageHandler( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN PVOID Buffer OPTIONAL, + IN SIZE_T InLength, + IN OUT PSIZE_T OutLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + switch (ControlCode) + { + case IOCTL_EXPECT: + { + C_ASSERT(sizeof(ExpressionBuffer) <= UNICODE_STRING_MAX_BYTES); + DPRINT("IOCTL_EXPECT, InLength = %lu\n", InLength); + if (InLength > sizeof(ExpressionBuffer)) + return STATUS_BUFFER_OVERFLOW; + + if (InLength % sizeof(WCHAR) != 0) + return STATUS_INVALID_PARAMETER; + + RtlInitEmptyUnicodeString(&ExpectedExpression, ExpressionBuffer, sizeof(ExpressionBuffer)); + RtlCopyMemory(ExpressionBuffer, Buffer, InLength); + ExpectedExpression.Length = (USHORT)InLength; + DPRINT("IOCTL_EXPECT: %wZ\n", &ExpectedExpression); + + break; + } + default: + return STATUS_NOT_SUPPORTED; + } + + return Status; +} + +static +NTSTATUS +TestIrpHandler( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status = STATUS_NOT_SUPPORTED; + + PAGED_CODE(); + + DPRINT("IRP %x/%x\n", IoStackLocation->MajorFunction, IoStackLocation->MinorFunction); + ASSERT(IoStackLocation->MajorFunction == IRP_MJ_DIRECTORY_CONTROL); + + ok(IoStackLocation->MinorFunction == IRP_MN_QUERY_DIRECTORY, "Minor function: %u\n", IoStackLocation->MinorFunction); + if (IoStackLocation->MinorFunction == IRP_MN_QUERY_DIRECTORY) + { + ok(IoStackLocation->Parameters.QueryDirectory.FileInformationClass == FileBothDirectoryInformation, + "FileInformationClass: %d\n", IoStackLocation->Parameters.QueryDirectory.FileInformationClass); + if (IoStackLocation->Parameters.QueryDirectory.FileInformationClass == FileBothDirectoryInformation) + { + ok(RtlEqualUnicodeString(IoStackLocation->Parameters.QueryDirectory.FileName, &ExpectedExpression, FALSE), + "Expression is '%wZ', expected '%wZ'\n", IoStackLocation->Parameters.QueryDirectory.FileName, &ExpectedExpression); + RtlZeroMemory(Irp->UserBuffer, IoStackLocation->Parameters.QueryDirectory.Length); + Status = STATUS_SUCCESS; + } + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Propchange: trunk/rostests/kmtests/kernel32/FindFile_drv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/kernel32/FindFile_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/FindFile… ============================================================================== --- trunk/rostests/kmtests/kernel32/FindFile_user.c (added) +++ trunk/rostests/kmtests/kernel32/FindFile_user.c [iso-8859-1] Sun Apr 21 19:00:10 2013 @@ -1,0 +1,94 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for FindFirstFile's wildcard substitution + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <kmt_test.h> + +#include "FindFile.h" + +START_TEST(FindFile) +{ + HANDLE FindHandle; + WIN32_FIND_DATAW FindData; + struct + { + PCWSTR Expression; + PCWSTR ExpectedExpression; + } Tests[] = + { + { L"Hello", L"Hello" }, + + { L"*", L"*" }, + { L"a*", L"a*" }, + { L"*a", L"*a" }, + { L"a*a", L"a*a" }, + { L"**", L"**" }, + { L"*a*", L"*a*" }, + { L"a*a*a", L"a*a*a" }, + + { L"*.*", L"*" }, + { L"a*.*", L"a<\"*" }, + { L"*.*a", L"<\"*a" }, + { L"a*.*a", L"a<\"*a" }, + { L"*.**.*", L"<\"*<\"*" }, + { L"*.*a*.*", L"<\"*a<\"*" }, + { L"a*.*a*.*a", L"a<\"*a<\"*a" }, + + { L".*", L"\"*" }, + { L"a.*", L"a\"*" }, + { L".*a", L"\"*a" }, + { L"a.*a", L"a\"*a" }, + { L".*.*", L"\"<\"*" }, + { L".*a.*", L"\"*a\"*" }, + { L"a.*a.*a", L"a\"*a\"*a" }, + + { L"*.", L"<" }, + { L"a*.", L"a<" }, + { L"*.a", L"<.a" }, + { L"a*.a", L"a<.a" }, + { L"*.*.", L"*" }, + { L"*.a*.", L"<.a<" }, + { L"a*.a*.a", L"a<.a<.a" }, + + { L"?", L">" }, + { L"a?", L"a>" }, + { L"?a", L">a" }, + { L"a?a", L"a>a" }, + { L"??", L">>" }, + { L"?a?", L">a>" }, + { L"a?a?a", L"a>a>a" }, + + { L"f*.", L"f<" }, + { L"f.*", L"f\"*" }, + { L"f*.*", L"f<\"*" }, + { L"f*.f*", L"f<.f*" }, + { L"f*f.*", L"f*f\"*" }, + { L"f*.*f", L"f<\"*f" }, + + /* TODO: add more. Have fun */ + }; + const INT TestCount = sizeof(Tests) / sizeof(Tests[0]); + INT i; + WCHAR ExpressionBuffer[MAX_PATH]; + + KmtLoadDriver(L"FindFile", FALSE); + KmtOpenDriver(); + + for (i = 0; i < TestCount; i++) + { + trace("[%d] '%ls', '%ls'\n", i, Tests[i].Expression, Tests[i].ExpectedExpression); + KmtSendWStringToDriver(IOCTL_EXPECT, Tests[i].ExpectedExpression); + wcscpy(ExpressionBuffer, L"\\\\.\\Global\\GLOBALROOT\\Device\\Kmtest-FindFile\\"); + wcscat(ExpressionBuffer, Tests[i].Expression); + FindHandle = FindFirstFileW(ExpressionBuffer, &FindData); + ok(FindHandle != NULL && FindHandle != INVALID_HANDLE_VALUE, "Handle: %p, error=%lu\n", (PVOID)FindHandle, GetLastError()); + if (FindHandle != INVALID_HANDLE_VALUE) + FindClose(FindHandle); + } + + KmtCloseDriver(); + KmtUnloadDriver(); +} Propchange: trunk/rostests/kmtests/kernel32/FindFile_user.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Sun Apr 21 19:00:10 2013 @@ -8,6 +8,7 @@ #include <kmt_test.h> KMT_TESTFUNC Test_Example; +KMT_TESTFUNC Test_FindFile; KMT_TESTFUNC Test_IoDeviceObject; KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlException; @@ -19,6 +20,7 @@ const KMT_TEST TestList[] = { { "Example", Test_Example }, + { "FindFile", Test_FindFile }, { "IoDeviceObject", Test_IoDeviceObject }, { "RtlAvlTree", Test_RtlAvlTree }, { "RtlException", Test_RtlException },

11 years, 8 months

[tfaber] 58812: [KMTESTS] - Add KmtSendWStringToDriver to easily send unicode strings to special-purpose drivers - Add TESTENTRY_NO_EXCLUSIVE_DEVICE flag for non-exclusive devices in special-purpos...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 21 18:53:51 2013 New Revision: 58812 URL: http://svn.reactos.org/svn/reactos?rev=58812&view=rev Log: [KMTESTS] - Add KmtSendWStringToDriver to easily send unicode strings to special-purpose drivers - Add TESTENTRY_NO_EXCLUSIVE_DEVICE flag for non-exclusive devices in special-purpose drivers ROSTESTS-104 Modified: trunk/rostests/kmtests/include/kmt_test.h trunk/rostests/kmtests/kmtest/support.c trunk/rostests/kmtests/kmtest_drv/kmtest_standalone.c Modified: trunk/rostests/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test.… ============================================================================== --- trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] Sun Apr 21 18:53:51 2013 @@ -66,6 +66,7 @@ TESTENTRY_NO_CREATE_DEVICE = 1, TESTENTRY_NO_REGISTER_DISPATCH = 2, TESTENTRY_NO_REGISTER_UNLOAD = 4, + TESTENTRY_NO_EXCLUSIVE_DEVICE = 8, } KMT_TESTENTRY_FLAGS; NTSTATUS TestEntry(IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING RegistryPath, OUT PCWSTR *DeviceName, IN OUT INT *Flags); @@ -98,6 +99,7 @@ DWORD KmtSendToDriver(IN DWORD ControlCode); DWORD KmtSendStringToDriver(IN DWORD ControlCode, IN PCSTR String); +DWORD KmtSendWStringToDriver(IN DWORD ControlCode, IN PCWSTR String); DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer OPTIONAL, IN DWORD InLength, IN OUT PDWORD OutLength); #else /* if !defined KMT_KERNEL_MODE && !defined KMT_USER_MODE */ #error either KMT_KERNEL_MODE or KMT_USER_MODE must be defined Modified: trunk/rostests/kmtests/kmtest/support.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/support.c?… ============================================================================== --- trunk/rostests/kmtests/kmtest/support.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/support.c [iso-8859-1] Sun Apr 21 18:53:51 2013 @@ -188,6 +188,31 @@ } /** + * @name KmtSendStringToDriver + * + * Unload special-purpose driver (stop the service) + * + * @param ControlCode + * @param String + * + * @return Win32 error code as returned by DeviceIoControl + */ +DWORD +KmtSendWStringToDriver( + IN DWORD ControlCode, + IN PCWSTR String) +{ + DWORD BytesRead; + + assert(ControlCode < 0x400); + + if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), (PVOID)String, (DWORD)wcslen(String) * sizeof(WCHAR), NULL, 0, &BytesRead, NULL)) + return GetLastError(); + + return ERROR_SUCCESS; +} + +/** * @name KmtSendBufferToDriver * * @param ControlCode Modified: trunk/rostests/kmtests/kmtest_drv/kmtest_standalone.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/kmtest… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/kmtest_standalone.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/kmtest_standalone.c [iso-8859-1] Sun Apr 21 18:53:51 2013 @@ -122,7 +122,8 @@ Status = IoCreateDevice(DriverObject, 0, &DeviceName, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN | FILE_READ_ONLY_DEVICE, - TRUE, &TestDeviceObject); + Flags & TESTENTRY_NO_EXCLUSIVE_DEVICE ? FALSE : TRUE, + &TestDeviceObject); if (!NT_SUCCESS(Status)) {

11 years, 8 months

[akhaldi] 58811: [SHDOCVW_WINETEST] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 21 16:40:23 2013 New Revision: 58811 URL: http://svn.reactos.org/svn/reactos?rev=58811&view=rev Log: [SHDOCVW_WINETEST] * Sync with Wine 1.5.26. Removed: trunk/rostests/winetests/shdocvw/intshcut.c trunk/rostests/winetests/shdocvw/webbrowser.c Modified: trunk/rostests/winetests/shdocvw/CMakeLists.txt trunk/rostests/winetests/shdocvw/shdocvw.c trunk/rostests/winetests/shdocvw/shortcut.c trunk/rostests/winetests/shdocvw/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/CMakeLi… Removed: trunk/rostests/winetests/shdocvw/intshcut.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/intshcu… Modified: trunk/rostests/winetests/shdocvw/shdocvw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/shdocvw… Modified: trunk/rostests/winetests/shdocvw/shortcut.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/shortcu… Modified: trunk/rostests/winetests/shdocvw/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/testlis… Removed: trunk/rostests/winetests/shdocvw/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/webbrow…

11 years, 8 months

[pschweitzer] 58810: [NTOSKRNL] Reimplement (& fix) handling of DOS_DOT in FsRtlIs*InExpression(). This fixes lots of failing tests

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 21 15:53:59 2013 New Revision: 58810 URL: http://svn.reactos.org/svn/reactos?rev=58810&view=rev Log: [NTOSKRNL] Reimplement (& fix) handling of DOS_DOT in FsRtlIs*InExpression(). This fixes lots of failing tests Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Sun Apr 21 15:53:59 2013 @@ -163,6 +163,7 @@ SHORT StarFound = -1; PUSHORT BackTracking = NULL; USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; + BOOLEAN BeyondName; PAGED_CODE(); ASSERT(Name->Length); @@ -227,6 +228,41 @@ MatchingChars++; } ExpressionPosition++; + } + /* Check DOS_DOT */ + else if (Expression->Buffer[ExpressionPosition] == DOS_DOT) + { + /* First try to find whether we are beyond last dot (beyond name) */ + BeyondName = TRUE; + MatchingChars = NamePosition + 1; + while (MatchingChars < Name->Length) + { + if (Name->Buffer[MatchingChars] == '.') + { + BeyondName = FALSE; + break; + } + MatchingChars++; + } + + /* If we are beyond name, we null match */ + if (BeyondName) + { + ExpressionPosition++; + continue; + } + /* If not, we only match a dot */ + else if (Name->Buffer[NamePosition] == '.') + { + NamePosition++; + ExpressionPosition++; + continue; + } + /* Otherwise, fail */ + else + { + break; + } } /* If nothing match, try to backtrack */ else if (StarFound >= 0) Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Apr 21 15:53:59 2013 @@ -28,6 +28,7 @@ UNICODE_STRING IntExpression; USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; WCHAR CompareChar; + BOOLEAN BeyondName; PAGED_CODE(); /* Check if we were given strings at all */ @@ -112,8 +113,7 @@ ExpressionPosition++; } /* Check cases that eat one char */ - else if (Expression->Buffer[ExpressionPosition] == L'?' || (Expression->Buffer[ExpressionPosition] == DOS_QM) || - (Expression->Buffer[ExpressionPosition] == DOS_DOT && Name->Buffer[NamePosition] == L'.')) + else if (Expression->Buffer[ExpressionPosition] == L'?' || (Expression->Buffer[ExpressionPosition] == DOS_QM)) { NamePosition++; ExpressionPosition++; @@ -163,6 +163,41 @@ MatchingChars++; } ExpressionPosition++; + } + /* Check DOS_DOT */ + else if (Expression->Buffer[ExpressionPosition] == DOS_DOT) + { + /* First try to find whether we are beyond last dot (beyond name) */ + BeyondName = TRUE; + MatchingChars = NamePosition + 1; + while (MatchingChars < Name->Length / sizeof(WCHAR)) + { + if (Name->Buffer[MatchingChars] == L'.') + { + BeyondName = FALSE; + break; + } + MatchingChars++; + } + + /* If we are beyond name, we null match */ + if (BeyondName) + { + ExpressionPosition++; + continue; + } + /* If not, we only match a dot */ + else if (Name->Buffer[NamePosition] == L'.') + { + NamePosition++; + ExpressionPosition++; + continue; + } + /* Otherwise, fail */ + else + { + break; + } } /* If nothing match, try to backtrack */ else if (StarFound >= 0)

11 years, 8 months

[gadamopoulos] 58809: [desk.cpl] - Add missing file - In desk.cpl we now use RegLoadMUIStringW however this function is introduced in vista. Since we don't have an official policy what to do in suc...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Apr 21 14:42:16 2013 New Revision: 58809 URL: http://svn.reactos.org/svn/reactos?rev=58809&view=rev Log: [desk.cpl] - Add missing file - In desk.cpl we now use RegLoadMUIStringW however this function is introduced in vista. Since we don't have an official policy what to do in such cases I chose to create a local copy of this function here becasue it also lets us test desk.cpl in xp Added: trunk/reactos/dll/cpl/desk/muireg.c (with props) Added: trunk/reactos/dll/cpl/desk/muireg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/muireg.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/muireg.c (added) +++ trunk/reactos/dll/cpl/desk/muireg.c [iso-8859-1] Sun Apr 21 14:42:16 2013 @@ -1,0 +1,144 @@ +#include "desk.h" + +/****************************************************************************** + * load_string [Internal] + * + * This is basically a copy of user32/resource.c's LoadStringW. Necessary to + * avoid importing user32, which is higher level than advapi32. Helper for + * RegLoadMUIString. + */ +static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars) +{ + HGLOBAL hMemory; + HRSRC hResource; + WCHAR *pString; + int idxString; + + /* Negative values have to be inverted. */ + if (HIWORD(resId) == 0xffff) + resId = (UINT)(-((INT)resId)); + + /* Load the resource into memory and get a pointer to it. */ + hResource = FindResourceW(hModule, MAKEINTRESOURCEW(LOWORD(resId >> 4) + 1), (LPWSTR)RT_STRING); + if (!hResource) return 0; + hMemory = LoadResource(hModule, hResource); + if (!hMemory) return 0; + pString = LockResource(hMemory); + + /* Strings are length-prefixed. Lowest nibble of resId is an index. */ + idxString = resId & 0xf; + while (idxString--) pString += *pString + 1; + + /* If no buffer is given, return length of the string. */ + if (!pwszBuffer) return *pString; + + /* Else copy over the string, respecting the buffer size. */ + cMaxChars = (*pString < cMaxChars) ? *pString : (cMaxChars - 1); + if (cMaxChars >= 0) + { + memcpy(pwszBuffer, pString+1, cMaxChars * sizeof(WCHAR)); + pwszBuffer[cMaxChars] = L'\0'; + } + + return cMaxChars; +} + + +/************************************************************************ + * RegLoadMUIStringW + * + * @implemented + */ +LONG +RegLoadMUIStringW(IN HKEY hKey, + IN LPCWSTR pszValue OPTIONAL, + OUT LPWSTR pszOutBuf, + IN DWORD cbOutBuf, + OUT LPDWORD pcbData OPTIONAL, + IN DWORD Flags, + IN LPCWSTR pszDirectory OPTIONAL) +{ + DWORD dwValueType, cbData; + LPWSTR pwszTempBuffer = NULL, pwszExpandedBuffer = NULL; + LONG result; + + /* Parameter sanity checks. */ + if (!hKey || !pszOutBuf) + return ERROR_INVALID_PARAMETER; + + if (pszDirectory && *pszDirectory) + { + //FIXME("BaseDir parameter not yet supported!\n"); + return ERROR_INVALID_PARAMETER; + } + + /* Check for value existence and correctness of it's type, allocate a buffer and load it. */ + result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, NULL, &cbData); + if (result != ERROR_SUCCESS) goto cleanup; + if (!(dwValueType == REG_SZ || dwValueType == REG_EXPAND_SZ) || !cbData) + { + result = ERROR_FILE_NOT_FOUND; + goto cleanup; + } + pwszTempBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pwszTempBuffer) + { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, (LPBYTE)pwszTempBuffer, &cbData); + if (result != ERROR_SUCCESS) goto cleanup; + + /* Expand environment variables, if appropriate, or copy the original string over. */ + if (dwValueType == REG_EXPAND_SZ) + { + cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); + if (!cbData) goto cleanup; + pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pwszExpandedBuffer) + { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData); + } + else + { + pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData); + } + + /* If the value references a resource based string, parse the value and load the string. + * Else just copy over the original value. */ + result = ERROR_SUCCESS; + if (*pwszExpandedBuffer != L'@') /* '@' is the prefix for resource based string entries. */ + { + lstrcpynW(pszOutBuf, pwszExpandedBuffer, cbOutBuf / sizeof(WCHAR)); + } + else + { + WCHAR *pComma = wcsrchr(pwszExpandedBuffer, L','); + UINT uiStringId; + HMODULE hModule; + + /* Format of the expanded value is 'path_to_dll,-resId' */ + if (!pComma || pComma[1] != L'-') + { + result = ERROR_BADKEY; + goto cleanup; + } + + uiStringId = _wtoi(pComma+2); + *pComma = L'\0'; + + hModule = LoadLibraryExW(pwszExpandedBuffer + 1, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (!hModule || !load_string(hModule, uiStringId, pszOutBuf, cbOutBuf / sizeof(WCHAR))) + result = ERROR_BADKEY; + FreeLibrary(hModule); + } + +cleanup: + HeapFree(GetProcessHeap(), 0, pwszTempBuffer); + HeapFree(GetProcessHeap(), 0, pwszExpandedBuffer); + return result; +} Propchange: trunk/reactos/dll/cpl/desk/muireg.c ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 8 months

[gadamopoulos] 58808: [desk.cpl] - Overhaul the appearance tab - Fixed and tested to work almost flawlessly on windows xp and windows 7 - Implement selecting the size of a scheme - Implement loadin...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Apr 21 14:36:57 2013 New Revision: 58808 URL: http://svn.reactos.org/svn/reactos?rev=58808&view=rev Log: [desk.cpl] - Overhaul the appearance tab - Fixed and tested to work almost flawlessly on windows xp and windows 7 - Implement selecting the size of a scheme - Implement loading the scheme from a visual style and allow the user to customize it before applying the visual style - Implement showing visual styles preview - Properly load and apply system metrics - Store the scheme in memory as NONCLIENTMETRICS and ICONMETRICS structs instead of arrays of sizes and fonts - Store the loaded themes in a list instead of a global array - Now that this works great in windows, it also mean that we have to modify our colour schemes in the registry to be in the same format with windows and also fix uxtheme to handle system metrics properly Modified: trunk/reactos/dll/cpl/desk/CMakeLists.txt trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/appearance.h trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/draw.c trunk/reactos/dll/cpl/desk/draw.h trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/he-IL.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/zh-CN.rc trunk/reactos/dll/cpl/desk/preview.c trunk/reactos/dll/cpl/desk/preview.h trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/theme.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/desk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/CMakeLists.tx… Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… Modified: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=58… Modified: trunk/reactos/dll/cpl/desk/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/draw.c?rev=58… Modified: trunk/reactos/dll/cpl/desk/draw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/draw.h?rev=58… Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… Modified: trunk/reactos/dll/cpl/desk/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/he-IL.rc… Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc… Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… Modified: trunk/reactos/dll/cpl/desk/preview.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.h?rev… Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=5…

11 years, 8 months

[hbelusca] 58807: [DESK] Remove erroneous extra backslash characters in some strings.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Apr 21 14:29:05 2013 New Revision: 58807 URL: http://svn.reactos.org/svn/reactos?rev=58807&view=rev Log: [DESK] Remove erroneous extra backslash characters in some strings. Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Sun Apr 21 14:29:05 2013 @@ -14,7 +14,7 @@ IDC_STATIC, 8, 103, 180, 9 PUSHBUTTON "åç§(&B)...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 PUSHBUTTON "è²(&C)...", IDC_COLOR_BUTTON, 188, 177, 50, 15 - LTEXT "è¡¨\ç¤ºä½ç½®:", IDC_STATIC, 188, 138, 36, 9 + LTEXT "è¡¨ç¤ºä½ç½®:", IDC_STATIC, 188, 138, 36, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -38,7 +38,7 @@ LTEXT "åé", IDC_MINTEXT, 70, 125, 26, 9 CONTROL "ã¬ã¸ã¥ã¼ã æã«ãã¹ã¯ã¼ããç¢ºèªãã(&P)",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 - GROUPBOX "ã¢ãã¿ã®çé»åæ©è½\(&E)", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + GROUPBOX "ã¢ãã¿ã®çé»åæ©è½(&E)", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "ã¢ãã¿ã®é»æºè¨å®ãå¤æ´ããã«ã¯ã[é»æº] ã ã¯ãªãã¯ãã¦ãã ããã", IDC_STATIC, 14, 166, 146, 20 PUSHBUTTON "é»æº(&O)...", IDC_SCREENS_POWER_BUTTON, 165, 171, 61, 13 @@ -111,9 +111,9 @@ COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "å¤§ããã¢ã¤ã³ã³ãä½¿ç¨ãã(&E)",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "ã¡ãã¥ã¼ã®ä¸ã«å½±ãè¡¨\ç¤ºãã(&A)",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "ã¡ãã¥ã¼ã®ä¸ã«å½±ãè¡¨ç¤ºãã(&A)",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "ãã©ãã°ä¸ã«ã¦ã£ã³ãã¦ã®åå®¹ãè¡¨\ç¤ºãã(&W)",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "ãã©ãã°ä¸ã«ã¦ã£ã³ãã¦ã®åå®¹ãè¡¨ç¤ºãã(&W)",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 285, 19 CONTROL "Alt ãã¼ãæ¼ãã¾ã§ãã¼ãã¼ã ããã²ã¼ã·ã§ã³ã®ä¸ç·ãé ãã¦ãã(&H)",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 @@ -148,7 +148,7 @@ CAPTION "å¨è¬" FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "è¡¨\ç¤º", -1, 7, 6, 237, 56, WS_GROUP + GROUPBOX "è¡¨ç¤º", -1, 7, 6, 237, 56, WS_GROUP LTEXT "ãã©ã³ã ãµã¤ãº:", -1, 14, 20, 222, 8 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 @@ -202,9 +202,9 @@ IDS_CPLNAME "ç»é¢" IDS_CPLDESCRIPTION "ãã¹ã¯ãããç»é¢ãã¹ã¯ãªã¼ã³ ã»ã¼ãã¼ãã«ã¹ã¿ãã¤ãºãã¾ãã" IDS_NONE "(ãªã)" - IDS_CENTER "ä¸å¤®ã«è¡¨\ç¤º" - IDS_STRETCH "æ¡å¤§ãã¦è¡¨\ç¤º" - IDS_TILE "ä¸¦ã¹ã¦è¡¨\ç¤º" + IDS_CENTER "ä¸å¤®ã«è¡¨ç¤º" + IDS_STRETCH "æ¡å¤§ãã¦è¡¨ç¤º" + IDS_TILE "ä¸¦ã¹ã¦è¡¨ç¤º" END STRINGTABLE DISCARDABLE @@ -261,7 +261,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DISPLAY_SETTINGS "è¡¨\ç¤ºè¨å®" + IDS_DISPLAY_SETTINGS "è¡¨ç¤ºè¨å®" IDS_APPLY_FAILED "æ°ããè¨å®ã®é©ç¨ã«å¤±æãã¾ãã..." IDS_APPLY_NEEDS_RESTART "å¤æ´ãåæ ããã«ã¯ã³ã³ãã¥ã¼ã¿ãåèµ·åããå¿è¦ãããã¾ãã" END

11 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2013