Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 72512: [KERNEL32] - Failure if does not come to an end a way with a symbol '\' (exception - a path of a looks like 'C:') * Fixes 2 tests for kernel32_apitest GetDriveType (all tests fo...
by dchapyshev＠svn.reactos.org 30 Aug '16

30 Aug '16

Author: dchapyshev Date: Tue Aug 30 19:22:00 2016 New Revision: 72512 URL: http://svn.reactos.org/svn/reactos?rev=72512&view=rev Log: [KERNEL32] - Failure if does not come to an end a way with a symbol '\' (exception - a path of a looks like 'C:') * Fixes 2 tests for kernel32_apitest GetDriveType (all tests for GetDriveType passed now) Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] Tue Aug 30 19:22:00 2016 @@ -19,6 +19,8 @@ */ #include <k32.h> +#include <strsafe.h> + #define NDEBUG #include <debug.h> DEBUG_CHANNEL(kernel32file); @@ -401,12 +403,35 @@ if (wcslen(CurrentDir) > 3) CurrentDir[3] = 0; - lpRootPath = (PCWSTR)CurrentDir; + lpRootPath = CurrentDir; } else { + size_t Length = wcslen(lpRootPathName); + TRACE("lpRootPathName: %S\n", lpRootPathName); - lpRootPath = lpRootPathName; + + if (Length == 2) + { + WCHAR DriveLetter = RtlUpcaseUnicodeChar(lpRootPathName[0]); + + if (DriveLetter >= L'A' && DriveLetter <= L'Z' && lpRootPathName[1] == L':') + { + Length = (Length + 2) * sizeof(WCHAR); + + CurrentDir = HeapAlloc(GetProcessHeap(), 0, Length); + if (!CurrentDir) + return DRIVE_UNKNOWN; + + StringCbPrintfW(CurrentDir, Length, L"%s\\", lpRootPathName); + + lpRootPath = CurrentDir; + } + } + else + { + lpRootPath = lpRootPathName; + } } TRACE("lpRootPath: %S\n", lpRootPath); @@ -423,6 +448,11 @@ if (CurrentDir != NULL) HeapFree(GetProcessHeap(), 0, CurrentDir); + + if (PathName.Buffer[(PathName.Length >> 1) - 1] != L'\\') + { + return DRIVE_NO_ROOT_DIR; + } InitializeObjectAttributes(&ObjectAttributes, &PathName, @@ -436,6 +466,7 @@ &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathName.Buffer); if (!NT_SUCCESS(Status)) return DRIVE_NO_ROOT_DIR; /* According to WINE regression tests */ @@ -453,19 +484,19 @@ switch (FileFsDevice.DeviceType) { - case FILE_DEVICE_CD_ROM: - case FILE_DEVICE_CD_ROM_FILE_SYSTEM: - return DRIVE_CDROM; - case FILE_DEVICE_VIRTUAL_DISK: - return DRIVE_RAMDISK; - case FILE_DEVICE_NETWORK_FILE_SYSTEM: - return DRIVE_REMOTE; - case FILE_DEVICE_DISK: - case FILE_DEVICE_DISK_FILE_SYSTEM: - if (FileFsDevice.Characteristics & FILE_REMOTE_DEVICE) + case FILE_DEVICE_CD_ROM: + case FILE_DEVICE_CD_ROM_FILE_SYSTEM: + return DRIVE_CDROM; + case FILE_DEVICE_VIRTUAL_DISK: + return DRIVE_RAMDISK; + case FILE_DEVICE_NETWORK_FILE_SYSTEM: return DRIVE_REMOTE; - if (FileFsDevice.Characteristics & FILE_REMOVABLE_MEDIA) - return DRIVE_REMOVABLE; + case FILE_DEVICE_DISK: + case FILE_DEVICE_DISK_FILE_SYSTEM: + if (FileFsDevice.Characteristics & FILE_REMOTE_DEVICE) + return DRIVE_REMOTE; + if (FileFsDevice.Characteristics & FILE_REMOVABLE_MEDIA) + return DRIVE_REMOVABLE; return DRIVE_FIXED; }

1 0

[dchapyshev] 72511: [KERNEL32] - Initialization of a string before obtaining information * Fixes 2 tests for kernel32_apitest GetComputerNameEx (all tests passed now)
by dchapyshev＠svn.reactos.org 30 Aug '16

30 Aug '16

Author: dchapyshev Date: Tue Aug 30 17:36:01 2016 New Revision: 72511 URL: http://svn.reactos.org/svn/reactos?rev=72511&view=rev Log: [KERNEL32] - Initialization of a string before obtaining information * Fixes 2 tests for kernel32_apitest GetComputerNameEx (all tests passed now) Modified: trunk/reactos/dll/win32/kernel32/client/compname.c Modified: trunk/reactos/dll/win32/kernel32/client/compname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/compname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/compname.c [iso-8859-1] Tue Aug 30 17:36:01 2016 @@ -50,6 +50,9 @@ ULONG ReturnSize; NTSTATUS Status; + if (lpBuffer != NULL && *nSize > 0) + lpBuffer[0] = 0; + RtlInitUnicodeString(&KeyName, RegistryKey); InitializeObjectAttributes(&ObjectAttributes, &KeyName,

1 0

[dchapyshev] 72510: [RTL] - Remove unneeded type-casts
by dchapyshev＠svn.reactos.org 30 Aug '16

30 Aug '16

Author: dchapyshev Date: Tue Aug 30 16:28:47 2016 New Revision: 72510 URL: http://svn.reactos.org/svn/reactos?rev=72510&view=rev Log: [RTL] - Remove unneeded type-casts Modified: trunk/reactos/sdk/lib/rtl/version.c Modified: trunk/reactos/sdk/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/version.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/version.c [iso-8859-1] Tue Aug 30 16:28:47 2016 @@ -205,8 +205,8 @@ Condition = RtlpVerGetCondition(ConditionMask, VER_SERVICEPACKMINOR); } - Comparison = RtlpVerCompare((ULONG)Version.wServicePackMinor, - (ULONG)VersionInfo->wServicePackMinor, + Comparison = RtlpVerCompare(Version.wServicePackMinor, + VersionInfo->wServicePackMinor, Condition); if (!Comparison)

1 0

[dchapyshev] 72509: [RTL] - The Condition parameter every time is compared to VER_EQUAL, but does not change thus. This behavior wrong. We have to receive new Condition every time * Fixes 7 tests i...
by dchapyshev＠svn.reactos.org 30 Aug '16

30 Aug '16

Author: dchapyshev Date: Tue Aug 30 15:10:07 2016 New Revision: 72509 URL: http://svn.reactos.org/svn/reactos?rev=72509&view=rev Log: [RTL] - The Condition parameter every time is compared to VER_EQUAL, but does not change thus. This behavior wrong. We have to receive new Condition every time * Fixes 7 tests in kernel32_winetest version (all tests passed now) Modified: trunk/reactos/sdk/lib/rtl/version.c Modified: trunk/reactos/sdk/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/version.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/version.c [iso-8859-1] Tue Aug 30 15:10:07 2016 @@ -56,9 +56,11 @@ IN ULONG TypeMask, IN ULONGLONG ConditionMask) { + RTL_OSVERSIONINFOEXW Version; + BOOLEAN Comparison; + BOOLEAN DoNextCheck; NTSTATUS Status; - RTL_OSVERSIONINFOEXW ver; - BOOLEAN Comparison; + UCHAR Condition; /* FIXME: - Check the following special case on Windows (various versions): @@ -67,19 +69,28 @@ - MSDN talks about some tests being impossible. Check what really happens. */ - ver.dwOSVersionInfoSize = sizeof(ver); - Status = RtlGetVersion((PRTL_OSVERSIONINFOW)&ver); - if (Status != STATUS_SUCCESS) return Status; - - if (!TypeMask || !ConditionMask) return STATUS_INVALID_PARAMETER; + Version.dwOSVersionInfoSize = sizeof(Version); + + Status = RtlGetVersion((PRTL_OSVERSIONINFOW)&Version); + if (Status != STATUS_SUCCESS) + { + return Status; + } + + if (!TypeMask || !ConditionMask) + { + return STATUS_INVALID_PARAMETER; + } if (TypeMask & VER_PRODUCT_TYPE) { - Comparison = RtlpVerCompare(ver.wProductType, + Comparison = RtlpVerCompare(Version.wProductType, VersionInfo->wProductType, RtlpVerGetCondition(ConditionMask, VER_PRODUCT_TYPE)); if (!Comparison) - return STATUS_REVISION_MISMATCH; + { + return STATUS_REVISION_MISMATCH; + } } if (TypeMask & VER_SUITENAME) @@ -87,85 +98,123 @@ switch (RtlpVerGetCondition(ConditionMask, VER_SUITENAME)) { case VER_AND: - if ((VersionInfo->wSuiteMask & ver.wSuiteMask) != VersionInfo->wSuiteMask) + { + if ((VersionInfo->wSuiteMask & Version.wSuiteMask) != VersionInfo->wSuiteMask) { return STATUS_REVISION_MISMATCH; } + } + break; + + case VER_OR: + { + if (!(VersionInfo->wSuiteMask & Version.wSuiteMask) && VersionInfo->wSuiteMask) + { + return STATUS_REVISION_MISMATCH; + } break; - case VER_OR: - if (!(VersionInfo->wSuiteMask & ver.wSuiteMask) && VersionInfo->wSuiteMask) - { - return STATUS_REVISION_MISMATCH; - } - break; + } + default: + { return STATUS_INVALID_PARAMETER; + } } } if (TypeMask & VER_PLATFORMID) { - Comparison = RtlpVerCompare(ver.dwPlatformId, + Comparison = RtlpVerCompare(Version.dwPlatformId, VersionInfo->dwPlatformId, RtlpVerGetCondition(ConditionMask, VER_PLATFORMID)); if (!Comparison) - return STATUS_REVISION_MISMATCH; + { + return STATUS_REVISION_MISMATCH; + } } if (TypeMask & VER_BUILDNUMBER) { - Comparison = RtlpVerCompare(ver.dwBuildNumber, + Comparison = RtlpVerCompare(Version.dwBuildNumber, VersionInfo->dwBuildNumber, RtlpVerGetCondition(ConditionMask, VER_BUILDNUMBER)); if (!Comparison) - return STATUS_REVISION_MISMATCH; - } - - TypeMask &= VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR; - if (TypeMask) - { - BOOLEAN do_next_check = TRUE; - /* - * Select the leading comparison operator (for example, the comparison - * operator for VER_MAJORVERSION supersedes the others for VER_MINORVERSION, - * VER_SERVICEPACKMAJOR and VER_SERVICEPACKMINOR). - */ - UCHAR Condition = RtlpVerGetCondition(ConditionMask, TypeMask); - - Comparison = TRUE; - if (TypeMask & VER_MAJORVERSION) - { - Comparison = RtlpVerCompare(ver.dwMajorVersion, - VersionInfo->dwMajorVersion, - Condition); - do_next_check = (ver.dwMajorVersion == VersionInfo->dwMajorVersion) && - ((Condition != VER_EQUAL) || Comparison); - } - if ((TypeMask & VER_MINORVERSION) && do_next_check) - { - Comparison = RtlpVerCompare(ver.dwMinorVersion, + { + return STATUS_REVISION_MISMATCH; + } + } + + DoNextCheck = TRUE; + Condition = VER_EQUAL; + + if (TypeMask & VER_MAJORVERSION) + { + Condition = RtlpVerGetCondition(ConditionMask, VER_MAJORVERSION); + DoNextCheck = (VersionInfo->dwMajorVersion == Version.dwMajorVersion); + Comparison = RtlpVerCompare(Version.dwMajorVersion, + VersionInfo->dwMajorVersion, + Condition); + + if (!Comparison && !DoNextCheck) + { + return STATUS_REVISION_MISMATCH; + } + } + + if (DoNextCheck) + { + if (TypeMask & VER_MINORVERSION) + { + if (Condition == VER_EQUAL) + { + Condition = RtlpVerGetCondition(ConditionMask, VER_MINORVERSION); + } + + DoNextCheck = (VersionInfo->dwMinorVersion == Version.dwMinorVersion); + Comparison = RtlpVerCompare(Version.dwMinorVersion, VersionInfo->dwMinorVersion, Condition); - do_next_check = (ver.dwMinorVersion == VersionInfo->dwMinorVersion) && - ((Condition != VER_EQUAL) || Comparison); - } - if ((TypeMask & VER_SERVICEPACKMAJOR) && do_next_check) - { - Comparison = RtlpVerCompare(ver.wServicePackMajor, + + if (!Comparison && !DoNextCheck) + { + return STATUS_REVISION_MISMATCH; + } + } + + if (DoNextCheck && (TypeMask & VER_SERVICEPACKMAJOR)) + { + if (Condition == VER_EQUAL) + { + Condition = RtlpVerGetCondition(ConditionMask, VER_SERVICEPACKMAJOR); + } + + DoNextCheck = (VersionInfo->wServicePackMajor == Version.wServicePackMajor); + Comparison = RtlpVerCompare(Version.wServicePackMajor, VersionInfo->wServicePackMajor, Condition); - do_next_check = (ver.wServicePackMajor == VersionInfo->wServicePackMajor) && - ((Condition != VER_EQUAL) || Comparison); - } - if ((TypeMask & VER_SERVICEPACKMINOR) && do_next_check) - { - Comparison = RtlpVerCompare(ver.wServicePackMinor, - VersionInfo->wServicePackMinor, - Condition); - } - - if (!Comparison) - return STATUS_REVISION_MISMATCH; + + if (!Comparison && !DoNextCheck) + { + return STATUS_REVISION_MISMATCH; + } + + if (DoNextCheck && (TypeMask & VER_SERVICEPACKMINOR)) + { + if (Condition == VER_EQUAL) + { + Condition = RtlpVerGetCondition(ConditionMask, VER_SERVICEPACKMINOR); + } + + Comparison = RtlpVerCompare((ULONG)Version.wServicePackMinor, + (ULONG)VersionInfo->wServicePackMinor, + Condition); + + if (!Comparison) + { + return STATUS_REVISION_MISMATCH; + } + } + } } return STATUS_SUCCESS;

1 0

[aandrejevic] 72508: [NTVDM:EMS] Implement EMS function 4E/03: "Get Size of Page-Mapping Array".
by aandrejevic＠svn.reactos.org 30 Aug '16

30 Aug '16

Author: aandrejevic Date: Tue Aug 30 02:13:40 2016 New Revision: 72508 URL: http://svn.reactos.org/svn/reactos?rev=72508&view=rev Log: [NTVDM:EMS] Implement EMS function 4E/03: "Get Size of Page-Mapping Array". Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Tue Aug 30 02:13:40 2016 @@ -394,6 +394,39 @@ break; } + /* Get or Set Page Map */ + case 0x4E: + { + switch (getAL()) + { + /* Get Mapping Registers */ + // case 0x00: // TODO: NOT IMPLEMENTED + + /* Set Mapping Registers */ + // case 0x01: // TODO: NOT IMPLEMENTED + + /* Get and Set Mapping Registers At Once */ + // case 0x02: // TODO: NOT IMPLEMENTED + + /* Get Size of Page-Mapping Array */ + case 0x03: + { + setAH(EMS_STATUS_SUCCESS); + setAL(sizeof(Mapping)); + break; + } + + default: + { + DPRINT1("EMS function AH = 0x4E, subfunction AL = %02X NOT IMPLEMENTED\n", getAL()); + setAH(EMS_STATUS_UNKNOWN_FUNCTION); + break; + } + } + + break; + } + /* Get/Set Handle Name */ case 0x53: {

1 0

[dchapyshev] 72507: [NTOS:EX] - Remove duplicate check
by dchapyshev＠svn.reactos.org 29 Aug '16

29 Aug '16

Author: dchapyshev Date: Mon Aug 29 21:11:01 2016 New Revision: 72507 URL: http://svn.reactos.org/svn/reactos?rev=72507&view=rev Log: [NTOS:EX] - Remove duplicate check Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Mon Aug 29 21:11:01 2016 @@ -1246,8 +1246,7 @@ while ((HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle))) { /* Validate the entry */ - if ((HandleTableEntry) && - (HandleTableEntry->Object) && + if ((HandleTableEntry->Object) && (HandleTableEntry->NextFreeTableEntry != -2)) { /* Lock the entry */

1 0

[dchapyshev] 72506: [NTOS:EX] - Blocking of the user buffer before obtaining information - Use of ObpGetHandleObject macro for receiving ObjectHeader - Remove duplicate NULL pointer check for Handl...
by dchapyshev＠svn.reactos.org 29 Aug '16

29 Aug '16

Author: dchapyshev Date: Mon Aug 29 20:41:23 2016 New Revision: 72506 URL: http://svn.reactos.org/svn/reactos?rev=72506&view=rev Log: [NTOS:EX] - Blocking of the user buffer before obtaining information - Use of ObpGetHandleObject macro for receiving ObjectHeader - Remove duplicate NULL pointer check for HandleTableEntry Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Aug 29 20:41:23 2016 @@ -1167,24 +1167,26 @@ /* Class 16 - Handle Information */ QSI_DEF(SystemHandleInformation) { + PSYSTEM_HANDLE_INFORMATION HandleInformation; + KPROCESSOR_MODE PreviousMode; PEPROCESS Process; PEPROCESS SystemProcess; ULONG CurrentSize; ULONG NumberOfHandles = 0; ULONG Index; - - PSYSTEM_HANDLE_INFORMATION HandleInformation = - (PSYSTEM_HANDLE_INFORMATION) Buffer; + NTSTATUS Status; + PMDL Mdl; DPRINT("NtQuerySystemInformation - SystemHandleInformation\n"); + /* Check user's buffer size */ if (Size < sizeof(SYSTEM_HANDLE_INFORMATION)) { *ReqSize = sizeof(SYSTEM_HANDLE_INFORMATION); return STATUS_INFO_LENGTH_MISMATCH; } - /* First Calc Size from Count. */ + /* Retrieve needed buffer size to hold the list of handles */ SystemProcess = PsGetNextProcess(NULL); Process = SystemProcess; @@ -1195,19 +1197,37 @@ } while ((Process != SystemProcess) && (Process != NULL)); + /* Dereference the process which was referenced by PsGetNextProcess */ if (Process != NULL) ObDereferenceObject(Process); + /* Calculate the current size of all handles */ CurrentSize = sizeof(SYSTEM_HANDLE_INFORMATION) + ((sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) * NumberOfHandles) - (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO))); + *ReqSize = CurrentSize; + + /* Check user's buffer size */ + if (CurrentSize > Size) return STATUS_INFO_LENGTH_MISMATCH; + + /* We need to lock down the memory */ + PreviousMode = ExGetPreviousMode(); + Status = ExLockUserBuffer(Buffer, + Size, + PreviousMode, + IoWriteAccess, + (PVOID*)&HandleInformation, + &Mdl); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to lock the user buffer: 0x%lx\n", Status); + return Status; + } + + /* Initialization of count of handles */ HandleInformation->NumberOfHandles = NumberOfHandles; - *ReqSize = CurrentSize; - - if (CurrentSize > Size) return STATUS_INFO_LENGTH_MISMATCH; - - /* Now get Handles from all processes. */ + /* Now get handles from all processes. */ SystemProcess = PsGetNextProcess(NULL); Process = SystemProcess; @@ -1226,16 +1246,13 @@ while ((HandleTableEntry = ExpLookupHandleTableEntry(Process->ObjectTable, Handle))) { /* Validate the entry */ - if ((HandleTableEntry) && - (HandleTableEntry->Object) && + if ((HandleTableEntry->Object) && (HandleTableEntry->NextFreeTableEntry != -2)) { /* Lock the entry */ if (ExpLockHandleTableEntry(Process->ObjectTable, HandleTableEntry)) { - POBJECT_HEADER ObjectHeader; - - ObjectHeader = (POBJECT_HEADER)(((ULONG_PTR) HandleTableEntry->Object) & ~OBJ_HANDLE_ATTRIBUTES); + POBJECT_HEADER ObjectHeader = ObpGetHandleObject(HandleTableEntry); /* Filling handle information */ HandleInformation->Handles[Index].UniqueProcessId = (USHORT)(ULONG_PTR) Process->UniqueProcessId; @@ -1257,25 +1274,21 @@ Handle.Value += sizeof(HANDLE); } - /* Leave the critical region and return callback result */ + /* Leave the critical region */ KeLeaveCriticalRegion(); Process = PsGetNextProcess(Process); } while ((Process != SystemProcess) && (Process != NULL)); + /* Dereference the process which was referenced by PsGetNextProcess */ if (Process != NULL) ObDereferenceObject(Process); - return STATUS_SUCCESS; - -} -/* -SSI_DEF(SystemHandleInformation) -{ - - return STATUS_SUCCESS; -} -*/ + /* Release the locked user buffer */ + ExUnlockUserBuffer(Mdl); + + return STATUS_SUCCESS; +} /* Class 17 - Information */ QSI_DEF(SystemObjectInformation)

1 0

[hbelusca] 72505: [CRT]: Fix typo. Thanks DopefishJustin:)
by hbelusca＠svn.reactos.org 29 Aug '16

29 Aug '16

Author: hbelusca Date: Mon Aug 29 16:44:21 2016 New Revision: 72505 URL: http://svn.reactos.org/svn/reactos?rev=72505&view=rev Log: [CRT]: Fix typo. Thanks DopefishJustin:) Modified: trunk/reactos/sdk/lib/crt/stdlib/abort.c Modified: trunk/reactos/sdk/lib/crt/stdlib/abort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdlib/abort.c… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdlib/abort.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdlib/abort.c [iso-8859-1] Mon Aug 29 16:44:21 2016 @@ -13,7 +13,7 @@ static const char abort_msg[] = "This application has requested the Runtime to terminate in an unusual way.\n" - "Please contact the applications's support team for more information.\0"; + "Please contact the application's support team for more information.\0"; /*! * \brief Aborts the program.

1 0

[hbelusca] 72504: [DOSKEY] Our kernel32.lib already exports all of the console API and in particular the console history API, so we can directly link doskey against it and use them, instead of dela...
by hbelusca＠svn.reactos.org 29 Aug '16

29 Aug '16

Author: hbelusca Date: Mon Aug 29 15:39:19 2016 New Revision: 72504 URL: http://svn.reactos.org/svn/reactos?rev=72504&view=rev Log: [DOSKEY] Our kernel32.lib already exports all of the console API and in particular the console history API, so we can directly link doskey against it and use them, instead of delay-loading at runtime. We just need to add their prototypes in the source code since they are not declared by wincon.h by default. Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Mon Aug 29 15:39:19 2016 @@ -1,12 +1,31 @@ -#include <stdarg.h> +#include <stdio.h> +#include <wchar.h> +#include <locale.h> + #include <windef.h> #include <winbase.h> #include <winuser.h> #include <wincon.h> -#include <stdio.h> -#include <wchar.h> -#include <assert.h> -#include <locale.h> + +/* Console API functions which are absent from wincon.h */ +VOID +WINAPI +ExpungeConsoleCommandHistoryW(LPCWSTR lpExeName); + +DWORD +WINAPI +GetConsoleCommandHistoryW(LPWSTR lpHistory, + DWORD cbHistory, + LPCWSTR lpExeName); + +DWORD +WINAPI +GetConsoleCommandHistoryLengthW(LPCWSTR lpExeName); + +BOOL +WINAPI +SetConsoleNumberOfCommandsW(DWORD dwNumCommands, + LPCWSTR lpExeName); #include "doskey.h" @@ -14,19 +33,12 @@ WCHAR szStringBuf[MAX_STRING]; LPWSTR pszExeName = L"cmd.exe"; -/* Function pointers */ -typedef DWORD (WINAPI *GetConsoleCommandHistoryW_t) (LPWSTR sCommands, DWORD nBufferLength, LPWSTR sExeName); -typedef DWORD (WINAPI *GetConsoleCommandHistoryLengthW_t) (LPWSTR sExeName); -typedef BOOL (WINAPI *SetConsoleNumberOfCommandsW_t)(DWORD nNumber, LPWSTR sExeName); -typedef VOID (WINAPI *ExpungeConsoleCommandHistoryW_t)(LPWSTR sExeName); - -GetConsoleCommandHistoryW_t pGetConsoleCommandHistoryW; -GetConsoleCommandHistoryLengthW_t pGetConsoleCommandHistoryLengthW; -SetConsoleNumberOfCommandsW_t pSetConsoleNumberOfCommandsW; -ExpungeConsoleCommandHistoryW_t pExpungeConsoleCommandHistoryW; - static VOID SetInsert(DWORD dwFlag) { + /* + * NOTE: Enabling the ENABLE_INSERT_MODE mode can also be done by calling + * kernel32:SetConsoleCommandHistoryMode(CONSOLE_OVERSTRIKE) . + */ DWORD dwMode; HANDLE hConsole = GetStdHandle(STD_INPUT_HANDLE); GetConsoleMode(hConsole, &dwMode); @@ -36,7 +48,7 @@ static VOID PrintHistory(VOID) { - DWORD Length = pGetConsoleCommandHistoryLengthW(pszExeName); + DWORD Length = GetConsoleCommandHistoryLengthW(pszExeName); PBYTE HistBuf; WCHAR *Hist; WCHAR *HistEnd; @@ -48,9 +60,13 @@ Hist = (WCHAR *)HistBuf; HistEnd = (WCHAR *)&HistBuf[Length]; - if (pGetConsoleCommandHistoryW(Hist, Length, pszExeName)) + if (GetConsoleCommandHistoryW(Hist, Length, pszExeName)) + { for (; Hist < HistEnd; Hist += wcslen(Hist) + 1) + { wprintf(L"%s\n", Hist); + } + } HeapFree(GetProcessHeap(), 0, HistBuf); } @@ -102,8 +118,12 @@ AliasEnd = (WCHAR *)&AliasBuf[Length]; if (GetConsoleAliasesW(Alias, Length * sizeof(BYTE), pszExeName)) + { for (; Alias < AliasEnd; Alias += wcslen(Alias) + 1) + { wprintf(L"%s%s\n", Indent, Alias); + } + } HeapFree(GetProcessHeap(), 0, AliasBuf); } @@ -198,23 +218,12 @@ { WCHAR *pArgStart; WCHAR *pArgEnd; - HMODULE hKernel32; setlocale(LC_ALL, ""); /* Get the full command line using GetCommandLine(). We can't just use argv, * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ pArgEnd = GetCommandLineW(); - hKernel32 = LoadLibraryW(L"kernel32.dll"); - - /* Get function pointers */ - pGetConsoleCommandHistoryW = (GetConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryW"); - pGetConsoleCommandHistoryLengthW = (GetConsoleCommandHistoryLengthW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryLengthW"); - pSetConsoleNumberOfCommandsW = (SetConsoleNumberOfCommandsW_t)GetProcAddress( hKernel32, "SetConsoleNumberOfCommandsW"); - pExpungeConsoleCommandHistoryW = (ExpungeConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "ExpungeConsoleCommandHistoryW"); - - assert(pGetConsoleCommandHistoryW && pGetConsoleCommandHistoryLengthW && - pSetConsoleNumberOfCommandsW && pExpungeConsoleCommandHistoryW); /* Skip the application name */ GetArg(&pArgStart, &pArgEnd); @@ -242,11 +251,11 @@ } else if (!_wcsnicmp(pArgStart, L"/LISTSIZE=", 10)) { - pSetConsoleNumberOfCommandsW(_wtoi(pArgStart + 10), pszExeName); + SetConsoleNumberOfCommandsW(_wtoi(pArgStart + 10), pszExeName); } else if (!wcsicmp(pArgStart, L"/REINSTALL")) { - pExpungeConsoleCommandHistoryW(pszExeName); + ExpungeConsoleCommandHistoryW(pszExeName); } else if (!wcsicmp(pArgStart, L"/INSERT")) {

1 0

[mjansen] 72503: [APPHELP][APPHELP_APITEST] Partially implement SdbMakeIndexKeyFromString
by mjansen＠svn.reactos.org 29 Aug '16

29 Aug '16

Author: mjansen Date: Mon Aug 29 15:19:55 2016 New Revision: 72503 URL: http://svn.reactos.org/svn/reactos?rev=72503&view=rev Log: [APPHELP][APPHELP_APITEST] Partially implement SdbMakeIndexKeyFromString Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/rostests/apitests/apphelp/CMakeLists.txt trunk/rostests/apitests/apphelp/db.c Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Mon Aug 29 15:19:55 2016 @@ -94,7 +94,7 @@ @ stub SdbIsTagrefFromLocalDB @ stub SdbIsTagrefFromMainDB @ stub SdbLoadString -@ stub SdbMakeIndexKeyFromString +@ stdcall SdbMakeIndexKeyFromString(wstr) @ stub SdbOpenApphelpDetailsDatabase @ stub SdbOpenApphelpDetailsDatabaseSP @ stub SdbOpenApphelpInformation Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Mon Aug 29 15:19:55 2016 @@ -614,6 +614,47 @@ return TRUE; } + + +/** + * Converts the specified string to an index key. + * + * @param [in] str The string which will be converted. + * + * @return The resulting index key + * + * @todo: Fix this for unicode strings. + */ +LONGLONG WINAPI SdbMakeIndexKeyFromString(LPCWSTR str) +{ + LONGLONG result = 0; + int shift = 56; + + while (*str && shift >= 0) + { + WCHAR c = toupper(*(str++)); + + if (c & 0xff) + { + result |= (((LONGLONG)(c & 0xff)) << shift); + shift -= 8; + } + + if (shift < 0) + break; + + c >>= 8; + + if (c & 0xff) + { + result |= (((LONGLONG)(c & 0xff)) << shift); + shift -= 8; + } + } + + return result; +} + /** * Converts specified tag into a string. Modified: trunk/rostests/apitests/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/CMakeLis… ============================================================================== --- trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] Mon Aug 29 15:19:55 2016 @@ -1,5 +1,5 @@ project(appcompat) -add_definitions(-D__ROS_LONG64__) +add_definitions(-D__ROS_LONG64__ -DWINETEST_USE_DBGSTR_LONGLONG) list(APPEND SOURCE apphelp.c Modified: trunk/rostests/apitests/apphelp/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.c?rev… ============================================================================== --- trunk/rostests/apitests/apphelp/db.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/db.c [iso-8859-1] Mon Aug 29 15:19:55 2016 @@ -166,6 +166,8 @@ static TAGID (WINAPI *pSdbGetNextChild)(PDB, TAGID, TAGID); static BOOL (WINAPI *pSdbGetDatabaseID)(PDB, GUID*); static BOOL (WINAPI *pSdbGUIDToString)(CONST GUID *, PCWSTR, SIZE_T); +static LONGLONG(WINAPI* pSdbMakeIndexKeyFromString)(LPCWSTR); + DEFINE_GUID(GUID_DATABASE_TEST,0xe39b0eb0,0x55db,0x450b,0x9b,0xd4,0xd2,0x0c,0x94,0x84,0x26,0x0f); @@ -966,6 +968,90 @@ DeleteFileA("test_db.sdb"); } + +static void expect_indexA_imp(const char* text, LONGLONG expected) +{ + static WCHAR wide_string[100] = { 0 }; + LONGLONG result; + MultiByteToWideChar(CP_ACP, 0, text, -1, wide_string, 100); + + result = pSdbMakeIndexKeyFromString(wide_string); + winetest_ok(result == expected, "Expected %s to result in %s, was: %s\n", text, wine_dbgstr_longlong(expected), wine_dbgstr_longlong(result)); +} + +#define expect_indexA (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : expect_indexA_imp + +static void test_IndexKeyFromString(void) +{ + static WCHAR tmp [] = { 0xabba, 0xbcde, 0x2020, 0x20, 0x4444, 0}; + static WCHAR tmp2 [] = { 0xabba, 0xbcde, 0x20, 0x4444, 0}; + static WCHAR tmp3 [] = { 0x20, 0xbcde, 0x4041, 0x4444, 0}; + static WCHAR tmp4 [] = { 0x20, 0xbcde, 0x4041, 0x4444, 0x4444, 0}; + static WCHAR tmp5 [] = { 0x2020, 0xbcde, 0x4041, 0x4444, 0x4444, 0}; + static WCHAR tmp6 [] = { 0x20, 0xbcde, 0x4041, 0x4444, 0x4444, 0x4444, 0}; + static WCHAR tmp7 [] = { 0xbcde, 0x4041, 0x4444, 0x4444, 0x4444, 0x4444, 0x4444, 0x4444, 0x4444, 0}; + static WCHAR tmp8 [] = { 0xbc00, 0x4041, 0x4444, 0x4444, 0x4444, 0x4444, 0x4444, 0x4444, 0x4444, 0}; + LONGLONG result; + +#if 0 + /* This crashes. */ + pSdbMakeIndexKeyFromString(NULL); +#endif + + expect_indexA("", 0x0000000000000000); + expect_indexA("a", 0x4100000000000000); + expect_indexA("aa", 0x4141000000000000); + expect_indexA("aaa", 0x4141410000000000); + expect_indexA("aaaa", 0x4141414100000000); + expect_indexA("aaaaa", 0x4141414141000000); + expect_indexA("aaaaaa", 0x4141414141410000); + expect_indexA("aaaaaaa", 0x4141414141414100); + expect_indexA("aaaaaaaa", 0x4141414141414141); + expect_indexA("aaa aaaaa", 0x4141412041414141); + /* Does not change */ + expect_indexA("aaaaaaaaa", 0x4141414141414141); + expect_indexA("aaaaaaaab", 0x4141414141414141); + expect_indexA("aaaaaaaac", 0x4141414141414141); + expect_indexA("aaaaaaaaF", 0x4141414141414141); + /* Upcase */ + expect_indexA("AAAAAAAA", 0x4141414141414141); + expect_indexA("ABABABAB", 0x4142414241424142); + expect_indexA("ABABABABZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ", 0x4142414241424142); + + result = pSdbMakeIndexKeyFromString(tmp); + ok(result == 0xbaabdebc20200000, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp), + wine_dbgstr_longlong(0xbaabdebc20200000), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp2); + ok(result == 0xbaabdebc00000000, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp2), + wine_dbgstr_longlong(0xbaabdebc00000000), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp3); + ok(result == 0x20debc4140000000, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp3), + wine_dbgstr_longlong(0x20debc4140000000), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp4); + ok(result == 0x20debc4140000000, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp4), + wine_dbgstr_longlong(0x20debc4140000000), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp5); + ok(result == 0x2020debc41400000, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp5), + wine_dbgstr_longlong(0x2020debc41400000), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp6); + ok(result == 0x20debc4140444400, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp6), + wine_dbgstr_longlong(0x20debc4140444400), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp7); + ok(result == 0xdebc414044444444, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp7), + wine_dbgstr_longlong(0xdebc414044444444), wine_dbgstr_longlong(result)); + + result = pSdbMakeIndexKeyFromString(tmp8); + ok(result == 0xbc414044444444, "Expected %s to result in %s, was: %s\n", wine_dbgstr_w(tmp8), + wine_dbgstr_longlong(0xbc414044444444), wine_dbgstr_longlong(result)); +} + + START_TEST(db) { //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4"); @@ -1001,9 +1087,11 @@ pSdbGetNextChild = (void *) GetProcAddress(hdll, "SdbGetNextChild"); pSdbGetDatabaseID = (void *) GetProcAddress(hdll, "SdbGetDatabaseID"); pSdbGUIDToString = (void *) GetProcAddress(hdll, "SdbGUIDToString"); + pSdbMakeIndexKeyFromString = (void*) GetProcAddress(hdll, "SdbMakeIndexKeyFromString"); test_Sdb(); test_write_ex(); test_stringtable(); test_CheckDatabaseManually(); -} + test_IndexKeyFromString(); +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs