Ros-diffs June 2016

ros-diffs@reactos.org

17 participants
228 discussions

[hbelusca] 71487: [BOOTDATA] - Swap two values so that they are listed in alphabetical order. - PaintDesktopVersion is a DWORD value, as such, use a correct initializer.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 1 15:34:56 2016 New Revision: 71487 URL: http://svn.reactos.org/svn/reactos?rev=71487&view=rev Log: [BOOTDATA] - Swap two values so that they are listed in alphabetical order. - PaintDesktopVersion is a DWORD value, as such, use a correct initializer. Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Wed Jun 1 15:34:56 2016 @@ -57,7 +57,7 @@ HKCU,"Control Panel\Desktop","DragFullWindows",2,"1" HKCU,"Control Panel\Desktop","DragHeight",0x00000000,"4" HKCU,"Control Panel\Desktop","DragWidth",0x00000000,"4" -HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,"0" +HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,0x0 HKCU,"Control Panel\Desktop","HungAppTimeout",2,"5000" HKCU,"Control Panel\Desktop","ScreenSaveActive",2,"0" HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1" Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Wed Jun 1 15:34:56 2016 @@ -1386,13 +1386,13 @@ ; Win32 config HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","AppInit_DLLs",0x00000000,"" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DesktopHeapLogging",0x00010001,0x1 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DeviceNotSelectedTimeout",0x00000000,"15" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","GDIProcessHandleQuota",0x00010001,0x2710 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","Spooler",0x00000000,"yes" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","swapdisk",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","TransmissionRetryTimeout",0x00000000,"90" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","USERProcessHandleQuota",0x00010001,0x2710 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DesktopHeapLogging",0x00010001,0x1 ;-------------------------------- STRINGS -------------------------------

8 years, 7 months

[hbelusca] 71486: [WIN32K] Display a nice ReactOS version desktop watermark (with different fonts) when the corresponding registry values are set. See http://winaero.com/blog/a-new-way-to-display-t...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 1 15:24:38 2016 New Revision: 71486 URL: http://svn.reactos.org/svn/reactos?rev=71486&view=rev Log: [WIN32K] Display a nice ReactOS version desktop watermark (with different fonts) when the corresponding registry values are set. See http://winaero.com/blog/a-new-way-to-display-the-windows-version-on-your-de… for more details (which works on Windows 2003 too). CORE-11349 #resolve Modified: trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/ntuser.h Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed Jun 1 15:24:38 2016 @@ -3,7 +3,7 @@ * PROJECT: ReactOS Win32k subsystem * PURPOSE: Desktops * FILE: subsystems/win32/win32k/ntuser/desktop.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ /* INCLUDES ******************************************************************/ @@ -246,41 +246,201 @@ return STATUS_SUCCESS; } -static INT GetSystemVersionString(PWSTR* buffer) -{ - static WCHAR wszVersion[256] = L""; - int len = 0; - - if (!*wszVersion) - { -#if 0 // Disabled until versioning in win32k gets correctly implemented (hbelusca, r66750). - RTL_OSVERSIONINFOEXW versionInfo; - - versionInfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); - - if (!NT_SUCCESS(RtlGetVersion((PRTL_OSVERSIONINFOW)&versionInfo))) - return 0; - - if (versionInfo.dwMajorVersion <= 4) - len = swprintf(wszVersion, - L"ReactOS Version %lu.%lu %s Build %lu", - versionInfo.dwMajorVersion, versionInfo.dwMinorVersion, - versionInfo.szCSDVersion, versionInfo.dwBuildNumber & 0xFFFF); - else - len = swprintf(wszVersion, - L"ReactOS %s (Build %lu)", - versionInfo.szCSDVersion, versionInfo.dwBuildNumber & 0xFFFF); -#else - len = swprintf(wszVersion, L"ReactOS Version %S %S", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR); +static NTSTATUS +GetSystemVersionString(OUT PWSTR pwszzVersion, + IN SIZE_T cchDest, + IN BOOLEAN InSafeMode, + IN BOOLEAN AppendNtSystemRoot) +{ + NTSTATUS Status; + + RTL_OSVERSIONINFOEXW VerInfo; + UNICODE_STRING CSDVersionString; +#if 0 + UNICODE_STRING CurBuildNmString; #endif + RTL_QUERY_REGISTRY_TABLE VersionConfigurationTable[2] = + { + { + NULL, + RTL_QUERY_REGISTRY_DIRECT, + L"CSDVersion", + &CSDVersionString, + REG_NONE, NULL, 0 + }, + +#if 0 + { + NULL, + RTL_QUERY_REGISTRY_DIRECT, + L"CurrentBuildNumber", + &CurBuildNmString, + REG_NONE, NULL, 0 + }, +#endif + + {0} + }; + + WCHAR VersionBuffer[256]; + PWCHAR EndBuffer; + + VerInfo.dwOSVersionInfoSize = sizeof(VerInfo); + + /* + * This call is uniquely used to retrieve the current CSD numbers. + * All the rest (major, minor, ...) is either retrieved from the + * SharedUserData structure, or from the registry. + */ + RtlGetVersion((PRTL_OSVERSIONINFOW)&VerInfo); + + /* + * In kernel-mode, szCSDVersion is not initialized. Initialize it + * and query its value from the registry. + */ + RtlZeroMemory(VerInfo.szCSDVersion, sizeof(VerInfo.szCSDVersion)); + RtlInitEmptyUnicodeString(&CSDVersionString, + VerInfo.szCSDVersion, + sizeof(VerInfo.szCSDVersion)); + Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT, + L"", + VersionConfigurationTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Indicate nothing is there */ + CSDVersionString.Length = 0; + } + /* NULL-terminate */ + CSDVersionString.Buffer[CSDVersionString.Length / sizeof(WCHAR)] = UNICODE_NULL; + + EndBuffer = VersionBuffer; + if ( /* VerInfo.wServicePackMajor != 0 && */ CSDVersionString.Length) + { + /* Print the version string */ + Status = RtlStringCbPrintfExW(VersionBuffer, + sizeof(VersionBuffer), + &EndBuffer, + NULL, + 0, + L": %wZ", + &CSDVersionString); + if (!NT_SUCCESS(Status)) + { + /* No version, NULL-terminate the string */ + *EndBuffer = UNICODE_NULL; + } } else { - len = wcslen(wszVersion); - } - - *buffer = wszVersion; - return len; + /* No version, NULL-terminate the string */ + *EndBuffer = UNICODE_NULL; + } + + if (InSafeMode) + { + /* String for Safe Mode */ + Status = RtlStringCchPrintfW(pwszzVersion, + cchDest, + L"ReactOS Version %S %S (NT %u.%u Build %u%s)\n", + KERNEL_VERSION_STR, + KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry + SharedUserData->NtMajorVersion, + SharedUserData->NtMinorVersion, + (VerInfo.dwBuildNumber & 0xFFFF), + VersionBuffer); + + if (AppendNtSystemRoot && NT_SUCCESS(Status)) + { + Status = RtlStringCbPrintfW(VersionBuffer, + sizeof(VersionBuffer), + L" - %s\n", + SharedUserData->NtSystemRoot); + if (NT_SUCCESS(Status)) + { + /* Replace the last newline by a NULL, before concatenating */ + EndBuffer = wcsrchr(pwszzVersion, L'\n'); + if (EndBuffer) *EndBuffer = UNICODE_NULL; + + /* The concatenated string has a terminating newline */ + Status = RtlStringCchCatW(pwszzVersion, + cchDest, + VersionBuffer); + if (!NT_SUCCESS(Status)) + { + /* Concatenation failed, put back the newline */ + if (EndBuffer) *EndBuffer = L'\n'; + } + } + + /* Override any failures as the NtSystemRoot string is optional */ + Status = STATUS_SUCCESS; + } + } + else + { + /* Multi-string for Normal Mode */ + Status = RtlStringCchPrintfW(pwszzVersion, + cchDest, + L"ReactOS Version %S\n" + L"Build %S\n" + L"Reporting NT %u.%u (Build %u%s)\n", + KERNEL_VERSION_STR, + KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry + SharedUserData->NtMajorVersion, + SharedUserData->NtMinorVersion, + (VerInfo.dwBuildNumber & 0xFFFF), + VersionBuffer); + + if (AppendNtSystemRoot && NT_SUCCESS(Status)) + { + Status = RtlStringCbPrintfW(VersionBuffer, + sizeof(VersionBuffer), + L"%s\n", + SharedUserData->NtSystemRoot); + if (NT_SUCCESS(Status)) + { + Status = RtlStringCchCatW(pwszzVersion, + cchDest, + VersionBuffer); + } + + /* Override any failures as the NtSystemRoot string is optional */ + Status = STATUS_SUCCESS; + } + } + + if (!NT_SUCCESS(Status)) + { + /* Fall-back string */ + Status = RtlStringCchPrintfW(pwszzVersion, + cchDest, + L"ReactOS Version %S %S\n", + KERNEL_VERSION_STR, + KERNEL_VERSION_BUILD_STR); + if (!NT_SUCCESS(Status)) + { + /* General failure, NULL-terminate the string */ + pwszzVersion[0] = UNICODE_NULL; + } + } + + /* + * Convert the string separators (newlines) into NULLs + * and NULL-terminate the multi-string. + */ + while (*pwszzVersion) + { + EndBuffer = wcschr(pwszzVersion, L'\n'); + if (!EndBuffer) break; + pwszzVersion = EndBuffer; + + *pwszzVersion++ = UNICODE_NULL; + } + *pwszzVersion = UNICODE_NULL; + + return Status; } @@ -1035,7 +1195,7 @@ return FALSE; /* Retrieve the current SafeMode state */ - InSafeMode = (UserGetSystemMetrics(SM_CLEANBOOT) != 0); + InSafeMode = (UserGetSystemMetrics(SM_CLEANBOOT) != 0); // gpsi->aiSysMet[SM_CLEANBOOT]; if (!InSafeMode) { @@ -1160,15 +1320,21 @@ /* * Display the system version on the desktop background */ - if (g_PaintDesktopVersion || InSafeMode) - { - PWSTR pwszVersion; + if (InSafeMode || g_AlwaysDisplayVersion || g_PaintDesktopVersion) + { + NTSTATUS Status; + static WCHAR wszzVersion[1024] = L"\0"; + + /* Only used in normal mode */ + // We expect at most 4 strings (3 for version, 1 for optional NtSystemRoot) + static POLYTEXTW VerStrs[4] = {{0},{0},{0},{0}}; + INT i = 0; INT len; - NONCLIENTMETRICSW ncm; - HFONT hFont = NULL, hOldFont = NULL; + + HFONT hFont1 = NULL, hFont2 = NULL, hOldFont = NULL; COLORREF crText, color_old; UINT align_old; - int mode_old; + INT mode_old; PDC pdc; if (!UserSystemParametersInfo(SPI_GETWORKAREA, 0, &Rect, 0)) @@ -1177,18 +1343,22 @@ Rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); } - /* Set up the font (use default one otherwise) */ - ncm.cbSize = sizeof(ncm); - if (UserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) - { - hFont = GreCreateFontIndirectW(&ncm.lfCaptionFont); - if (hFont) - hOldFont = NtGdiSelectFont(hDC, hFont); - } + /* + * Set up the fonts (otherwise use default ones) + */ + + /* Font for the principal version string */ + hFont1 = GreCreateFontIndirectW(&gspv.ncm.lfCaptionFont); + /* Font for the secondary version strings */ + hFont2 = GreCreateFontIndirectW(&gspv.ncm.lfMenuFont); + + if (hFont1) + hOldFont = NtGdiSelectFont(hDC, hFont1); if (gspv.hbmWallpaper == NULL) { /* Retrieve the brush fill colour */ + // TODO: The following code constitutes "GreGetBrushColor". PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush); pdc = DC_LockDc(hDC); if (pdc) @@ -1219,33 +1389,100 @@ mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); /* Display the system version information */ - // FIXME: We need different strings for Safe Mode and regular mode. - len = GetSystemVersionString(&pwszVersion); // , InSafeMode); - if (len) + if (!*wszzVersion) + { + Status = GetSystemVersionString(wszzVersion, + ARRAYSIZE(wszzVersion), + InSafeMode, + g_AlwaysDisplayVersion); + if (!InSafeMode && NT_SUCCESS(Status) && *wszzVersion) + { + PWCHAR pstr = wszzVersion; + for (i = 0; (i < ARRAYSIZE(VerStrs)) && *pstr; ++i) + { + VerStrs[i].n = wcslen(pstr); + VerStrs[i].lpstr = pstr; + pstr += (VerStrs[i].n + 1); + } + } + } + else + { + Status = STATUS_SUCCESS; + } + if (NT_SUCCESS(Status) && *wszzVersion) { if (!InSafeMode) { - GreExtTextOutW(hDC, Rect.right - 16, Rect.bottom - 48, 0, NULL, pwszVersion, len, NULL, 0); + SIZE Size = {0, 0}; + LONG TotalHeight = 0; + + /* Normal Mode: multiple version information text separated by newlines */ + IntGdiSetTextAlign(hDC, TA_RIGHT | TA_BOTTOM); + + /* Compute the heights of the strings */ + if (hFont1) NtGdiSelectFont(hDC, hFont1); + for (i = 0; i < ARRAYSIZE(VerStrs); ++i) + { + if (!VerStrs[i].lpstr || !*VerStrs[i].lpstr || (VerStrs[i].n == 0)) + break; + + GreGetTextExtentW(hDC, VerStrs[i].lpstr, VerStrs[i].n, &Size, 1); + VerStrs[i].y = Size.cy; // Store the string height + TotalHeight += Size.cy; + + /* While the first string was using hFont1, all the others use hFont2 */ + if (hFont2) NtGdiSelectFont(hDC, hFont2); + } + /* The total height must not exceed the screen height */ + TotalHeight = min(TotalHeight, Rect.bottom); + + /* Display the strings */ + if (hFont1) NtGdiSelectFont(hDC, hFont1); + for (i = 0; i < ARRAYSIZE(VerStrs); ++i) + { + if (!VerStrs[i].lpstr || !*VerStrs[i].lpstr || (VerStrs[i].n == 0)) + break; + + TotalHeight -= VerStrs[i].y; + GreExtTextOutW(hDC, + Rect.right - 5, + Rect.bottom - TotalHeight - 5, + 0, NULL, + VerStrs[i].lpstr, + VerStrs[i].n, + NULL, 0); + + /* While the first string was using hFont1, all the others use hFont2 */ + if (hFont2) NtGdiSelectFont(hDC, hFont2); + } } else { - /* Safe Mode: version information text in top center */ + if (hFont1) NtGdiSelectFont(hDC, hFont1); + + /* Safe Mode: single version information text in top center */ + len = wcslen(wszzVersion); + IntGdiSetTextAlign(hDC, TA_CENTER | TA_TOP); - GreExtTextOutW(hDC, (Rect.right + Rect.left)/2, Rect.top + 3, 0, NULL, pwszVersion, len, NULL, 0); + GreExtTextOutW(hDC, (Rect.right + Rect.left)/2, Rect.top + 3, 0, NULL, wszzVersion, len, NULL, 0); } } if (InSafeMode) { + if (hFont1) NtGdiSelectFont(hDC, hFont1); + /* Print Safe Mode text in corners */ len = wcslen(s_wszSafeMode); + IntGdiSetTextAlign(hDC, TA_LEFT | TA_TOP); GreExtTextOutW(hDC, Rect.left, Rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); IntGdiSetTextAlign(hDC, TA_RIGHT | TA_TOP); GreExtTextOutW(hDC, Rect.right, Rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); - IntGdiSetTextAlign(hDC, TA_LEFT | TA_BASELINE); + IntGdiSetTextAlign(hDC, TA_LEFT | TA_BOTTOM); GreExtTextOutW(hDC, Rect.left, Rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); - IntGdiSetTextAlign(hDC, TA_RIGHT | TA_BASELINE); + IntGdiSetTextAlign(hDC, TA_RIGHT | TA_BOTTOM); GreExtTextOutW(hDC, Rect.right, Rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); } @@ -1253,10 +1490,13 @@ IntGdiSetTextAlign(hDC, align_old); IntGdiSetTextColor(hDC, color_old); - if (hFont) + if (hFont2) + GreDeleteObject(hFont2); + + if (hFont1) { NtGdiSelectFont(hDC, hOldFont); - GreDeleteObject(hFont); + GreDeleteObject(hFont1); } } Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Wed Jun 1 15:24:38 2016 @@ -14,6 +14,7 @@ PTHREADINFO gptiCurrent = NULL; PPROCESSINFO gppiInputProvider = NULL; +BOOL g_AlwaysDisplayVersion = FALSE; ERESOURCE UserLock; ATOM AtomMessage; // Window Message atom. ATOM AtomWndObj; // Window Object atom. @@ -76,6 +77,7 @@ InitUserImpl(VOID) { NTSTATUS Status; + HKEY hKey; ExInitializeResourceLite(&UserLock); @@ -93,6 +95,16 @@ } InitUserAtoms(); + + Status = RegOpenKey(L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows", + &hKey); + if (NT_SUCCESS(Status)) + { + DWORD dwValue = 0; + RegReadDWORD(hKey, L"DisplayVersion", &dwValue); + g_AlwaysDisplayVersion = !!dwValue; + ZwClose(hKey); + } InitSysParams(); Modified: trunk/reactos/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] Wed Jun 1 15:24:38 2016 @@ -14,6 +14,7 @@ extern PPROCESSINFO gppiList; extern PPROCESSINFO ppiScrnSaver; extern PPROCESSINFO gppiInputProvider; +extern BOOL g_AlwaysDisplayVersion; extern ATOM gaGuiConsoleWndClass; extern ATOM AtomDDETrack; extern ATOM AtomQOS;

8 years, 7 months

[hbelusca] 71485: [BASESRV] - Always NULL-terminate the cached CSDVersion string. - Alex wrote most of this file! Attribute to him too.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 1 13:22:33 2016 New Revision: 71485 URL: http://svn.reactos.org/svn/reactos?rev=71485&view=rev Log: [BASESRV] - Always NULL-terminate the cached CSDVersion string. - Alex wrote most of this file! Attribute to him too. Modified: trunk/reactos/subsystems/win/basesrv/init.c Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Wed Jun 1 13:22:33 2016 @@ -3,7 +3,8 @@ * PROJECT: ReactOS Base API Server DLL * FILE: subsystems/win/basesrv/init.c * PURPOSE: Initialization - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ @@ -440,9 +441,11 @@ } else { - /* NULL-terminate to indicate nothing is there */ - BaseStaticServerData->CSDVersion[0] = UNICODE_NULL; - } + /* Indicate nothing is there */ + BaseSrvCSDString.Length = 0; + } + /* NULL-terminate */ + BaseStaticServerData->CSDVersion[BaseSrvCSDString.Length / sizeof(WCHAR)] = UNICODE_NULL; /* Cache the system information */ Status = NtQuerySystemInformation(SystemBasicInformation,

8 years, 7 months

[hbelusca] 71484: [WIN32K]: Avoid (LPWSTR) casts on strings that are LPCWSTR, by just using the corresponding const type LPCWSTR in the functions parameters.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 1 13:20:18 2016 New Revision: 71484 URL: http://svn.reactos.org/svn/reactos?rev=71484&view=rev Log: [WIN32K]: Avoid (LPWSTR) casts on strings that are LPCWSTR, by just using the corresponding const type LPCWSTR in the functions parameters. Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/text.c trunk/reactos/win32ss/gdi/ntgdi/text.h trunk/reactos/win32ss/user/rtl/text.c Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] Wed Jun 1 13:20:18 2016 @@ -117,7 +117,7 @@ FASTCALL GreGetCharacterPlacementW( HDC hdc, - LPWSTR pwsz, + LPCWSTR pwsz, INT nCount, INT nMaxExtent, LPGCP_RESULTSW pgcpw, Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Wed Jun 1 13:20:18 2016 @@ -3316,7 +3316,7 @@ IN INT YStart, IN UINT fuOptions, IN OPTIONAL PRECTL lprc, - IN LPWSTR String, + IN LPCWSTR String, IN INT Count, IN OPTIONAL LPINT Dx, IN DWORD dwCodePage) @@ -3885,7 +3885,7 @@ RECTL SafeRect; BYTE LocalBuffer[STACK_TEXT_BUFFER_SIZE]; PVOID Buffer = LocalBuffer; - LPWSTR SafeString = NULL; + LPCWSTR SafeString = NULL; LPINT SafeDx = NULL; ULONG BufSize, StringSize, DxSize = 0; @@ -3922,7 +3922,7 @@ _SEH2_TRY { /* Put the Dx before the String to assure alignment of 4 */ - SafeString = (LPWSTR)(((ULONG_PTR)Buffer) + DxSize); + SafeString = (LPCWSTR)(((ULONG_PTR)Buffer) + DxSize); /* Probe and copy the string */ ProbeForRead(UnsafeString, StringSize, 1); Modified: trunk/reactos/win32ss/gdi/ntgdi/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] Wed Jun 1 13:20:18 2016 @@ -23,7 +23,7 @@ LPCWSTR lpString, int cchString) { - return GreExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cchString, NULL, 0); + return GreExtTextOutW(hdc, nXStart, nYStart, 0, NULL, lpString, cchString, NULL, 0); } /* @@ -35,7 +35,7 @@ FASTCALL GreGetTextExtentW( HDC hDC, - LPWSTR lpwsz, + LPCWSTR lpwsz, INT cwc, LPSIZE psize, UINT flOpts) @@ -92,7 +92,7 @@ FASTCALL GreGetTextExtentExW( HDC hDC, - LPWSTR String, + LPCWSTR String, ULONG Count, ULONG MaxExtent, PULONG Fit, Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] Wed Jun 1 13:20:18 2016 @@ -126,10 +126,10 @@ BOOL FASTCALL ftGdiRealizationInfo(PFONTGDI,PREALIZATION_INFO); DWORD FASTCALL ftGdiGetKerningPairs(PFONTGDI,DWORD,LPKERNINGPAIR); BOOL NTAPI GreExtTextOutW(IN HDC,IN INT,IN INT,IN UINT,IN OPTIONAL RECTL*, - IN LPWSTR, IN INT, IN OPTIONAL LPINT, IN DWORD); + IN LPCWSTR, IN INT, IN OPTIONAL LPINT, IN DWORD); DWORD FASTCALL IntGetCharDimensions(HDC, PTEXTMETRICW, PDWORD); -BOOL FASTCALL GreGetTextExtentW(HDC,LPWSTR,INT,LPSIZE,UINT); -BOOL FASTCALL GreGetTextExtentExW(HDC,LPWSTR,ULONG,ULONG,PULONG,PULONG,LPSIZE,FLONG); +BOOL FASTCALL GreGetTextExtentW(HDC,LPCWSTR,INT,LPSIZE,UINT); +BOOL FASTCALL GreGetTextExtentExW(HDC,LPCWSTR,ULONG,ULONG,PULONG,PULONG,LPSIZE,FLONG); BOOL FASTCALL GreTextOutW(HDC,int,int,LPCWSTR,int); HFONT FASTCALL GreCreateFontIndirectW( LOGFONTW * ); BOOL WINAPI GreGetTextMetricsW( _In_ HDC hdc, _Out_ LPTEXTMETRICW lptm); Modified: trunk/reactos/win32ss/user/rtl/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/rtl/text.c?re… ============================================================================== --- trunk/reactos/win32ss/user/rtl/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/rtl/text.c [iso-8859-1] Wed Jun 1 13:20:18 2016 @@ -120,7 +120,7 @@ if (lpstr[j] == '\t') break; /* get the extent of the normal character part */ #ifdef _WIN32K_ - GreGetTextExtentW( hdc, (LPWSTR)lpstr + i, j - i , &extent, 0 ); + GreGetTextExtentW( hdc, lpstr + i, j - i , &extent, 0 ); #else GetTextExtentPointW( hdc, lpstr + i, j - i , &extent ); #endif @@ -169,7 +169,7 @@ r.bottom = y + extent.cy; #ifdef _WIN32K_ GreExtTextOutW( hdc, x0, y, GreGetBkMode(hdc) == OPAQUE ? ETO_OPAQUE : 0, - &r, (LPWSTR)lpstr + i, j - i, NULL, 0 ); + &r, lpstr + i, j - i, NULL, 0 ); #else ExtTextOutW( hdc, x0, y, GetBkMode(hdc) == OPAQUE ? ETO_OPAQUE : 0, &r, lpstr + i, j - i, NULL ); @@ -1029,13 +1029,13 @@ HPEN hpen; HPEN oldPen; #ifdef _WIN32K_ - GreGetTextExtentW (hdc, (LPWSTR)str, offset, &size, 0); + GreGetTextExtentW (hdc, str, offset, &size, 0); #else GetTextExtentPointW (hdc, str, offset, &size); #endif prefix_x = x + size.cx; #ifdef _WIN32K_ - GreGetTextExtentW (hdc, (LPWSTR)str, offset+1, &size, 0); + GreGetTextExtentW (hdc, str, offset+1, &size, 0); #else GetTextExtentPointW (hdc, str, offset+1, &size); #endif @@ -1276,7 +1276,7 @@ len_seg = p - str; if (len_seg != len && #ifdef _WIN32K_ - !GreGetTextExtentW(hdc, (LPWSTR)str, len_seg, &size, 0)) + !GreGetTextExtentW(hdc, str, len_seg, &size, 0)) #else !GetTextExtentPointW(hdc, str, len_seg, &size)) #endif @@ -1295,7 +1295,7 @@ if (!GreExtTextOutW( hdc, xseg, y, ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) | ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), - rect, (LPWSTR)str, len_seg, NULL, 0 )) + rect, str, len_seg, NULL, 0 )) #else if (!ExtTextOutW( hdc, xseg, y, ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) |

8 years, 7 months

[cwittich] 71483: [MSI] silence DllRegisterServer MessageBoxes CORE-11244

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jun 1 09:12:22 2016 New Revision: 71483 URL: http://svn.reactos.org/svn/reactos?rev=71483&view=rev Log: [MSI] silence DllRegisterServer MessageBoxes CORE-11244 Modified: trunk/reactos/dll/win32/msi/action.c Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Wed Jun 1 09:12:22 2016 @@ -4769,10 +4769,17 @@ static void register_dll( const WCHAR *dll, BOOL unregister ) { +#ifdef __REACTOS_ + static const WCHAR regW[] = + {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','s',' ','\"','%','s','\"',0}; + static const WCHAR unregW[] = + {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','s',' ','/','u',' ','\"','%','s','\"',0}; +#else /* __REACTOS__ */ static const WCHAR regW[] = {'r','e','g','s','v','r','3','2','.','e','x','e',' ','\"','%','s','\"',0}; static const WCHAR unregW[] = {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','u',' ','\"','%','s','\"',0}; +#endif /* __REACTOS__ */ PROCESS_INFORMATION pi; STARTUPINFOW si; WCHAR *cmd;

8 years, 7 months

[tfaber] 71482: [ACPICA] - Define ACPI_USE_SYSTEM_CLIBRARY to use our libc functions rather than acpica's own implementations. Fixes MSVC release build and obsoletes some ROS-diffs CORE-11184 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Jun 1 07:32:30 2016 New Revision: 71482 URL: http://svn.reactos.org/svn/reactos?rev=71482&view=rev Log: [ACPICA] - Define ACPI_USE_SYSTEM_CLIBRARY to use our libc functions rather than acpica's own implementations. Fixes MSVC release build and obsoletes some ROS-diffs CORE-11184 #resolve Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/bus/acpi/acpica/include/acclib.h trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Wed Jun 1 07:32:30 2016 @@ -172,7 +172,7 @@ acpica/utilities/utglobal.c) add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE) -set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE") +set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE;ACPI_USE_SYSTEM_CLIBRARY") add_dependencies(acpica bugcodes xdk) list(APPEND ACPI_SOURCE @@ -193,7 +193,7 @@ add_library(acpi SHARED ${ACPI_SOURCE}) set_module_type(acpi kernelmodedriver) -target_link_libraries(acpi wdmguid acpica ${PSEH_LIB}) +target_link_libraries(acpi wdmguid acpica memcmp strtol ${PSEH_LIB}) add_importlibs(acpi ntoskrnl hal) add_pch(acpi precomp.h ACPI_SOURCE) add_cd_file(TARGET acpi DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acclib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acclib.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acclib.h [iso-8859-1] Wed Jun 1 07:32:30 2016 @@ -118,17 +118,10 @@ const char *SrcString, ACPI_SIZE Count); -#ifdef __REACTOS__ -char * -strstr ( - const char *String1, - const char *String2); -#else /* __REACTOS__ */ char * strstr ( char *String1, char *String2); -#endif /* __REACTOS__ */ /* Conversion */ @@ -142,19 +135,11 @@ /* Memory */ -#ifdef __REACTOS__ -int -memcmp ( - const void *Buffer1, - const void *Buffer2, - ACPI_SIZE Count); -#else /* __REACTOS__ */ int memcmp ( void *Buffer1, void *Buffer2, ACPI_SIZE Count); -#endif /* __REACTOS__ */ void * memcpy ( Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c [iso-8859-1] Wed Jun 1 07:32:30 2016 @@ -107,19 +107,11 @@ * DESCRIPTION: Compare two Buffers, with a maximum length * ******************************************************************************/ -#ifdef __REACTOS__ -int -memcmp ( - const void *VBuffer1, - const void *VBuffer2, - ACPI_SIZE Count) -#else /* __REACTOS__ */ int memcmp ( void *VBuffer1, void *VBuffer2, ACPI_SIZE Count) -#endif /* __REACTOS__ */ { char *Buffer1 = (char *) VBuffer1; char *Buffer2 = (char *) VBuffer2; @@ -514,17 +506,10 @@ * ******************************************************************************/ -#ifdef __REACTOS__ -char * -strstr ( - const char *String1, - const char *String2) -#else /* __REACTOS **/ char * strstr ( char *String1, char *String2) -#endif /* __REACTOS__ */ { UINT32 Length; @@ -532,22 +517,14 @@ Length = strlen (String2); if (!Length) { -#ifdef __REACTOS__ - return (char *)(String1); -#else /* __REACTOS__ */ return (String1); -#endif /* __REACTOS__ */ } while (strlen (String1) >= Length) { if (memcmp (String1, String2, Length) == 0) { -#ifdef __REACTOS__ - return (char *)(String1); -#else /* __REACTOS__ */ return (String1); -#endif /* __REACTOS__ */ } String1++; }

8 years, 7 months

[tfaber] 71481: [CRT] - Introduce an strtol static library that drivers can use to get access to strtol-style functions CORE-11184

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Jun 1 07:09:50 2016 New Revision: 71481 URL: http://svn.reactos.org/svn/reactos?rev=71481&view=rev Log: [CRT] - Introduce an strtol static library that drivers can use to get access to strtol-style functions CORE-11184 Modified: trunk/reactos/sdk/lib/crt/CMakeLists.txt Modified: trunk/reactos/sdk/lib/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/CMakeLists.txt… ============================================================================== --- trunk/reactos/sdk/lib/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/CMakeLists.txt [iso-8859-1] Wed Jun 1 07:09:50 2016 @@ -55,3 +55,14 @@ add_library(getopt misc/getopt.c) add_target_compile_definitions(getopt _DLL __USE_CRTIMP) add_dependencies(getopt psdk) + +add_library(strtol + string/ctype.c + string/iswctype.c + string/strtoi64.c + string/strtol.c + string/strtoul.c + string/strtoull.c + string/wctype.c) +add_target_compile_definitions(strtol _LIBCNT_) +add_dependencies(strtol psdk)

8 years, 7 months

[tfaber] 71480: [CRT] - Give strtoi64_l and strtoul_l their missing leading underscores

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Jun 1 07:07:57 2016 New Revision: 71480 URL: http://svn.reactos.org/svn/reactos?rev=71480&view=rev Log: [CRT] - Give strtoi64_l and strtoul_l their missing leading underscores Modified: trunk/reactos/sdk/lib/crt/string/strtoi64.c trunk/reactos/sdk/lib/crt/string/strtoul.c Modified: trunk/reactos/sdk/lib/crt/string/strtoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtoi6… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/strtoi64.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/strtoi64.c [iso-8859-1] Wed Jun 1 07:07:57 2016 @@ -7,7 +7,7 @@ * * FIXME: locale parameter is ignored */ -__int64 CDECL strtoi64_l(const char *nptr, char **endptr, int base, _locale_t locale) +__int64 CDECL _strtoi64_l(const char *nptr, char **endptr, int base, _locale_t locale) { const char *p = nptr; BOOL negative = FALSE; @@ -87,7 +87,7 @@ __int64 _strtoi64(const char *nptr, char **endptr, int base) { - return strtoi64_l(nptr, endptr, base, NULL); + return _strtoi64_l(nptr, endptr, base, NULL); } Modified: trunk/reactos/sdk/lib/crt/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtoul… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/strtoul.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/strtoul.c [iso-8859-1] Wed Jun 1 07:07:57 2016 @@ -1,14 +1,12 @@ #include <precomp.h> /* Based on Wine Staging 1.9.9 - dlls/msvcrt/string.c */ -__int64 CDECL strtoi64_l(const char *nptr, char **endptr, int base, _locale_t locale); - /****************************************************************** * _strtoul_l (MSVCRT.@) */ -unsigned long CDECL strtoul_l(const char* nptr, char** end, int base, _locale_t locale) +unsigned long CDECL _strtoul_l(const char* nptr, char** end, int base, _locale_t locale) { - __int64 ret = strtoi64_l(nptr, end, base, locale); + __int64 ret = _strtoi64_l(nptr, end, base, locale); if(ret > ULONG_MAX) { ret = ULONG_MAX; @@ -30,5 +28,5 @@ */ unsigned long CDECL strtoul(const char* nptr, char** end, int base) { - return strtoul_l(nptr, end, base, NULL); + return _strtoul_l(nptr, end, base, NULL); }

8 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2016