Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 69841: [USERENV] - GetAllUsersProfileDirectoryW: Fail if lpcchSize is NULL. - GetDefaultUserProfileDirectoryW: Fail if lpcchSize is NULL. - GetUserProfileDirectoryW: Fail if hToken is NULL.
by ekohl＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: ekohl Date: Sat Nov 7 21:06:07 2015 New Revision: 69841 URL: http://svn.reactos.org/svn/reactos?rev=69841&view=rev Log: [USERENV] - GetAllUsersProfileDirectoryW: Fail if lpcchSize is NULL. - GetDefaultUserProfileDirectoryW: Fail if lpcchSize is NULL. - GetUserProfileDirectoryW: Fail if hToken is NULL. Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Sat Nov 7 21:06:07 2015 @@ -464,6 +464,12 @@ HKEY hKey; LONG Error; + if (!lpcchSize) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", 0, @@ -586,6 +592,12 @@ HKEY hKey; LONG Error; + if (!lpcchSize) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", 0, @@ -839,9 +851,15 @@ HKEY hKey; LONG Error; + if (!hToken) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!lpcchSize) { - SetLastError( ERROR_INVALID_PARAMETER ); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }

1 0

[hbelusca] 69840: [NTVDM]: Natively use UNICODE strings for the disk mounting system.
by hbelusca＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: hbelusca Date: Sat Nov 7 20:19:32 2015 New Revision: 69840 URL: http://svn.reactos.org/svn/reactos?rev=69840&view=rev Log: [NTVDM]: Natively use UNICODE strings for the disk mounting system. Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/console.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/console/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/console/console.c [iso-8859-1] Sat Nov 7 20:19:32 2015 @@ -146,7 +146,6 @@ UpdateVdmMenuDisks(VOID) { UINT_PTR ItemID; - UNICODE_STRING ValueString; USHORT i; WCHAR szNoMedia[100]; @@ -170,17 +169,12 @@ if (GlobalSettings.FloppyDisks[i].Length != 0 && GlobalSettings.FloppyDisks[i].Buffer && - GlobalSettings.FloppyDisks[i].Buffer != '\0') - { - /* Convert the ANSI string to UNICODE */ - RtlAnsiStringToUnicodeString(&ValueString, &GlobalSettings.FloppyDisks[i], TRUE); - + GlobalSettings.FloppyDisks[i].Buffer != L'\0') + { /* Update item text */ - _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, ValueString.Buffer); + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, GlobalSettings.FloppyDisks[i].Buffer); szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; ModifyMenuW(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); - - RtlFreeUnicodeString(&ValueString); /* Enable the eject item */ EnableMenuItem(hConsoleMenu, ItemID + 1, MF_BYCOMMAND | MF_ENABLED); Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Sat Nov 7 20:19:32 2015 @@ -419,9 +419,9 @@ #define OFN_EX_NOPLACESBAR 0x00000001 #endif // (_WIN32_WINNT >= 0x0500) + BOOLEAN Success; OPENFILENAMEW ofn; WCHAR szFile[MAX_PATH] = L""; - UNICODE_STRING ValueString; ASSERT(DiskNumber < ARRAYSIZE(GlobalSettings.FloppyDisks)); @@ -445,19 +445,18 @@ /* Free the old string */ if (GlobalSettings.FloppyDisks[DiskNumber].Buffer) - RtlFreeAnsiString(&GlobalSettings.FloppyDisks[DiskNumber]); - - /* Convert the UNICODE string to ANSI and store it */ - RtlInitEmptyUnicodeString(&ValueString, szFile, wcslen(szFile) * sizeof(WCHAR)); - ValueString.Length = ValueString.MaximumLength; - RtlUnicodeStringToAnsiString(&GlobalSettings.FloppyDisks[DiskNumber], &ValueString, TRUE); + RtlFreeUnicodeString(&GlobalSettings.FloppyDisks[DiskNumber]); + + /* Reinitialize the string */ + Success = RtlCreateUnicodeString(&GlobalSettings.FloppyDisks[DiskNumber], szFile); + ASSERT(Success); /* Mount the disk */ if (!MountDisk(FLOPPY_DISK, DiskNumber, GlobalSettings.FloppyDisks[DiskNumber].Buffer, !!(ofn.Flags & OFN_READONLY))) { DisplayMessage(L"An error happened when mounting disk %d", DiskNumber); - RtlFreeAnsiString(&GlobalSettings.FloppyDisks[DiskNumber]); - RtlInitEmptyAnsiString(&GlobalSettings.FloppyDisks[DiskNumber], NULL, 0); + RtlFreeUnicodeString(&GlobalSettings.FloppyDisks[DiskNumber]); + RtlInitEmptyUnicodeString(&GlobalSettings.FloppyDisks[DiskNumber], NULL, 0); return; } @@ -476,8 +475,8 @@ /* Free the old string */ if (GlobalSettings.FloppyDisks[DiskNumber].Buffer) { - RtlFreeAnsiString(&GlobalSettings.FloppyDisks[DiskNumber]); - RtlInitEmptyAnsiString(&GlobalSettings.FloppyDisks[DiskNumber], NULL, 0); + RtlFreeUnicodeString(&GlobalSettings.FloppyDisks[DiskNumber]); + RtlInitEmptyUnicodeString(&GlobalSettings.FloppyDisks[DiskNumber], NULL, 0); } /* Refresh the menu state */ @@ -597,9 +596,9 @@ { if (!MountDisk(FLOPPY_DISK, i, GlobalSettings.FloppyDisks[i].Buffer, FALSE)) { - DPRINT1("Failed to mount floppy disk file '%Z'.\n", &GlobalSettings.FloppyDisks[i]); - RtlFreeAnsiString(&GlobalSettings.FloppyDisks[i]); - RtlInitEmptyAnsiString(&GlobalSettings.FloppyDisks[i], NULL, 0); + DPRINT1("Failed to mount floppy disk file '%wZ'.\n", &GlobalSettings.FloppyDisks[i]); + RtlFreeUnicodeString(&GlobalSettings.FloppyDisks[i]); + RtlInitEmptyUnicodeString(&GlobalSettings.FloppyDisks[i], NULL, 0); } } } @@ -612,11 +611,11 @@ { if (GlobalSettings.HardDisks[i].Length != 0 && GlobalSettings.HardDisks[i].Buffer && - GlobalSettings.HardDisks[i].Buffer != '\0') + GlobalSettings.HardDisks[i].Buffer != L'\0') { if (!MountDisk(HARD_DISK, i, GlobalSettings.HardDisks[i].Buffer, FALSE)) { - wprintf(L"FATAL: Failed to mount hard disk file '%Z'.\n", &GlobalSettings.HardDisks[i]); + wprintf(L"FATAL: Failed to mount hard disk file '%wZ'.\n", &GlobalSettings.HardDisks[i]); EmulatorCleanup(); return FALSE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] Sat Nov 7 20:19:32 2015 @@ -499,7 +499,7 @@ BOOLEAN MountDisk(IN DISK_TYPE DiskType, IN ULONG DiskNumber, - IN PCSTR FileName, + IN PCWSTR FileName, IN BOOLEAN ReadOnly) { BOOLEAN Success = FALSE; @@ -527,7 +527,7 @@ SetLastError(0); // For debugging purposes if (ReadOnly) { - hFile = CreateFileA(FileName, + hFile = CreateFileW(FileName, GENERIC_READ, FILE_SHARE_READ, NULL, @@ -537,7 +537,7 @@ } else { - hFile = CreateFileA(FileName, + hFile = CreateFileW(FileName, GENERIC_READ | GENERIC_WRITE, 0, // No sharing access NULL, @@ -545,13 +545,13 @@ FILE_ATTRIBUTE_NORMAL, NULL); } - DPRINT1("File '%s' opening %s ; GetLastError() = %u\n", + DPRINT1("File '%S' opening %s ; GetLastError() = %u\n", FileName, hFile != INVALID_HANDLE_VALUE ? "succeeded" : "failed", GetLastError()); /* If we failed, bail out */ if (hFile == INVALID_HANDLE_VALUE) { - DisplayMessage(L"MountDisk: Error when opening disk file '%S' (Error: %u).", FileName, GetLastError()); + DisplayMessage(L"MountDisk: Error when opening disk file '%s' (Error: %u).", FileName, GetLastError()); return FALSE; } @@ -569,7 +569,7 @@ GetLastError() == ERROR_INVALID_FUNCTION) { /* Objects other than real files are not supported */ - DisplayMessage(L"MountDisk: '%S' is not a valid disk file.", FileName); + DisplayMessage(L"MountDisk: '%s' is not a valid disk file.", FileName); goto Quit; } SetLastError(0); @@ -577,14 +577,14 @@ GetLastError() == ERROR_INVALID_FUNCTION) { /* Objects other than real files are not supported */ - DisplayMessage(L"MountDisk: '%S' is not a valid disk file.", FileName); + DisplayMessage(L"MountDisk: '%s' is not a valid disk file.", FileName); goto Quit; } /* Success, mount the image */ if (!DiskMountInfo[DiskType].MountDiskHelper(DiskImage, hFile)) { - DisplayMessage(L"MountDisk: Failed to mount disk file '%S' in 0x%p.", FileName, DiskImage); + DisplayMessage(L"MountDisk: Failed to mount disk file '%s' in 0x%p.", FileName, DiskImage); goto Quit; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h [iso-8859-1] Sat Nov 7 20:19:32 2015 @@ -78,7 +78,7 @@ BOOLEAN MountDisk(IN DISK_TYPE DiskType, IN ULONG DiskNumber, - IN PCSTR FileName, + IN PCWSTR FileName, IN BOOLEAN ReadOnly); BOOLEAN Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Sat Nov 7 20:19:32 2015 @@ -93,8 +93,8 @@ IN PVOID Context, IN PVOID EntryContext) { + BOOLEAN Success; PNTVDM_SETTINGS Settings = (PNTVDM_SETTINGS)Context; - UNICODE_STRING ValueString; ULONG DiskNumber = (ULONG)EntryContext; ASSERT(DiskNumber < ARRAYSIZE(Settings->FloppyDisks)); @@ -102,21 +102,20 @@ /* Check whether the Hard Disk entry was not already configured */ if (Settings->FloppyDisks[DiskNumber].Buffer != NULL) { - DPRINT1("Floppy Disk %d -- '%Z' already configured\n", DiskNumber, &Settings->FloppyDisks[DiskNumber]); + DPRINT1("Floppy Disk %d -- '%wZ' already configured\n", DiskNumber, &Settings->FloppyDisks[DiskNumber]); return STATUS_SUCCESS; } /* Check for the type of the value */ if (ValueType != REG_SZ) { - RtlInitEmptyAnsiString(&Settings->FloppyDisks[DiskNumber], NULL, 0); + RtlInitEmptyUnicodeString(&Settings->FloppyDisks[DiskNumber], NULL, 0); return STATUS_SUCCESS; } - /* Convert the UNICODE string to ANSI and store it */ - RtlInitEmptyUnicodeString(&ValueString, (PWCHAR)ValueData, ValueLength); - ValueString.Length = ValueString.MaximumLength; - RtlUnicodeStringToAnsiString(&Settings->FloppyDisks[DiskNumber], &ValueString, TRUE); + /* Initialize the string */ + Success = RtlCreateUnicodeString(&Settings->FloppyDisks[DiskNumber], (PCWSTR)ValueData); + ASSERT(Success); return STATUS_SUCCESS; } @@ -130,8 +129,8 @@ IN PVOID Context, IN PVOID EntryContext) { + BOOLEAN Success; PNTVDM_SETTINGS Settings = (PNTVDM_SETTINGS)Context; - UNICODE_STRING ValueString; ULONG DiskNumber = (ULONG)EntryContext; ASSERT(DiskNumber < ARRAYSIZE(Settings->HardDisks)); @@ -139,21 +138,20 @@ /* Check whether the Hard Disk entry was not already configured */ if (Settings->HardDisks[DiskNumber].Buffer != NULL) { - DPRINT1("Hard Disk %d -- '%Z' already configured\n", DiskNumber, &Settings->HardDisks[DiskNumber]); + DPRINT1("Hard Disk %d -- '%wZ' already configured\n", DiskNumber, &Settings->HardDisks[DiskNumber]); return STATUS_SUCCESS; } /* Check for the type of the value */ if (ValueType != REG_SZ) { - RtlInitEmptyAnsiString(&Settings->HardDisks[DiskNumber], NULL, 0); + RtlInitEmptyUnicodeString(&Settings->HardDisks[DiskNumber], NULL, 0); return STATUS_SUCCESS; } - /* Convert the UNICODE string to ANSI and store it */ - RtlInitEmptyUnicodeString(&ValueString, (PWCHAR)ValueData, ValueLength); - ValueString.Length = ValueString.MaximumLength; - RtlUnicodeStringToAnsiString(&Settings->HardDisks[DiskNumber], &ValueString, TRUE); + /* Initialize the string */ + Success = RtlCreateUnicodeString(&Settings->HardDisks[DiskNumber], (PCWSTR)ValueData); + ASSERT(Success); return STATUS_SUCCESS; } @@ -291,13 +289,13 @@ for (i = 0; i < ARRAYSIZE(Settings->FloppyDisks); ++i) { if (Settings->FloppyDisks[i].Buffer) - RtlFreeAnsiString(&Settings->FloppyDisks[i]); + RtlFreeUnicodeString(&Settings->FloppyDisks[i]); } for (i = 0; i < ARRAYSIZE(Settings->HardDisks); ++i) { if (Settings->HardDisks[i].Buffer) - RtlFreeAnsiString(&Settings->HardDisks[i]); + RtlFreeUnicodeString(&Settings->HardDisks[i]); } } Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Sat Nov 7 20:19:32 2015 @@ -74,8 +74,8 @@ { ANSI_STRING BiosFileName; ANSI_STRING RomFiles; - ANSI_STRING FloppyDisks[2]; - ANSI_STRING HardDisks[4]; + UNICODE_STRING FloppyDisks[2]; + UNICODE_STRING HardDisks[4]; } NTVDM_SETTINGS, *PNTVDM_SETTINGS; extern NTVDM_SETTINGS GlobalSettings;

1 0

[hbelusca] 69839: Forgot this file.
by hbelusca＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: hbelusca Date: Sat Nov 7 20:07:51 2015 New Revision: 69839 URL: http://svn.reactos.org/svn/reactos?rev=69839&view=rev Log: Forgot this file. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] Sat Nov 7 20:07:51 2015 @@ -18,6 +18,9 @@ #include "clock.h" #include "video/svga.h" +/**/ +#include "../console/video.h" +/**/ /* PRIVATE VARIABLES **********************************************************/

1 0

[hbelusca] 69838: [NTVDM] Start factoring out all code related to console-specific stuff (while leaving everything else in place). This is WIP (and the corresponding .c files are included where the...
by hbelusca＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: hbelusca Date: Sat Nov 7 20:07:12 2015 New Revision: 69838 URL: http://svn.reactos.org/svn/reactos?rev=69838&view=rev Log: [NTVDM] Start factoring out all code related to console-specific stuff (while leaving everything else in place). This is WIP (and the corresponding .c files are included where they are needed instead of being compiled, will be fixed later). Added: trunk/reactos/subsystems/mvdm/ntvdm/console/ (with props) trunk/reactos/subsystems/mvdm/ntvdm/console/console.c (with props) trunk/reactos/subsystems/mvdm/ntvdm/console/video.c (with props) trunk/reactos/subsystems/mvdm/ntvdm/console/video.h (with props) Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… Added: trunk/reactos/subsystems/mvdm/ntvdm/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… Added: trunk/reactos/subsystems/mvdm/ntvdm/console/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… Added: trunk/reactos/subsystems/mvdm/ntvdm/console/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd…

1 0

[ekohl] 69837: [USERENV] - GetProfilesDirectoryA: In case of success, return the length of the profiles directory. - GetProfilesDirectoryW: Set ERROR_INSUFFICIENT_BUFFER, if lpProfilesDir is NULL.
by ekohl＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: ekohl Date: Sat Nov 7 19:47:24 2015 New Revision: 69837 URL: http://svn.reactos.org/svn/reactos?rev=69837&view=rev Log: [USERENV] - GetProfilesDirectoryA: In case of success, return the length of the profiles directory. - GetProfilesDirectoryW: Set ERROR_INSUFFICIENT_BUFFER, if lpProfilesDir is NULL. Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Sat Nov 7 19:47:24 2015 @@ -687,14 +687,14 @@ lpcchSize); if (bResult) { - WideCharToMultiByte(CP_ACP, - 0, - lpBuffer, - -1, - lpProfileDir, - *lpcchSize, - NULL, - NULL); + bResult = WideCharToMultiByte(CP_ACP, + 0, + lpBuffer, + -1, + lpProfileDir, + *lpcchSize, + NULL, + NULL); } GlobalFree(lpBuffer); @@ -713,6 +713,7 @@ DWORD dwLength; HKEY hKey; LONG Error; + BOOL bRet = FALSE; if (!lpcchSize) { @@ -764,17 +765,22 @@ { if (*lpcchSize < dwLength) { - *lpcchSize = dwLength; SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - wcscpy(lpProfilesDir, szProfilesPath); + } + else + { + wcscpy(lpProfilesDir, szProfilesPath); + bRet = TRUE; + } + } + else + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); } *lpcchSize = dwLength; - return TRUE; + return bRet; }

1 0

[akhaldi] 69836: [CMAKE] Properly pass arguments to the host tools phase. Fixes MSVC x64 build.
by akhaldi＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: akhaldi Date: Sat Nov 7 17:35:27 2015 New Revision: 69836 URL: http://svn.reactos.org/svn/reactos?rev=69836&view=rev Log: [CMAKE] Properly pass arguments to the host tools phase. Fixes MSVC x64 build. Modified: trunk/reactos/cmake/host-tools.cmake Modified: trunk/reactos/cmake/host-tools.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/host-tools.cmake?rev… ============================================================================== --- trunk/reactos/cmake/host-tools.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/host-tools.cmake [iso-8859-1] Sat Nov 7 17:35:27 2015 @@ -32,6 +32,6 @@ BUILD_ALWAYS 1 PREFIX host-tools EXCLUDE_FROM_ALL 1 - CMAKE_ARGS "-DNEW_STYLE_BUILD=1 -DARCH:STRING=${ARCH}" + CMAKE_ARGS "-DNEW_STYLE_BUILD=1;-DARCH:STRING=${ARCH}" INSTALL_COMMAND "" BUILD_BYPRODUCTS ${tools_binaries})

1 0

[akhaldi] 69835: [CMAKE] Pass the architecture to host tools configure phase.
by akhaldi＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: akhaldi Date: Sat Nov 7 17:18:19 2015 New Revision: 69835 URL: http://svn.reactos.org/svn/reactos?rev=69835&view=rev Log: [CMAKE] Pass the architecture to host tools configure phase. Modified: trunk/reactos/cmake/host-tools.cmake Modified: trunk/reactos/cmake/host-tools.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/host-tools.cmake?rev… ============================================================================== --- trunk/reactos/cmake/host-tools.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/host-tools.cmake [iso-8859-1] Sat Nov 7 17:18:19 2015 @@ -32,6 +32,6 @@ BUILD_ALWAYS 1 PREFIX host-tools EXCLUDE_FROM_ALL 1 - CMAKE_ARGS "-DNEW_STYLE_BUILD=1" + CMAKE_ARGS "-DNEW_STYLE_BUILD=1 -DARCH:STRING=${ARCH}" INSTALL_COMMAND "" BUILD_BYPRODUCTS ${tools_binaries})

1 0

[ekohl] 69834: [USERENV] CreateEnvironmentBlock: Set or overwrite the SystemRoot, SystemDrive and USERPROFILE environment variables of the new environment block.
by ekohl＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: ekohl Date: Sat Nov 7 16:40:33 2015 New Revision: 69834 URL: http://svn.reactos.org/svn/reactos?rev=69834&view=rev Log: [USERENV] CreateEnvironmentBlock: Set or overwrite the SystemRoot, SystemDrive and USERPROFILE environment variables of the new environment block. Modified: trunk/reactos/dll/win32/userenv/environment.c Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Sat Nov 7 16:40:33 2015 @@ -431,6 +431,29 @@ return FALSE; } + /* Set 'SystemRoot' variable */ + Length = MAX_PATH; + if (GetEnvironmentVariableW(L"SystemRoot", + Buffer, + Length)) + { + SetUserEnvironmentVariable(lpEnvironment, + L"SystemRoot", + Buffer, + FALSE); + } + + /* Set 'SystemDrive' variable */ + if (GetEnvironmentVariableW(L"SystemDrive", + Buffer, + Length)) + { + SetUserEnvironmentVariable(lpEnvironment, + L"SystemDrive", + Buffer, + FALSE); + } + /* Set 'COMPUTERNAME' variable */ Length = MAX_PATH; if (GetComputerNameW(Buffer, @@ -451,6 +474,17 @@ L"ALLUSERSPROFILE", Buffer, FALSE); + } + + /* Set 'USERSPROFILE' variable to the default users profile */ + Length = MAX_PATH; + if (GetDefaultUserProfileDirectory(Buffer, + &Length)) + { + SetUserEnvironmentVariable(lpEnvironment, + L"USERPROFILE", + Buffer, + TRUE); } lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE,

1 0

[tkreuzer] 69833: [INTL] Remove a \ that accidentally slipped into the string. Fixes a GCC warning.
by tkreuzer＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: tkreuzer Date: Sat Nov 7 14:03:21 2015 New Revision: 69833 URL: http://svn.reactos.org/svn/reactos?rev=69833&view=rev Log: [INTL] Remove a \ that accidentally slipped into the string. Fixes a GCC warning. Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] Sat Nov 7 14:03:21 2015 @@ -50,7 +50,7 @@ GROUPBOX "Lingua per programmi non Unicode", -1, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "In base a questa impostazione di sistema Ã¨ possibile visualizzare menÃ¹ e finestre di dialogo di programmi non Unicode nella lingua di origine.", -1, 14, 18, 223, 17 - LTEXT "I programmi Unicode resteranno invariati, ma l\'impostazione verrÃ applicata per tutti gli utenti che utilizzano il computer.", -1, 14, 35, 223, 17 + LTEXT "I programmi Unicode resteranno invariati, ma l'impostazione verrÃ applicata per tutti gli utenti che utilizzano il computer.", -1, 14, 35, 223, 17 LTEXT "Selezionare una lingua per i programmi non Unicode da utilizzare:", -1, 14, 55, 223, 18 GROUPBOX "Tabella di conversione di tabelle codici", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70

1 0

[tfaber] 69832: [WIN32K:NTUSER] - Release extra reference on accelerator objects after creation. Fixes user handle leak. CORE-10487 #resolve
by tfaber＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: tfaber Date: Sat Nov 7 13:26:40 2015 New Revision: 69832 URL: http://svn.reactos.org/svn/reactos?rev=69832&view=rev Log: [WIN32K:NTUSER] - Release extra reference on accelerator objects after creation. Fixes user handle leak. CORE-10487 #resolve Modified: trunk/reactos/win32ss/user/ntuser/accelerator.c Modified: trunk/reactos/win32ss/user/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/accele… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/accelerator.c [iso-8859-1] Sat Nov 7 13:26:40 2015 @@ -312,6 +312,9 @@ /* FIXME: Save HandleTable in a list somewhere so we can clean it up again */ + /* Release the extra reference (UserCreateObject added 2 references) */ + UserDereferenceObject(Accel); + RETURN(hAccel); CLEANUP:

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