Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 66381: [STREAMCI] - hackfix build #2
by janderwald＠svn.reactos.org 21 Feb '15

21 Feb '15

Author: janderwald Date: Sat Feb 21 10:34:13 2015 New Revision: 66381 URL: http://svn.reactos.org/svn/reactos?rev=66381&view=rev Log: [STREAMCI] - hackfix build #2 Modified: trunk/reactos/dll/win32/streamci/streamci.c Modified: trunk/reactos/dll/win32/streamci/streamci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/streamc… ============================================================================== --- trunk/reactos/dll/win32/streamci/streamci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/streamci/streamci.c [iso-8859-1] Sat Feb 21 10:34:13 2015 @@ -50,7 +50,7 @@ { HDEVINFO hDevInfo; SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; - GUID SWBusGuid = {STATIC_BUSID_SoftwareDeviceEnumerator}; + // GUID SWBusGuid = {STATIC_BUSID_SoftwareDeviceEnumerator}; PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData; HANDLE hDevice; PSWENUM_INSTALL_INTERFACE InstallInterface; @@ -64,7 +64,7 @@ } DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); - if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, &SWBusGuid, 0, &DeviceInterfaceData)) + if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, NULL, 0, &DeviceInterfaceData)) { // failed SetupDiDestroyDeviceInfoList(hDevInfo);

1 0

[janderwald] 66380: [PSDK] - fix build
by janderwald＠svn.reactos.org 21 Feb '15

21 Feb '15

Author: janderwald Date: Sat Feb 21 10:14:00 2015 New Revision: 66380 URL: http://svn.reactos.org/svn/reactos?rev=66380&view=rev Log: [PSDK] - fix build Modified: trunk/reactos/include/ddk/swenum.h Modified: trunk/reactos/include/ddk/swenum.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/swenum.h?rev=6… ============================================================================== --- trunk/reactos/include/ddk/swenum.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/swenum.h [iso-8859-1] Sat Feb 21 10:14:00 2015 @@ -23,7 +23,7 @@ #define BUSID_SoftwareDeviceEnumerator KSMEDIUMSETID_Standard #else #define STATIC_BUSID_SoftwareDeviceEnumerator \ - 0x4747B320L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} #endif /* _KS_ */ #ifdef _NTDDK_

1 0

[janderwald] 66379: [STREAMCI] - start implement streaming device class installer
by janderwald＠svn.reactos.org 21 Feb '15

21 Feb '15

Author: janderwald Date: Sat Feb 21 10:09:36 2015 New Revision: 66379 URL: http://svn.reactos.org/svn/reactos?rev=66379&view=rev Log: [STREAMCI] - start implement streaming device class installer Added: trunk/reactos/dll/win32/streamci/ (with props) trunk/reactos/dll/win32/streamci/CMakeLists.txt (with props) trunk/reactos/dll/win32/streamci/precomp.h (with props) trunk/reactos/dll/win32/streamci/streamci.c (with props) trunk/reactos/dll/win32/streamci/streamci.rc (with props) trunk/reactos/dll/win32/streamci/streamci.spec (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sat Feb 21 10:09:36 2015 @@ -196,6 +196,7 @@ add_subdirectory(stdole2.tlb) add_subdirectory(stdole32.tlb) add_subdirectory(sti) +add_subdirectory(streamci) add_subdirectory(sxs) add_subdirectory(syssetup) add_subdirectory(t2embed) Propchange: trunk/reactos/dll/win32/streamci/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 21 10:09:36 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/win32/streamci/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/win32/streamci/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/win32/streamci/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/streamci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/streamci/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/streamci/CMakeLists.txt [iso-8859-1] Sat Feb 21 10:09:36 2015 @@ -0,0 +1,20 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +spec2def(streamci.dll streamci.spec) + +list(APPEND SOURCE + streamci.c + precomp.h) + +add_library(streamci SHARED + ${SOURCE} + streamci.rc + ${CMAKE_CURRENT_BINARY_DIR}/streamci.def) + +set_module_type(streamci win32dll) +target_link_libraries(streamci uuid wine) +add_importlibs(streamci rpcrt4 setupapi advapi32 iphlpapi dhcpcsvc ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll) +add_pch(streamci precomp.h SOURCE) +add_cd_file(TARGET streamci DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/streamci/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/streamci/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/precomp… ============================================================================== --- trunk/reactos/dll/win32/streamci/precomp.h (added) +++ trunk/reactos/dll/win32/streamci/precomp.h [iso-8859-1] Sat Feb 21 10:09:36 2015 @@ -0,0 +1,28 @@ +#ifndef PRECOMP_H__ +#define PRECOMP_H__ + +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> +#include <netcfgx.h> +#include <setupapi.h> +#include <netcfgn.h> +#include <devguid.h> +#include <strsafe.h> +#include <winioctl.h> +#include <swenum.h> +#include <debug.h> + +#endif /* EOF */ + Propchange: trunk/reactos/dll/win32/streamci/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/streamci/streamci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/streamc… ============================================================================== --- trunk/reactos/dll/win32/streamci/streamci.c (added) +++ trunk/reactos/dll/win32/streamci/streamci.c [iso-8859-1] Sat Feb 21 10:09:36 2015 @@ -0,0 +1,187 @@ +#include "precomp.h" + +DWORD +PerformIO(IN HANDLE hDevice, + IN DWORD dwCtlCode, + IN LPVOID lpBufferIn, + IN DWORD dwBufferSizeIn, + OUT LPVOID lpBufferOut, + OUT DWORD dwBufferSizeOut, + OUT LPDWORD lpNumberBytes) +{ + OVERLAPPED overlapped; + DWORD dwResult; + + ZeroMemory(&overlapped, sizeof(OVERLAPPED)); + overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + if (!overlapped.hEvent) + { + // failed to init event + return GetLastError(); + } + + if (DeviceIoControl(hDevice, dwCtlCode, lpBufferIn, dwBufferSizeIn, lpBufferOut, dwBufferSizeOut, lpNumberBytes, &overlapped)) + { + dwResult = ERROR_SUCCESS; + } + else if (GetLastError() == ERROR_IO_PENDING) + { + if (GetOverlappedResult(hDevice, &overlapped, lpNumberBytes, TRUE)) + { + dwResult = ERROR_SUCCESS; + } + else + { + dwResult = GetLastError(); + } + } + else + { + dwResult = GetLastError(); + } + CloseHandle(overlapped.hEvent); + return dwResult; +} + +DWORD +InstallSoftwareDeviceInterface(IN LPGUID DeviceId, + IN LPGUID InterfaceId, + IN LPWSTR ReferenceString) +{ + HDEVINFO hDevInfo; + SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; + GUID SWBusGuid = {STATIC_BUSID_SoftwareDeviceEnumerator}; + PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData; + HANDLE hDevice; + PSWENUM_INSTALL_INTERFACE InstallInterface; + DWORD dwResult; + + hDevInfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_SYSTEM, NULL, NULL, DIGCF_DEVICEINTERFACE| DIGCF_PRESENT); + if (!hDevInfo) + { + // failed + return GetLastError(); + } + + DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, &SWBusGuid, 0, &DeviceInterfaceData)) + { + // failed + SetupDiDestroyDeviceInfoList(hDevInfo); + return GetLastError(); + } + + DeviceInterfaceDetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA_W)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W)); + if (!DeviceInterfaceDetailData) + { + // failed + SetupDiDestroyDeviceInfoList(hDevInfo); + return GetLastError(); + } + + if (!SetupDiGetDeviceInterfaceDetailW(hDevInfo, &DeviceInterfaceData, DeviceInterfaceDetailData,MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W), NULL, NULL)) + { + // failed + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + return GetLastError(); + } + + + hDevice = CreateFileW(DeviceInterfaceDetailData->DevicePath, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED|FILE_ATTRIBUTE_NORMAL, NULL); + if (hDevice == INVALID_HANDLE_VALUE) + { + // failed + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + return GetLastError(); + } + + InstallInterface = (PSWENUM_INSTALL_INTERFACE)HeapAlloc(GetProcessHeap(), 0, sizeof(SWENUM_INSTALL_INTERFACE) + wcslen(ReferenceString) * sizeof(WCHAR)); + if (!InstallInterface) + { + // failed + CloseHandle(hDevice); + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + return GetLastError(); + } + + // init install interface param + InstallInterface->DeviceId = *DeviceId; + InstallInterface->InterfaceId = *InterfaceId; + wcscpy(InstallInterface->ReferenceString, ReferenceString); + + PerformIO(hDevice, IOCTL_SWENUM_INSTALL_INTERFACE, InstallInterface, sizeof(SWENUM_INSTALL_INTERFACE) + wcslen(ReferenceString) * sizeof(WCHAR), NULL, 0, NULL); + dwResult = HeapFree(GetProcessHeap(), 0, InstallInterface); + + CloseHandle(hDevice); + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + return dwResult; +} + +VOID +WINAPI +StreamingDeviceSetupW(IN HWND hwnd, + IN HINSTANCE hinst, + IN LPWSTR lpszCmdLine, + IN int nCmdShow) +{ + DWORD Length; + LPWSTR pCmdLine; + LPWSTR pStr; + GUID Guids[2]; + //WCHAR DevicePath[MAX_PATH]; + HRESULT hResult; + DWORD Index; + + Length = (wcslen(lpszCmdLine) + 1) * sizeof(WCHAR); + + pCmdLine = (LPWSTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length); + if (pCmdLine == NULL) + { + // no memory + return; + } + + hResult = StringCbCopyExW(pCmdLine, Length, lpszCmdLine, NULL, NULL, STRSAFE_NULL_ON_FAILURE); + if (hResult != S_OK) + { + // failed + HeapFree(GetProcessHeap(), 0, pCmdLine); + return; + } + + pStr = wcstok(pCmdLine, L",\t\""); + Index = 0; + do + { + if (pStr == NULL) + { + // invalid parameter + HeapFree(GetProcessHeap(), 0, pCmdLine); + return; + } + + hResult = IIDFromString(pStr, &Guids[Index]); + if (hResult != S_OK) + { + // invalid parameter + HeapFree(GetProcessHeap(), 0, pCmdLine); + return; + } + + Index++; + pStr = wcstok(NULL, L",\t\""); + + + }while(Index < 2); + + + hResult = InstallSoftwareDeviceInterface(&Guids[0], &Guids[1], pStr); + + // FIXME + // install inf section + +} Propchange: trunk/reactos/dll/win32/streamci/streamci.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/streamci/streamci.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/streamc… ============================================================================== --- trunk/reactos/dll/win32/streamci/streamci.rc (added) +++ trunk/reactos/dll/win32/streamci/streamci.rc [iso-8859-1] Sat Feb 21 10:09:36 2015 @@ -0,0 +1,18 @@ +#define WIN32_NO_STATUS +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Streaming Device Class Installer" +#define REACTOS_STR_INTERNAL_NAME "streamci.dll" +#define REACTOS_STR_ORIGINAL_FILENAME "streamci.dll" +#define REACTOS_STR_PRODUCT_VERSION "5.1.2600.3264" +#define REACTOS_STR_FILE_VERSION "5.1.2600.3264" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + Propchange: trunk/reactos/dll/win32/streamci/streamci.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/streamci/streamci.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/streamc… ============================================================================== --- trunk/reactos/dll/win32/streamci/streamci.spec (added) +++ trunk/reactos/dll/win32/streamci/streamci.spec [iso-8859-1] Sat Feb 21 10:09:36 2015 @@ -0,0 +1 @@ +7 stdcall StreamingDeviceSetupW(ptr ptr ptr long) Propchange: trunk/reactos/dll/win32/streamci/streamci.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 66378: [NTOS] - Mispelling + whitespace fixes. - Move the finalization of the boot logo display *before* we enable strings to be displayed (as on Windows), but *after* having increased t...
by hbelusca＠svn.reactos.org 21 Feb '15

21 Feb '15

Author: hbelusca Date: Sat Feb 21 01:25:47 2015 New Revision: 66378 URL: http://svn.reactos.org/svn/reactos?rev=66378&view=rev Log: [NTOS] - Mispelling + whitespace fixes. - Move the finalization of the boot logo display *before* we enable strings to be displayed (as on Windows), but *after* having increased the progress bar to 100% (contrary to Windows), so that we can display the progress bar at 100% without any problem and then do the correct transition: * either GUI splash-screen --> text-mode emulation console with product name in console header + footer (aka. SOS mode) * or SOS mode --> text-mode emulation without any graphics. Since it is done before starting SMSS, we can correctly display the strings it may output (or start other native apps) without fearing that after 5 seconds, the screen clears up in front of you. CORE-9112 #resolve #comment Fixed in r66378, thanks for reporting! Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/config.c trunk/reactos/ntoskrnl/lpc/close.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=663… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sat Feb 21 01:25:47 2015 @@ -526,7 +526,7 @@ (USHORT)Size); /* Append the DLL path to it */ - RtlAppendUnicodeToString(&Environment, L"Path=" ); + RtlAppendUnicodeToString(&Environment, L"Path="); RtlAppendUnicodeStringToString(&Environment, &ProcessParams->DllPath); RtlAppendUnicodeStringToString(&Environment, &NullString); @@ -1956,6 +1956,9 @@ /* Update progress bar */ InbvUpdateProgressBar(100); + /* Clear the screen */ + if (InbvBootDriverInstalled) FinalizeBootLogo(); + /* Allow strings to be displayed */ InbvEnableDisplayString(TRUE); @@ -1994,9 +1997,6 @@ &Size, MEM_RELEASE); - /* Clean the screen */ - if (InbvBootDriverInstalled) FinalizeBootLogo(); - /* Increase init phase */ ExpInitializationPhase++; Modified: trunk/reactos/ntoskrnl/ke/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/config.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ke/config.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/config.c [iso-8859-1] Sat Feb 21 01:25:47 2015 @@ -122,6 +122,6 @@ Child = Child->Child; } - /* If we got here, nothign was found */ + /* If we got here, nothing was found */ return NULL; } Modified: trunk/reactos/ntoskrnl/lpc/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/close.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] Sat Feb 21 01:25:47 2015 @@ -439,7 +439,7 @@ KeReleaseGuardedMutex(&LpcpLock); } - /* Check if this is a connection port with a server process*/ + /* Check if this is a connection port with a server process */ if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) && (ConnectionPort->ServerProcess)) {

1 0

[hbelusca] 66377: Fix MessageBox parameter value (handles ~= pointers --> NULL)
by hbelusca＠svn.reactos.org 20 Feb '15

20 Feb '15

Author: hbelusca Date: Fri Feb 20 23:52:48 2015 New Revision: 66377 URL: http://svn.reactos.org/svn/reactos?rev=66377&view=rev Log: Fix MessageBox parameter value (handles ~= pointers --> NULL) Modified: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c Modified: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c [iso-8859-1] Fri Feb 20 23:52:48 2015 @@ -490,7 +490,7 @@ Text, Caption, Severity, Type); /* Display a message box */ - MessageBoxResponse = MessageBoxW(0, Text, Caption, Type); + MessageBoxResponse = MessageBoxW(NULL, Text, Caption, Type); /* Return response value */ switch (MessageBoxResponse)

1 0

[hbelusca] 66376: [MC files] CORE-3655 #comment Hackfix the fact that when being compiled with GCC on Linux, compiled messages have their endlines encoded with LF instead of with CR-LF as required ...
by hbelusca＠svn.reactos.org 20 Feb '15

20 Feb '15

Author: hbelusca Date: Fri Feb 20 23:36:23 2015 New Revision: 66376 URL: http://svn.reactos.org/svn/reactos?rev=66376&view=rev Log: [MC files] CORE-3655 #comment Hackfix the fact that when being compiled with GCC on Linux, compiled messages have their endlines encoded with LF instead of with CR-LF as required by Windows compatibility. This should be normally fixed in windmc (the GCC/binutils message compiler); I've enough complained about that, but not directly to GCC/binutils team. Until they fix their tool, I ask SVN to always store the .mc files with CR-LF endlines. This should "fix" the problem. Suggestion by Thomas Faber. Modified: trunk/reactos/base/applications/rapps/rappsmsg.mc (contents, props changed) trunk/reactos/dll/win32/kernel32/winnls/lang/bg-BG.mc (contents, props changed) trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.mc (contents, props changed) trunk/reactos/dll/win32/kernel32/winnls/lang/pl-PL.mc (contents, props changed) trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.mc (contents, props changed) trunk/reactos/include/reactos/mc/bugcodes.mc (contents, props changed) trunk/reactos/include/reactos/mc/errcodes.mc (contents, props changed) trunk/reactos/include/reactos/mc/neteventmsg.mc (contents, props changed) trunk/reactos/include/reactos/mc/ntiologc.mc (contents, props changed) trunk/reactos/include/reactos/mc/ntstatus.mc (contents, props changed) trunk/reactos/include/reactos/mc/pciclass.mc (contents, props changed) trunk/reactos/include/reactos/mc/sacmsg.mc (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/rapps/rappsmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/bg-BG.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/pl-PL.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… Modified: trunk/reactos/include/reactos/mc/errcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/errcode… Modified: trunk/reactos/include/reactos/mc/neteventmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/neteven… Modified: trunk/reactos/include/reactos/mc/ntiologc.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntiolog… Modified: trunk/reactos/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntstatu… Modified: trunk/reactos/include/reactos/mc/pciclass.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/pciclas…

1 0

[hbelusca] 66375: [SMSS]: Improve some dprints (that prints strings; sometimes they happen to print empty strings for unknown reasons so I need to really check whether they are empty or not); remov...
by hbelusca＠svn.reactos.org 20 Feb '15

20 Feb '15

Author: hbelusca Date: Fri Feb 20 22:03:23 2015 New Revision: 66375 URL: http://svn.reactos.org/svn/reactos?rev=66375&view=rev Log: [SMSS]: Improve some dprints (that prints strings; sometimes they happen to print empty strings for unknown reasons so I need to really check whether they are empty or not); remove extra whitespace at the end of dprints. Initialize a variable. Modified: trunk/reactos/base/system/smss/pagefile.c trunk/reactos/base/system/smss/sminit.c Modified: trunk/reactos/base/system/smss/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/pagefile.… ============================================================================== --- trunk/reactos/base/system/smss/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/pagefile.c [iso-8859-1] Fri Feb 20 22:03:23 2015 @@ -101,7 +101,7 @@ } /* Parse the specified and get the name and arguments out of it */ - DPRINT("SMSS:PFILE: Paging file specifier `%wZ' \n", PageFileToken); + DPRINT("SMSS:PFILE: Paging file specifier `%wZ'\n", PageFileToken); Status = SmpParseCommandLine(PageFileToken, NULL, &PageFileName, @@ -216,7 +216,7 @@ /* This means no duplicates exist, so insert our descriptor! */ InsertTailList(&SmpPagingFileDescriptorList, &Descriptor->Entry); SmpNumberOfPagingFiles++; - DPRINT("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ') \n", + DPRINT("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ')\n", PageFileToken, &Descriptor->Name); return STATUS_SUCCESS; } @@ -228,7 +228,7 @@ !(Descriptor->Flags & SMP_PAGEFILE_ON_ANY_DRIVE)); /* We found a duplicate, so skip this descriptor/pagefile and fail */ - DPRINT1("SMSS:PFILE: Skipping duplicate specifier `%wZ' \n", PageFileToken); + DPRINT1("SMSS:PFILE: Skipping duplicate specifier `%wZ'\n", PageFileToken); RtlFreeUnicodeString(&PageFileName); RtlFreeHeap(RtlGetProcessHeap(), 0, Descriptor); return STATUS_INVALID_PARAMETER; @@ -268,7 +268,7 @@ FileStandardInformation); if (!NT_SUCCESS(Status)) { - DPRINT1("SMSS:PFILE: Failed query for size potential pagefile `%wZ' with status %X \n", + DPRINT1("SMSS:PFILE: Failed query for size potential pagefile `%wZ' with status %X\n", FileName, Status); NtClose(FileHandle); return Status; @@ -351,7 +351,7 @@ wcscpy(PathString, L"\\??\\A:\\"); RtlInitUnicodeString(&VolumeName, PathString); VolumeName.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = Volume->DriveLetter; - DPRINT("SMSS:PFILE: Querying volume `%wZ' for free space \n", &VolumeName); + DPRINT("SMSS:PFILE: Querying volume `%wZ' for free space\n", &VolumeName); /* Open the volume */ InitializeObjectAttributes(&ObjectAttributes, @@ -367,7 +367,7 @@ FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("SMSS:PFILE: Open volume `%wZ' failed with status %X \n", &VolumeName, Status); + DPRINT1("SMSS:PFILE: Open volume `%wZ' failed with status %X\n", &VolumeName, Status); return Status; } @@ -381,7 +381,7 @@ { /* We failed */ DPRINT1("SMSS:PFILE: Query volume `%wZ' (handle %p) for size failed" - " with status %X \n", + " with status %X\n", &VolumeName, VolumeHandle, Status); @@ -456,14 +456,14 @@ Status = NtCreatePagingFile(Name, MinSize, MaxSize, Priority); if (NT_SUCCESS(Status)) { - DPRINT("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n", + DPRINT("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded.\n", Name, MinSize->QuadPart, MaxSize->QuadPart); } else { - DPRINT1("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) failed with %X \n", + DPRINT1("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) failed with %X\n", Name, MinSize->QuadPart, MaxSize->QuadPart, @@ -492,7 +492,7 @@ if (!Volume) { /* Couldn't find it, fail */ - DPRINT1("SMSS:PFILE: No volume descriptor for `%wZ' \n", + DPRINT1("SMSS:PFILE: No volume descriptor for `%wZ'\n", &Descriptor->Name); return STATUS_INVALID_PARAMETER; } @@ -504,7 +504,7 @@ if (!(Descriptor->Flags & SMP_PAGEFILE_DUMP_PROCESSED)) { /* Try to find a crash dump and extract it */ - DPRINT("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume \n", + DPRINT("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume\n", &Descriptor->Name); SmpCheckForCrashDump(&Descriptor->Name); @@ -529,7 +529,7 @@ { /* Crashdumps can only be on the boot volume */ DPRINT("SMSS:PFILE: Skipping crash dump checking for `%wZ' on non boot" - "volume `%wC' \n", + "volume `%wC'\n", &Descriptor->Name, Volume->DriveLetter); } @@ -544,7 +544,7 @@ DPRINT("SMSS:PFILE: Detected size %I64X for future paging file `%wZ'\n", PageFileSize, &Descriptor->Name); - DPRINT("SMSS:PFILE: Free space on volume `%wC' is %I64X \n", + DPRINT("SMSS:PFILE: Free space on volume `%wC' is %I64X\n", Volume->DriveLetter, Volume->FreeSpace.QuadPart); @@ -558,7 +558,7 @@ { Descriptor->ActualMaxSize = PageFileSize; } - DPRINT("SMSS:PFILE: min %I64X, max %I64X, real min %I64X \n", + DPRINT("SMSS:PFILE: min %I64X, max %I64X, real min %I64X\n", Descriptor->ActualMinSize.QuadPart, Descriptor->ActualMaxSize.QuadPart, MinimumSize->QuadPart); @@ -595,7 +595,7 @@ /* FIXFIX: Windows Vista does this, and it seems like we should too, so try to see if this fixes KVM */ Volume->FreeSpace.QuadPart = PageFileSize.QuadPart; } - DPRINT1("SMSS:PFILE: Failing for min %I64X, max %I64X, real min %I64X \n", + DPRINT1("SMSS:PFILE: Failing for min %I64X, max %I64X, real min %I64X\n", Descriptor->ActualMinSize.QuadPart, Descriptor->ActualMaxSize.QuadPart, MinimumSize->QuadPart); @@ -670,7 +670,7 @@ if (!NT_SUCCESS(Status)) { /* If we failed, use defaults since we have no idea otherwise */ - DPRINT1("SMSS:PFILE: NtQuerySystemInformation failed with %x \n", Status); + DPRINT1("SMSS:PFILE: NtQuerySystemInformation failed with %x\n", Status); SmpMakeDefaultPagingFileDescriptor(Descriptor); return; } @@ -734,7 +734,7 @@ if (WasTooBig) { /* Notify debugger output and write a flag in the descriptor */ - DPRINT("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed \n", + DPRINT("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed\n", &Descriptor->Name); Descriptor->Flags |= SMP_PAGEFILE_WAS_TOO_BIG; } @@ -842,7 +842,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("SMSS:PFILE: Query(ProcessDeviceMap) failed with status %X \n", + DPRINT1("SMSS:PFILE: Query(ProcessDeviceMap) failed with status %X\n", Status); return Status; } @@ -874,7 +874,7 @@ if (!NT_SUCCESS(Status)) { /* Skip the volume if we failed */ - DPRINT1("SMSS:PFILE: Open volume `%wZ' failed with status %X \n", + DPRINT1("SMSS:PFILE: Open volume `%wZ' failed with status %X\n", &VolumePath, Status); continue; } @@ -889,7 +889,7 @@ { /* Move to the next volume if we failed */ DPRINT1("SMSS:PFILE: Query volume `%wZ' (handle %p) for device info" - " failed with status %X \n", + " failed with status %X\n", &VolumePath, VolumeHandle, Status); @@ -904,7 +904,7 @@ FILE_REMOVABLE_MEDIA)) { /* It isn't, so skip it */ - DPRINT1("SMSS:PFILE: Volume `%wZ' (%X) cannot store a paging file \n", + DPRINT1("SMSS:PFILE: Volume `%wZ' (%X) cannot store a paging file\n", &VolumePath, DeviceInfo.Characteristics); NtClose(VolumeHandle); @@ -918,7 +918,7 @@ if (!Volume) { /* Failed to allocate memory, try the next disk */ - DPRINT1("SMSS:PFILE: Failed to allocate a volume descriptor (%u bytes) \n", + DPRINT1("SMSS:PFILE: Failed to allocate a volume descriptor (%u bytes)\n", sizeof(SMP_VOLUME_DESCRIPTOR)); NtClose(VolumeHandle); continue; @@ -948,7 +948,7 @@ { /* We failed -- keep going */ DPRINT1("SMSS:PFILE: Query volume `%wZ' (handle %p) for size failed" - " with status %X \n", + " with status %X\n", &VolumePath, VolumeHandle, Status); @@ -981,7 +981,7 @@ /* All done, add this volume to our descriptor list */ InsertTailList(&SmpVolumeDescriptorList, &Volume->Entry); Volume->Flags |= SMP_VOLUME_INSERTED; - DPRINT("SMSS:PFILE: Created volume descriptor for`%wZ' \n", &VolumePath); + DPRINT("SMSS:PFILE: Created volume descriptor for`%wZ'\n", &VolumePath); } /* We must've found at least the boot volume */ @@ -1006,9 +1006,9 @@ /* Check if no paging files were requested */ if (!(SmpNumberOfPagingFiles) && !(SmpRegistrySpecifierPresent)) { - /* The list should be empty -- nothign to do */ + /* The list should be empty -- nothing to do */ ASSERT(IsListEmpty(&SmpPagingFileDescriptorList)); - DPRINT1("SMSS:PFILE: No paging file was requested \n"); + DPRINT1("SMSS:PFILE: No paging file was requested\n"); return STATUS_SUCCESS; } @@ -1040,7 +1040,7 @@ if (!NT_SUCCESS(Status)) { /* We failed -- try again, with size minimization this time */ - DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ') \n", + DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ')\n", &Descriptor->Name); Status = SmpCreateSystemManagedPagingFile(Descriptor, TRUE); } @@ -1051,7 +1051,7 @@ SmpValidatePagingFileSizes(Descriptor); /* Check if this is an ANY pagefile or a FIXED pagefile */ - DPRINT("SMSS:PFILE: Creating a normal paging file (`%wZ') \n", + DPRINT("SMSS:PFILE: Creating a normal paging file (`%wZ')\n", &Descriptor->Name); if (Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == L'?') { @@ -1063,7 +1063,7 @@ if (!NT_SUCCESS(Status)) { /* We failed to create it. Try again with a smaller size */ - DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ') \n", + DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ')\n", &Descriptor->Name); Size.QuadPart = 16 * MEGABYTE; Status = SmpCreatePagingFileOnAnyDrive(Descriptor, @@ -1090,7 +1090,7 @@ if (!Created) { /* Build an emergency pagefile ourselves */ - DPRINT1("SMSS:PFILE: Creating emergency paging file. \n"); + DPRINT1("SMSS:PFILE: Creating emergency paging file.\n"); Status = SmpCreateEmergencyPagingFile(); } Modified: trunk/reactos/base/system/smss/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/sminit.c?… ============================================================================== --- trunk/reactos/base/system/smss/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/sminit.c [iso-8859-1] Fri Feb 20 22:03:23 2015 @@ -104,8 +104,8 @@ /* A new entry -- allocate it */ RegEntry = RtlAllocateHeap(RtlGetProcessHeap(), SmBaseTag, - NameString.MaximumLength + - sizeof(SMP_REGISTRY_VALUE)); + sizeof(SMP_REGISTRY_VALUE) + + NameString.MaximumLength); if (!RegEntry) return STATUS_NO_MEMORY; /* Initialize the list and set all values to NULL */ @@ -355,15 +355,15 @@ IN PVOID EntryContext) { NTSTATUS Status; - static PWCHAR Canary; + static PWCHAR Canary = NULL; /* Check if this is the second call */ if (Canary) { /* Save the data into the list */ - DPRINT1("Renamed file: %S-%S\n", Canary, ValueData); + DPRINT1("Renamed file: '%S' - '%S'\n", Canary, ValueData); Status = SmpSaveRegistryValue(EntryContext, Canary, ValueData, FALSE); - Canary = 0; + Canary = NULL; } else { @@ -1994,7 +1994,7 @@ /* Get this entry */ NextEntry = RemoveHeadList(Head); RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("Processing PFRO: %wZ/%wZ\n", &RegEntry->Value, &RegEntry->Name); + DPRINT1("Processing PFRO: '%wZ' / '%wZ'\n", &RegEntry->Value, &RegEntry->Name); /* Skip past the '@' marker */ if (!(RegEntry->Value.Length) && (*RegEntry->Name.Buffer == L'@')) @@ -2077,7 +2077,7 @@ (Buffer->ReplaceIfExists))) { /* Open the file for write attribute access this time... */ - DPRINT1("\nSMSS: %wZ => %wZ failed - Status == %x, Possible readonly target\n", + DPRINT1("\nSMSS: '%wZ' => '%wZ' failed - Status == %x, Possible readonly target\n", &RegEntry->Name, &RegEntry->Value, STATUS_OBJECT_NAME_COLLISION); @@ -2150,18 +2150,18 @@ if (!NT_SUCCESS(Status)) { /* We totally failed */ - DPRINT1("SMSS: %wZ => %wZ failed - Status == %x\n", + DPRINT1("SMSS: '%wZ' => '%wZ' failed - Status == %x\n", &RegEntry->Name, &RegEntry->Value, Status); } else if (RegEntry->Value.Length) { /* We succeed with a rename */ - DPRINT1("SMSS: %wZ (renamed to) %wZ\n", &RegEntry->Name, &RegEntry->Value); + DPRINT1("SMSS: '%wZ' (renamed to) '%wZ'\n", &RegEntry->Name, &RegEntry->Value); } else { /* We suceeded with a delete */ - DPRINT1("SMSS: %wZ (deleted)\n", &RegEntry->Name); + DPRINT1("SMSS: '%wZ' (deleted)\n", &RegEntry->Name); } /* Now free this entry and keep going */

1 0

[tkreuzer] 66374: [WIN32K] Add back support for allocator stack backtraces for GDI objects and dump a list of BTs, when the GDI object table is exhausted. Disabled by default.
by tkreuzer＠svn.reactos.org 20 Feb '15

20 Feb '15

Author: tkreuzer Date: Fri Feb 20 21:25:10 2015 New Revision: 66374 URL: http://svn.reactos.org/svn/reactos?rev=66374&view=rev Log: [WIN32K] Add back support for allocator stack backtraces for GDI objects and dump a list of BTs, when the GDI object table is exhausted. Disabled by default. Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h trunk/reactos/win32ss/win32kp.h Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] Fri Feb 20 21:25:10 2015 @@ -15,6 +15,7 @@ extern ULONG gulFirstFree; extern ULONG gulFirstUnused; +extern PENTRY gpentHmgr;; ULONG gulLogUnique = 0; @@ -94,21 +95,64 @@ {L"UserWnd", DbgChUserWnd} }; -#ifdef GDI_DEBUG -#if 0 +ULONG +NTAPI +DbgCaptureStackBackTace( + _Out_writes_(cFramesToCapture) PVOID* ppvFrames, + _In_ ULONG cFramesToSkip, + _In_ ULONG cFramesToCapture) +{ + ULONG cFrameCount; + PVOID apvTemp[30]; + NT_ASSERT(cFramesToCapture <= _countof(apvTemp)); + + /* Zero it out */ + RtlZeroMemory(ppvFrames, cFramesToCapture * sizeof(PVOID)); + + /* Capture kernel stack */ + cFrameCount = RtlWalkFrameChain(apvTemp, _countof(apvTemp), 0); + + /* If we should skip more than we have, we are done */ + if (cFramesToSkip > cFrameCount) + return 0; + + /* Copy, but skip frames */ + cFrameCount -= cFramesToSkip; + cFrameCount = min(cFrameCount, cFramesToCapture); + RtlCopyMemory(ppvFrames, &apvTemp[cFramesToSkip], cFrameCount * sizeof(PVOID)); + + /* Check if there is still space left */ + if (cFrameCount < cFramesToCapture) + { + /* Capture user stack */ + cFrameCount += RtlWalkFrameChain(&ppvFrames[cFrameCount], + cFramesToCapture - cFrameCount, + 1); + } + + return cFrameCount; +} + +#if DBG_ENABLE_GDIOBJ_BACKTRACES + static BOOL -CompareBacktraces(ULONG idx1, ULONG idx2) -{ +CompareBacktraces( + USHORT idx1, + USHORT idx2) +{ + POBJ pobj1, pobj2; ULONG iLevel; + /* Get the objects */ + pobj1 = gpentHmgr[idx1].einfo.pobj; + pobj2 = gpentHmgr[idx2].einfo.pobj; + /* Loop all stack levels */ - for (iLevel = 0; iLevel < GDI_STACK_LEVELS; iLevel++) - { - if (GDIHandleAllocator[idx1][iLevel] - != GDIHandleAllocator[idx2][iLevel]) -// if (GDIHandleShareLocker[idx1][iLevel] -// != GDIHandleShareLocker[idx2][iLevel]) + for (iLevel = 0; iLevel < GDI_OBJECT_STACK_LEVELS; iLevel++) + { + /* If one level doesn't match we are done */ + if (pobj1->apvBackTrace[iLevel] != pobj2->apvBackTrace[iLevel]) { return FALSE; } @@ -117,22 +161,37 @@ return TRUE; } +typedef struct +{ + USHORT idx; + USHORT iCount; +} GDI_DBG_HANDLE_BT; + VOID NTAPI DbgDumpGdiHandleTableWithBT(void) { - static int leak_reported = 0; - int i, j, idx, nTraces = 0; + static BOOL bLeakReported = FALSE; + ULONG idx, j; + BOOL bAlreadyPresent; + GDI_DBG_HANDLE_BT aBacktraceTable[GDI_DBG_MAX_BTS]; + USHORT iCount; KIRQL OldIrql; - - if (leak_reported) + POBJ pobj; + ULONG iLevel, ulObj; + + /* Only report once */ + if (bLeakReported) { DPRINT1("GDI handle abusers already reported!\n"); return; } - leak_reported = 1; + bLeakReported = TRUE; DPRINT1("Reporting GDI handle abusers:\n"); + + /* Zero out the table */ + RtlZeroMemory(aBacktraceTable, sizeof(aBacktraceTable)); /* We've got serious business to do */ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); @@ -141,94 +200,84 @@ for (idx = RESERVE_ENTRIES_COUNT; idx < GDI_HANDLE_COUNT; idx++) { /* If the handle is free, continue */ - if (!IS_HANDLE_VALID(idx)) continue; - - /* Step through all previous backtraces */ - for (j = 0; j < nTraces; j++) - { - /* Check if the backtrace matches */ - if (CompareBacktraces(idx, AllocatorTable[j].idx)) + if (gpentHmgr[idx].einfo.pobj == 0) continue; + + /* Check if this backtrace is already covered */ + bAlreadyPresent = FALSE; + for (j = RESERVE_ENTRIES_COUNT; j < idx; j++) + { + if (CompareBacktraces(idx, j)) { - /* It matches, increment count and break out */ - AllocatorTable[j].count++; + bAlreadyPresent = TRUE; break; } } - /* Did we find a new backtrace? */ - if (j == nTraces) - { - /* Break out, if we reached the maximum */ - if (nTraces == MAX_BACKTRACES) break; - - /* Initialize this entry */ - AllocatorTable[j].idx = idx; - AllocatorTable[j].count = 1; - nTraces++; - } - } - - /* bubble sort time! weeeeee!! */ - for (i = 0; i < nTraces-1; i++) - { - if (AllocatorTable[i].count < AllocatorTable[i+1].count) - { - struct DbgOpenGDIHandle temp; - - temp = AllocatorTable[i+1]; - AllocatorTable[i+1] = AllocatorTable[i]; - j = i; - while (j > 0 && AllocatorTable[j-1].count < temp.count) - j--; - AllocatorTable[j] = temp; + if (bAlreadyPresent) continue; + + /* We don't have this BT yet, count how often it is present */ + iCount = 1; + for (j = idx + 1; j < GDI_HANDLE_COUNT; j++) + { + if (CompareBacktraces(idx, j)) + { + iCount++; + } + } + + /* Now add this backtrace */ + for (j = 0; j < GDI_DBG_MAX_BTS; j++) + { + /* Insert it below the next smaller count */ + if (aBacktraceTable[j].iCount < iCount) + { + /* Check if there are entries above */ + if (j < GDI_DBG_MAX_BTS - 1) + { + /* Move the following entries up by 1 */ + RtlMoveMemory(&aBacktraceTable[j], + &aBacktraceTable[j + 1], + GDI_DBG_MAX_BTS - j - 1); + } + + /* Set this entry */ + aBacktraceTable[j].idx = idx; + aBacktraceTable[j].iCount = iCount; + + /* We are done here */ + break; + } } } /* Print the worst offenders... */ - DbgPrint("Worst GDI Handle leak offenders (out of %i unique locations):\n", nTraces); - for (i = 0; i < nTraces && AllocatorTable[i].count > 1; i++) - { - /* Print out the allocation count */ - DbgPrint(" %i allocs, type = 0x%lx:\n", - AllocatorTable[i].count, - GdiHandleTable->Entries[AllocatorTable[i].idx].Type); - - /* Dump the frames */ - KeRosDumpStackFrames(GDIHandleAllocator[AllocatorTable[i].idx], GDI_STACK_LEVELS); - //KeRosDumpStackFrames(GDIHandleShareLocker[AllocatorTable[i].idx], GDI_STACK_LEVELS); - - /* Print new line for better readability */ + DbgPrint("Count Handle Backtrace\n"); + DbgPrint("------------------------------------------------\n"); + for (j = 0; j < GDI_DBG_MAX_BTS; j++) + { + idx = aBacktraceTable[j].idx; + if (idx == 0) + break; + + ulObj = ((ULONG)gpentHmgr[idx].FullUnique << 16) | idx; + pobj = gpentHmgr[idx].einfo.pobj; + + DbgPrint("%5d %08lx ", aBacktraceTable[j].iCount, ulObj); + for (iLevel = 0; iLevel < GDI_OBJECT_STACK_LEVELS; iLevel++) + { + DbgPrint("%p,", pobj->apvBackTrace[iLevel]); + } DbgPrint("\n"); } - if (i < nTraces) - DbgPrint("(List terminated - the remaining entries have 1 allocation only)\n"); + __debugbreak(); KeLowerIrql(OldIrql); - - ASSERT(FALSE); -} -#endif - -ULONG -NTAPI -DbgCaptureStackBackTace(PVOID* pFrames, ULONG nFramesToCapture) -{ - ULONG nFrameCount; - - memset(pFrames, 0x00, (nFramesToCapture + 1) * sizeof(PVOID)); - - nFrameCount = RtlWalkFrameChain(pFrames, nFramesToCapture, 0); - - if (nFrameCount < nFramesToCapture) - { - nFrameCount += RtlWalkFrameChain(pFrames + nFrameCount, - nFramesToCapture - nFrameCount, - 1); - } - - return nFrameCount; -} +} + +#endif /* DBG_ENABLE_GDIOBJ_BACKTRACES */ + +#if DBG BOOL NTAPI @@ -352,32 +401,10 @@ return r; } -#endif /* GDI_DEBUG */ - -VOID -NTAPI -DbgDumpLockedGdiHandles() -{ -#if 0 - ULONG i; - - for (i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT; i++) - { - PENTRY pentry = &gpentHmgr[i]; - - if (pentry->Objt) - { - POBJ pobj = pentry->einfo.pobj; - if (pobj->cExclusiveLock > 0) - { - DPRINT1("Locked object: %lx, type = %lx. allocated from:\n", - i, pentry->Objt); - DBG_DUMP_EVENT_LIST(&pobj->slhLog); - } - } - } -#endif -} +#endif /* DBG */ + + +#if DBG_ENABLE_EVENT_LOGGING VOID NTAPI @@ -400,7 +427,7 @@ pLogEntry->lParam = lParam; /* Capture a backtrace */ - DbgCaptureStackBackTace(pLogEntry->apvBackTrace, 20); + DbgCaptureStackBackTace(pLogEntry->apvBackTrace, 1, 20); switch (nEventType) { @@ -483,6 +510,33 @@ } } +#endif /* DBG_ENABLE_EVENT_LOGGING */ + +#if 1 || DBG_ENABLE_SERVICE_HOOKS + +VOID +NTAPI +DbgDumpLockedGdiHandles() +{ + ULONG i; + + for (i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT; i++) + { + PENTRY pentry = &gpentHmgr[i]; + + if (pentry->Objt) + { + POBJ pobj = pentry->einfo.pobj; + if (pobj->cExclusiveLock > 0) + { + DPRINT1("Locked object: %lx, type = %lx. allocated from:\n", + i, pentry->Objt); + DBG_DUMP_EVENT_LIST(&pobj->slhLog); + } + } + } +} + void NTAPI GdiDbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments) @@ -512,6 +566,9 @@ } return ulResult; } + +#endif /* DBG_ENABLE_SERVICE_HOOKS */ + NTSTATUS NTAPI QueryEnvironmentVariable(PUNICODE_STRING Name, Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidebug… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] Fri Feb 20 21:25:10 2015 @@ -1,4 +1,61 @@ #pragma once + +#define GDI_DBG_MAX_BTS 10 + +#if DBG +#define ASSERT_NOGDILOCKS() GdiDbgAssertNoLocks(__FILE__,__LINE__) +#define KeRosDumpStackFrames(Frames, Count) \ + KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) +#else +#define ASSERT_NOGDILOCKS() +#define KeRosDumpStackFrames(Frames, Count) +#endif + +NTSYSAPI +ULONG +APIENTRY +RtlWalkFrameChain( + _Out_ PVOID *Callers, + _In_ ULONG Count, + _In_ ULONG Flags); + +ULONG +NTAPI +DbgCaptureStackBackTace( + _Out_writes_(cFramesToCapture) PVOID* ppvFrames, + _In_ ULONG cFramesToSkip, + _In_ ULONG cFramesToCapture); + +BOOL +NTAPI +DbgGdiHTIntegrityCheck( + VOID); + +VOID +NTAPI +DbgDumpLockedGdiHandles( + VOID); + +#if DBG_ENABLE_GDIOBJ_BACKTRACES + +VOID +NTAPI +DbgDumpGdiHandleTableWithBT(VOID); + +#endif + +#if KDBG + +BOOLEAN +NTAPI +DbgGdiKdbgCliCallback( + _In_ PCHAR Command, + _In_ ULONG Argc, + _In_ PCH Argv[]); + +#endif + +#if DBG_ENABLE_EVENT_LOGGING typedef enum _LOG_EVENT_TYPE { @@ -28,39 +85,41 @@ } data; } LOGENTRY, *PLOGENTRY; -#if KDBG -BOOLEAN +VOID NTAPI -DbgGdiKdbgCliCallback( - IN PCHAR Command, - IN ULONG Argc, - IN PCH Argv[]); -#endif +DbgDumpEventList( + _Inout_ PSLIST_HEADER pslh); -#if DBG_ENABLE_EVENT_LOGGING -VOID NTAPI DbgDumpEventList(PSLIST_HEADER pslh); -VOID NTAPI DbgLogEvent(PSLIST_HEADER pslh, LOG_EVENT_TYPE nEventType, LPARAM lParam); -VOID NTAPI DbgCleanupEventList(PSLIST_HEADER pslh); -VOID NTAPI DbgPrintEvent(PLOGENTRY pLogEntry); +VOID +NTAPI +DbgLogEvent( + _Inout_ PSLIST_HEADER pslh, + _In_ LOG_EVENT_TYPE nEventType, + _In_ LPARAM lParam); + +VOID +NTAPI +DbgCleanupEventList( + _Inout_ PSLIST_HEADER pslh); + +VOID +NTAPI +DbgPrintEvent( + _Inout_ PLOGENTRY pLogEntry); + #define DBG_LOGEVENT(pslh, type, val) DbgLogEvent(pslh, type, (ULONG_PTR)val) #define DBG_INITLOG(pslh) InitializeSListHead(pslh) #define DBG_DUMP_EVENT_LIST(pslh) DbgDumpEventList(pslh) #define DBG_CLEANUP_EVENT_LIST(pslh) DbgCleanupEventList(pslh) + #else + #define DBG_LOGEVENT(pslh, type, val) ((void)(val)) #define DBG_INITLOG(pslh) #define DBG_DUMP_EVENT_LIST(pslh) #define DBG_CLEANUP_EVENT_LIST(pslh) + #endif - - -VOID NTAPI DbgDumpGdiHandleTableWithBT(VOID); -ULONG NTAPI DbgCaptureStackBackTace(PVOID* pFrames, ULONG nFramesToCapture); -BOOL NTAPI DbgGdiHTIntegrityCheck(VOID); -VOID NTAPI DbgDumpLockedGdiHandles(VOID); - -#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) -NTSYSAPI ULONG APIENTRY RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); #if DBG void @@ -88,9 +147,6 @@ ASSERT(FALSE); } } - -#define ASSERT_NOGDILOCKS() GdiDbgAssertNoLocks(__FILE__,__LINE__) -#else -#define ASSERT_NOGDILOCKS() #endif + Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Fri Feb 20 21:25:10 2015 @@ -339,6 +339,10 @@ if (iFirst >= GDI_HANDLE_COUNT) { DPRINT1("No more GDI handles left!\n"); +#if DBG_ENABLE_GDIOBJ_BACKTRACES + DbgDumpGdiHandleTableWithBT(); +#endif + InterlockedDecrement((LONG*)&gulFirstUnused); return 0; } @@ -350,7 +354,7 @@ pentFree = &gpentHmgr[iFirst & GDI_HANDLE_INDEX_MASK]; /* Create a new value with an increased sequence number */ - iNext = (USHORT)(ULONG_PTR)pentFree->einfo.pobj; + iNext = GDI_HANDLE_GET_INDEX(pentFree->einfo.hFree); iNext |= (iFirst & ~GDI_HANDLE_INDEX_MASK) + 0x10000; /* Try to exchange the FirstFree value */ @@ -516,6 +520,9 @@ pobj->BaseFlags = fl & 0xffff; DBG_INITLOG(&pobj->slhLog); DBG_LOGEVENT(&pobj->slhLog, EVENT_ALLOCATE, 0); +#if DBG_ENABLE_GDIOBJ_BACKTRACES + DbgCaptureStackBackTace(pobj->apvBackTrace, 1, GDI_OBJECT_STACK_LEVELS); +#endif /* GDI_DEBUG */ return pobj; } @@ -1497,9 +1504,7 @@ } #if DBG -//#ifdef GDI_DEBUG - DbgGdiHTIntegrityCheck(); -//#endif + DbgGdiHTIntegrityCheck(); #endif ppi = PsGetCurrentProcessWin32Process(); Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Fri Feb 20 21:25:10 2015 @@ -4,6 +4,8 @@ */ #pragma once + +#define GDI_OBJECT_STACK_LEVELS 10 /* The first 10 entries are never used in windows, they are empty */ static const unsigned RESERVE_ENTRIES_COUNT = 10; @@ -42,6 +44,9 @@ USHORT cExclusiveLock; USHORT BaseFlags; EX_PUSH_LOCK pushlock; +#if DBG_ENABLE_GDIOBJ_BACKTRACES + PVOID apvBackTrace[GDI_OBJECT_STACK_LEVELS]; +#endif #if DBG_ENABLE_EVENT_LOGGING SLIST_HEADER slhLog; #endif Modified: trunk/reactos/win32ss/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/win32kp.h?rev=6637… ============================================================================== --- trunk/reactos/win32ss/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/win32kp.h [iso-8859-1] Fri Feb 20 21:25:10 2015 @@ -23,6 +23,7 @@ /* Enable debugging features */ #define GDI_DEBUG 0 +#define DBG_ENABLE_GDIOBJ_BACKTRACES 0 #define DBG_ENABLE_EVENT_LOGGING 0 #define DBG_ENABLE_SERVICE_HOOKS 0

1 0

[hbelusca] 66373: [EXPLORER]: Activate Logoff command. Patch by Lee Schroeder plus extra modifs. CORE-9104 #resolve
by hbelusca＠svn.reactos.org 20 Feb '15

20 Feb '15

Author: hbelusca Date: Fri Feb 20 20:08:52 2015 New Revision: 66373 URL: http://svn.reactos.org/svn/reactos?rev=66373&view=rev Log: [EXPLORER]: Activate Logoff command. Patch by Lee Schroeder plus extra modifs. CORE-9104 #resolve Modified: trunk/reactos/base/shell/explorer/traywnd.cpp trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/include/reactos/undocshell.h Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Fri Feb 20 20:08:52 2015 @@ -2622,8 +2622,8 @@ LRESULT OnDoExitWindows(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { /* - * TWM_DOEXITWINDOWS is send by the CDesktopBrowserr to us to - * show the shutdown dialog + * TWM_DOEXITWINDOWS is send by the CDesktopBrowser to us + * to show the shutdown dialog. */ return DoExitWindows(); } @@ -2717,7 +2717,6 @@ { switch (LOWORD(wParam)) { - /* FIXME: Handle these commands as well */ case IDM_TASKBARANDSTARTMENU: DisplayProperties(); break; @@ -2734,11 +2733,14 @@ DisplayRunFileDlg(); break; - /* FIXME: Handle these commands as well */ + /* FIXME: Handle these commands as well */ case IDM_SYNCHRONIZE: - case IDM_LOGOFF: case IDM_DISCONNECT: case IDM_UNDOCKCOMPUTER: + break; + + case IDM_LOGOFF: + LogoffWindowsDialog(m_hWnd); // FIXME: Maybe handle it in a similar way as DoExitWindows? break; case IDM_SHUTDOWN: 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] Fri Feb 20 20:08:52 2015 @@ -1841,6 +1841,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ListviewShadow",0x00010001,0x00000001 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","HideFileExt",0x00010001,0x00000000 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","StartMenuLogoff",0x00010001,0x00000001 ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 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] Fri Feb 20 20:08:52 2015 @@ -112,7 +112,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\ShellServiceObjectDelayLoad",,0x00000012 -; FIXME - usetup doesn't handle extra paths +; FIXME - Setup doesn't handle extra paths HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd /c md ""%programfiles%\Internet Explorer\"" && move %windir%\iexplore.exe ""%programfiles%\Internet Explorer\"" && ""%programfiles%\Internet Explorer\iexplore.exe"" /RegServer" ; Create .NET Framework InstallRoot key, reg_sz & full path HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd /c reg add HKLM\SOFTWARE\Microsoft\.NETFramework /v InstallRoot /t REG_SZ /d %SystemRoot%\Microsoft.NET\Framework\" Modified: trunk/reactos/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocshell… ============================================================================== --- trunk/reactos/include/reactos/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocshell.h [iso-8859-1] Fri Feb 20 20:08:52 2015 @@ -123,6 +123,7 @@ LPCWSTR lpstrDescription, UINT uFlags); +int WINAPI LogoffWindowsDialog(HWND hwndOwner); void WINAPI ExitWindowsDialog(HWND hwndOwner); BOOL WINAPI SHFindComputer(

1 0

[hbelusca] 66372: Move explorer_old to the rosapps. CORE-9198 #resolve
by hbelusca＠svn.reactos.org 20 Feb '15

20 Feb '15

Author: hbelusca Date: Fri Feb 20 14:54:05 2015 New Revision: 66372 URL: http://svn.reactos.org/svn/reactos?rev=66372&view=rev Log: Move explorer_old to the rosapps. CORE-9198 #resolve Added: trunk/rosapps/applications/explorer-old/ - copied from r66369, trunk/reactos/base/shell/explorer-old/ Removed: trunk/reactos/base/shell/explorer-old/ Modified: trunk/reactos/base/shell/CMakeLists.txt trunk/rosapps/applications/CMakeLists.txt Modified: trunk/reactos/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/CMakeLists.txt?… ============================================================================== --- trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] Fri Feb 20 14:54:05 2015 @@ -1,6 +1,5 @@ add_subdirectory(cmd) add_subdirectory(explorer) -add_subdirectory(explorer-old) add_subdirectory(filebrowser) add_subdirectory(rshell) Modified: trunk/rosapps/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/CMakeLists.tx… ============================================================================== --- trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] Fri Feb 20 14:54:05 2015 @@ -1,5 +1,6 @@ add_subdirectory(cmdutils) add_subdirectory(devutils) +add_subdirectory(explorer-old) #add_subdirectory(fraginator) add_subdirectory(imagesoft) #add_subdirectory(net)

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