Ros-diffs October 2012

ros-diffs@reactos.org

14 participants
211 discussions

[hbelusca] 57631: Try to update properties.
by hbelusca＠svn.reactos.org 28 Oct '12

28 Oct '12

Author: hbelusca Date: Sun Oct 28 10:15:26 2012 New Revision: 57631 URL: http://svn.reactos.org/svn/reactos?rev=57631&view=rev Log: Try to update properties. Modified: branches/ros-csrss/ (props changed) Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 28 10:15:26 2012 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-57629 +/trunk/reactos:57561-57630

1 0

[hbelusca] 57630: Synchronize with trunk's revision r57629.
by hbelusca＠svn.reactos.org 28 Oct '12

28 Oct '12

Author: hbelusca Date: Sun Oct 28 10:05:08 2012 New Revision: 57630 URL: http://svn.reactos.org/svn/reactos?rev=57630&view=rev Log: Synchronize with trunk's revision r57629. Added: branches/ros-csrss/dll/opengl/glu32/ - copied from r57629, trunk/reactos/dll/opengl/glu32/ Removed: branches/ros-csrss/dll/opengl/mesa/src/glu/ Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt branches/ros-csrss/configure.sh branches/ros-csrss/dll/3rdparty/libjpeg/CMakeLists.txt branches/ros-csrss/dll/3rdparty/libpng/CMakeLists.txt branches/ros-csrss/dll/3rdparty/libtiff/CMakeLists.txt branches/ros-csrss/dll/3rdparty/libxslt/CMakeLists.txt branches/ros-csrss/dll/opengl/CMakeLists.txt branches/ros-csrss/dll/opengl/mesa/src/CMakeLists.txt branches/ros-csrss/dll/win32/advapi32/misc/logon.c branches/ros-csrss/dll/win32/samsrv/database.c branches/ros-csrss/dll/win32/samsrv/samrpc.c branches/ros-csrss/dll/win32/samsrv/setup.c branches/ros-csrss/dll/win32/shell32/iconcache.cpp branches/ros-csrss/drivers/hid/mouhid/mouhid.c branches/ros-csrss/drivers/usb/usbhub/ (props changed) branches/ros-csrss/drivers/usb/usbhub/fdo.c branches/ros-csrss/drivers/usb/usbhub/usbhub.c branches/ros-csrss/drivers/usb/usbhub/usbhub.h branches/ros-csrss/drivers/usb/usbstor/disk.c branches/ros-csrss/lib/drivers/hidparser/api.c branches/ros-csrss/ntoskrnl/po/power.c branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/user/ntuser/main.c branches/ros-csrss/win32ss/user/ntuser/ntuser.h branches/ros-csrss/win32ss/user/ntuser/object.c branches/ros-csrss/win32ss/user/ntuser/object.h branches/ros-csrss/win32ss/user/ntuser/win32.h branches/ros-csrss/win32ss/user/ntuser/win32kdebug.h Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 28 10:05:08 2012 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-57599 +/trunk/reactos:57561-57629 Modified: branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… ============================================================================== --- branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -1,7 +1,8 @@ if(SEPARATE_DBG) # FIXME: http://sourceware.org/bugzilla/show_bug.cgi?id=11822 - set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + set(CMAKE_LDR_PE_HELPER_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + set(CMAKE_LDR_PE_HELPER_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") endif() spec2def(freeldr.sys freeldr.spec) @@ -171,6 +172,10 @@ if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) + if(SEPARATE_DBG) + set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + set_target_properties(freeldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + endif() else() add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) @@ -231,6 +236,10 @@ if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) + if(SEPARATE_DBG) + set_target_properties(setupldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + set_target_properties(setupldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + endif() else() add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) Modified: branches/ros-csrss/configure.sh URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/configure.sh?rev=5763… ============================================================================== --- branches/ros-csrss/configure.sh [iso-8859-1] (original) +++ branches/ros-csrss/configure.sh [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -9,6 +9,11 @@ ARCH=$ROS_ARCH REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH +if [ "$1" = "ninja" ]; then +CMAKE_GENERATOR="Ninja" +else +CMAKE_GENERATOR="Unix Makefiles" +fi if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then echo Creating directories in $REACTOS_OUTPUT_PATH @@ -23,12 +28,12 @@ rm -f CMakeCache.txt REACTOS_BUILD_TOOLS_DIR="$PWD" -cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" echo Preparing reactos... cd ../reactos rm -f CMakeCache.txt -cmake -G "Unix Makefiles" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" echo Configure script complete! Enter directories and execute appropriate build commands$ex: make, makex, etc...$. Modified: branches/ros-csrss/dll/3rdparty/libjpeg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/3rdparty/libjpeg/… ============================================================================== --- branches/ros-csrss/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -58,7 +58,7 @@ jmemmgr.c jmemnobs.c) -set_entrypoint(libjpeg 0) +set_module_type(libjpeg win32dll) add_importlibs(libjpeg msvcrt kernel32) add_dependencies(libjpeg psdk) add_cd_file(TARGET libjpeg DESTINATION reactos/system32 FOR all) Modified: branches/ros-csrss/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/3rdparty/libpng/C… ============================================================================== --- branches/ros-csrss/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -26,7 +26,7 @@ pngwtran.c pngwutil.c) -set_entrypoint(libpng 0) +set_module_type(libpng win32dll) target_link_libraries(libpng zlib) add_importlibs(libpng msvcrt kernel32 ntdll) add_dependencies(libpng psdk) Modified: branches/ros-csrss/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/3rdparty/libtiff/… ============================================================================== --- branches/ros-csrss/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -50,7 +50,7 @@ tif_write.c tif_zip.c) -set_module_type(libtiff win32dll ENTRYPOINT 0) +set_module_type(libtiff win32dll) target_link_libraries(libtiff zlib getopt) add_importlibs(libtiff user32 msvcrt kernel32 ntdll) add_dependencies(libtiff psdk) Modified: branches/ros-csrss/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/3rdparty/libxslt/… ============================================================================== --- branches/ros-csrss/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -33,7 +33,7 @@ xsltlocale.c xsltutils.c) -set_module_type(libxslt win32dll ENTRYPOINT 0) +set_module_type(libxslt win32dll) target_link_libraries(libxslt libxml2) add_importlibs(libxslt msvcrt ws2_32 kernel32) Modified: branches/ros-csrss/dll/opengl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/CMakeLists… ============================================================================== --- branches/ros-csrss/dll/opengl/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/dll/opengl/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -1,2 +1,3 @@ +add_subdirectory(glu32) add_subdirectory(mesa) -add_subdirectory(opengl32) +add_subdirectory(opengl32) Modified: branches/ros-csrss/dll/opengl/mesa/src/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/mesa/src/C… ============================================================================== --- branches/ros-csrss/dll/opengl/mesa/src/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/dll/opengl/mesa/src/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -1,6 +1,5 @@ add_subdirectory(gallium) add_subdirectory(glsl) -add_subdirectory(glu/sgi) add_subdirectory(mapi/glapi) -add_subdirectory(mesa) +add_subdirectory(mesa) Modified: branches/ros-csrss/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/advapi32/mi… ============================================================================== --- branches/ros-csrss/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/advapi32/misc/logon.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -310,53 +310,72 @@ GetUserSid(LPCWSTR UserName, PSID *Sid) { - PSID AccountDomainSid = NULL; - ULONG ulUserRid; - DWORD dwLength; - HKEY hNamesKey = NULL; - BOOL bResult = TRUE; - - if (!GetAccountDomainSid(&AccountDomainSid)) - { - return FALSE; - } - - /* Open the Users\Names key */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SAM\\SAM\\Domains\\Account\\Users\\Names", - 0, - KEY_READ, - &hNamesKey)) - { - ERR("Failed to open Users\\Names key! (Error %lu)\n", GetLastError()); - bResult = FALSE; + PSID SidBuffer = NULL; + PWSTR DomainBuffer = NULL; + DWORD cbSidSize = 0; + DWORD cchDomSize = 0; + SID_NAME_USE Use; + BOOL res = TRUE; + + *Sid = NULL; + + LookupAccountNameW(NULL, + UserName, + NULL, + &cbSidSize, + NULL, + &cchDomSize, + &Use); + + if (cbSidSize == 0 || cchDomSize == 0) + return FALSE; + + SidBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + cbSidSize); + if (SidBuffer == NULL) + return FALSE; + + DomainBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + cchDomSize * sizeof(WCHAR)); + if (DomainBuffer == NULL) + { + res = FALSE; goto done; } - /* Read the user RID */ - dwLength = sizeof(ULONG); - if (RegQueryValueExW(hNamesKey, - UserName, - NULL, - NULL, - (LPBYTE)&ulUserRid, - &dwLength)) - { - ERR("Failed to read the SID! (Error %ld)\n", GetLastError()); - bResult = FALSE; + if (!LookupAccountNameW(NULL, + UserName, + SidBuffer, + &cbSidSize, + DomainBuffer, + &cchDomSize, + &Use)) + { + res = FALSE; goto done; } - *Sid = AppendRidToSid(AccountDomainSid, ulUserRid); + if (Use != SidTypeUser) + { + res = FALSE; + goto done; + } + + *Sid = SidBuffer; done: - if (hNamesKey != NULL) - RegCloseKey(hNamesKey); - - if (AccountDomainSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid); - - return bResult; + if (DomainBuffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainBuffer); + + if (res == FALSE) + { + if (SidBuffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, SidBuffer); + } + + return res; } @@ -593,8 +612,8 @@ TOKEN_USER TokenUser; TOKEN_OWNER TokenOwner; TOKEN_PRIMARY_GROUP TokenPrimaryGroup; - PTOKEN_GROUPS TokenGroups; - PTOKEN_PRIVILEGES TokenPrivileges; + PTOKEN_GROUPS TokenGroups = NULL; + PTOKEN_PRIVILEGES TokenPrivileges = NULL; TOKEN_DEFAULT_DACL TokenDefaultDacl; LARGE_INTEGER ExpirationTime; LUID AuthenticationId; @@ -603,10 +622,10 @@ PSID PrimaryGroupSid = NULL; PSID OwnerSid = NULL; PSID LocalSystemSid; - PACL Dacl; - NTSTATUS Status; + PACL Dacl = NULL; SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; unsigned i; + NTSTATUS Status = STATUS_SUCCESS; Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); Qos.ImpersonationLevel = SecurityAnonymous; @@ -641,11 +660,10 @@ /* Allocate and initialize token groups */ TokenGroups = AllocateGroupSids(&PrimaryGroupSid, &OwnerSid); - if (NULL == TokenGroups) - { - RtlFreeSid(UserSid); - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + if (TokenGroups == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; } /* Allocate and initialize token privileges */ @@ -653,12 +671,10 @@ sizeof(TOKEN_PRIVILEGES) + sizeof(DefaultPrivs) / sizeof(DefaultPrivs[0]) * sizeof(LUID_AND_ATTRIBUTES)); - if (NULL == TokenPrivileges) - { - FreeGroupSids(TokenGroups); - RtlFreeSid(UserSid); - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + if (TokenPrivileges == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; } TokenPrivileges->PrivilegeCount = 0; @@ -683,21 +699,13 @@ Dacl = RtlAllocateHeap(GetProcessHeap(), 0, 1024); if (Dacl == NULL) { - FreeGroupSids(TokenGroups); - RtlFreeSid(UserSid); - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; } Status = RtlCreateAcl(Dacl, 1024, ACL_REVISION); if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(GetProcessHeap(), 0, Dacl); - FreeGroupSids(TokenGroups); - RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges); - RtlFreeSid(UserSid); - return FALSE; - } + goto done; RtlAddAccessAllowedAce(Dacl, ACL_REVISION, @@ -754,10 +762,18 @@ &TokenDefaultDacl, &TokenSource); - RtlFreeHeap(GetProcessHeap(), 0, Dacl); - FreeGroupSids(TokenGroups); - RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges); - RtlFreeSid(UserSid); +done: + if (Dacl != NULL) + RtlFreeHeap(GetProcessHeap(), 0, Dacl); + + if (TokenGroups != NULL) + FreeGroupSids(TokenGroups); + + if (TokenPrivileges != NULL) + RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges); + + if (UserSid != NULL) + RtlFreeHeap(GetProcessHeap(), 0, UserSid); return NT_SUCCESS(Status); } Modified: branches/ros-csrss/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/data… ============================================================================== --- branches/ros-csrss/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/samsrv/database.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -764,8 +764,8 @@ goto done; } - String->Length = Length - sizeof(WCHAR); - String->MaximumLength = Length; + String->Length = (USHORT)(Length - sizeof(WCHAR)); + String->MaximumLength = (USHORT)Length; String->Buffer = midl_user_allocate(Length); if (String->Buffer == NULL) { Modified: branches/ros-csrss/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/samr… ============================================================================== --- branches/ros-csrss/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -16,6 +16,7 @@ /* GLOBALS ********************************************************************/ static SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; + /* FUNCTIONS ***************************************************************/ @@ -3051,6 +3052,8 @@ Use->Count = 0; } + TRACE("Returned Status %lx\n", Status); + return Status; } @@ -3145,8 +3148,8 @@ if (NT_SUCCESS(Status)) { - Names->Element[i].MaximumLength = DataLength; - Names->Element[i].Length = DataLength - sizeof(WCHAR); + Names->Element[i].MaximumLength = (USHORT)DataLength; + Names->Element[i].Length = (USHORT)(DataLength - sizeof(WCHAR)); Status = SampRegQueryValue(AccountKeyHandle, L"Name", @@ -3201,8 +3204,8 @@ if (NT_SUCCESS(Status)) { - Names->Element[i].MaximumLength = DataLength; - Names->Element[i].Length = DataLength - sizeof(WCHAR); + Names->Element[i].MaximumLength = (USHORT)DataLength; + Names->Element[i].Length = (USHORT)(DataLength - sizeof(WCHAR)); Status = SampRegQueryValue(AccountKeyHandle, L"Name", @@ -3259,8 +3262,8 @@ if (NT_SUCCESS(Status)) { - Names->Element[i].MaximumLength = DataLength; - Names->Element[i].Length = DataLength - sizeof(WCHAR); + Names->Element[i].MaximumLength = (USHORT)DataLength; + Names->Element[i].Length = (USHORT)(DataLength - sizeof(WCHAR)); Status = SampRegQueryValue(AccountKeyHandle, L"Name", @@ -4319,6 +4322,7 @@ return Status; } + /* Function 34 */ NTSTATUS NTAPI @@ -4366,6 +4370,7 @@ return STATUS_SUCCESS; } + /* Function 35 */ NTSTATUS @@ -4676,8 +4681,6 @@ return Status; } - - static @@ -6283,6 +6286,7 @@ return Status; } + /* Function 51 */ NTSTATUS NTAPI @@ -6299,15 +6303,34 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 52 */ NTSTATUS NTAPI SamrAddMultipleMembersToAlias(IN SAMPR_HANDLE AliasHandle, IN PSAMPR_PSID_ARRAY MembersBuffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + ULONG i; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("SamrAddMultipleMembersToAlias(%p %p)\n", + AliasHandle, MembersBuffer); + + for (i = 0; i < MembersBuffer->Count; i++) + { + Status = SamrAddMemberToAlias(AliasHandle, + ((PSID *)MembersBuffer->Sids)[i]); + + if (Status == STATUS_MEMBER_IN_ALIAS) + Status = STATUS_SUCCESS; + + if (!NT_SUCCESS(Status)) + break; + } + + return Status; +} + /* Function 53 */ NTSTATUS Modified: branches/ros-csrss/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/setu… ============================================================================== --- branches/ros-csrss/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/samsrv/setup.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -224,6 +224,7 @@ ULONG ulRelativeId) { SAM_USER_FIXED_DATA FixedUserData; + LPWSTR lpEmptyString = L""; DWORD dwDisposition; WCHAR szAccountKeyName[32]; HKEY hAccountKey = NULL; @@ -260,6 +261,62 @@ REG_SZ, (LPVOID)lpAccountName, (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"FullName", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"HomeDirectory", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"HomeDirectoryDrive", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"ScriptPath", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"ProfilePath", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"AdminComment", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"UserComment", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"WorkStations", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); RegCloseKey(hAccountKey); } Modified: branches/ros-csrss/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/ico… ============================================================================== --- branches/ros-csrss/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/shell32/iconcache.cpp [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -323,7 +323,7 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallIcon, HICON hBigIcon, DWORD dwFlags) { LPSIC_ENTRY lpsice; - INT ret, index, index1; + INT ret, index, index1, indexDPA; WCHAR path[MAX_PATH]; TRACE("%s %i %p %p\n", debugstr_w(sSourceFile), dwSourceIndex, hSmallIcon ,hBigIcon); @@ -338,8 +338,8 @@ EnterCriticalSection(&SHELL32_SicCS); - index = DPA_InsertPtr(sic_hdpa, 0x7fff, lpsice); - if ( INVALID_INDEX == index ) + indexDPA = DPA_InsertPtr(sic_hdpa, 0x7fff, lpsice); + if ( -1 == indexDPA ) { ret = INVALID_INDEX; goto leave; @@ -370,6 +370,7 @@ leave: if(ret == INVALID_INDEX) { + if(indexDPA != -1) DPA_DeletePtr(sic_hdpa, indexDPA); HeapFree(GetProcessHeap(), 0, lpsice->sSourceFile); SHFree(lpsice); } Modified: branches/ros-csrss/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/hid/mouhid/mo… ============================================================================== --- branches/ros-csrss/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/ros-csrss/drivers/hid/mouhid/mouhid.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -92,7 +92,8 @@ VOID MouHid_GetButtonFlags( IN PMOUHID_DEVICE_EXTENSION DeviceExtension, - OUT PUSHORT ButtonFlags) + OUT PUSHORT ButtonFlags, + OUT PUSHORT Flags) { NTSTATUS Status; USAGE Usage; @@ -102,6 +103,7 @@ /* init flags */ *ButtonFlags = 0; + *Flags = 0; /* get usages */ CurrentUsageListLength = DeviceExtension->UsageListLength; @@ -170,7 +172,7 @@ if (DeviceExtension->MouseAbsolute) { // mouse operates absolute - *ButtonFlags |= MOUSE_MOVE_ABSOLUTE; + *Flags |= MOUSE_MOVE_ABSOLUTE; } } @@ -212,6 +214,7 @@ NTSTATUS Status; LONG LastX, LastY; MOUSE_INPUT_DATA MouseInputData; + USHORT Flags; /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)Context; @@ -239,13 +242,14 @@ MouHid_GetButtonMove(DeviceExtension, &LastX, &LastY); /* get mouse change flags */ - MouHid_GetButtonFlags(DeviceExtension, &ButtonFlags); + MouHid_GetButtonFlags(DeviceExtension, &ButtonFlags, &Flags); /* init input data */ RtlZeroMemory(&MouseInputData, sizeof(MOUSE_INPUT_DATA)); /* init input data */ MouseInputData.ButtonFlags = ButtonFlags; + MouseInputData.Flags = Flags; MouseInputData.LastX = LastX; MouseInputData.LastY = LastY; Propchange: branches/ros-csrss/drivers/usb/usbhub/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 28 10:05:08 2012 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbhub:55524-55543,55548-55554 /branches/wlan-bringup/drivers/usb/usbhub:54809-54998 /branches/wlan-bringup/drivers/usb/usbhub_new:54809-54998 -/trunk/reactos/drivers/usb/usbhub:57561-57599 +/trunk/reactos/drivers/usb/usbhub:57561-57629 Modified: branches/ros-csrss/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbhub/fd… ============================================================================== --- branches/ros-csrss/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/ros-csrss/drivers/usb/usbhub/fdo.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -1133,7 +1133,7 @@ ULONG ChildDeviceCount, UsbDeviceNumber = 0; WCHAR CharDeviceName[64]; UNICODE_STRING DeviceName; - ULONG ConfigDescSize, DeviceDescSize; + ULONG ConfigDescSize, DeviceDescSize, DeviceInfoSize; PVOID HubInterfaceBusContext; USB_CONFIGURATION_DESCRIPTOR ConfigDesc; @@ -1312,6 +1312,14 @@ DPRINT1("USBHUB: GetUsbDeviceDescriptor failed with status %x\n", Status); goto Cleanup; } + + // query device details + Status = HubInterface->QueryDeviceInformation(HubInterfaceBusContext, + UsbChildExtension->UsbDeviceHandle, + &UsbChildExtension->DeviceInformation, + sizeof(USB_DEVICE_INFORMATION_0), + &DeviceInfoSize); + //DumpFullConfigurationDescriptor(UsbChildExtension->FullConfigDesc); @@ -2047,8 +2055,183 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("FdoHandleDeviceControl\n"); - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + PUSB_NODE_INFORMATION NodeInformation; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + PUSB_NODE_CONNECTION_INFORMATION NodeConnectionInfo; + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; + PUSB_NODE_CONNECTION_DRIVERKEY_NAME NodeKey; + PUSB_NODE_CONNECTION_NAME ConnectionName; + ULONG Index, Length; + + // get stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // get device extension + HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_INFORMATION) + { + // is the buffer big enough + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_INFORMATION)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // get buffer + NodeInformation = (PUSB_NODE_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + // sanity check + ASSERT(NodeInformation); + + // init buffer + NodeInformation->NodeType = UsbHub; + RtlCopyMemory(&NodeInformation->u.HubInformation.HubDescriptor, &HubDeviceExtension->HubDescriptor, sizeof(USB_HUB_DESCRIPTOR)); + + // FIXME is hub powered + NodeInformation->u.HubInformation.HubIsBusPowered = TRUE; + + // done + Irp->IoStatus.Information = sizeof(USB_NODE_INFORMATION); + Status = STATUS_SUCCESS; + } + + + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_CONNECTION_INFORMATION) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_CONNECTION_INFORMATION)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // get node connection info + NodeConnectionInfo = (PUSB_NODE_CONNECTION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + // sanity checks + ASSERT(NodeConnectionInfo); + + for(Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index] == NULL) + continue; + + // get child device extension + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)HubDeviceExtension->ChildDeviceObject[Index]->DeviceExtension; + + if (ChildDeviceExtension->PortNumber != NodeConnectionInfo->ConnectionIndex) + continue; + + // init node connection info + RtlCopyMemory(&NodeConnectionInfo->DeviceDescriptor, &ChildDeviceExtension->DeviceDesc, sizeof(USB_DEVICE_DESCRIPTOR)); + NodeConnectionInfo->CurrentConfigurationValue = ChildDeviceExtension->FullConfigDesc->bConfigurationValue; + NodeConnectionInfo->DeviceIsHub = FALSE; //FIXME support hubs + NodeConnectionInfo->LowSpeed = ChildDeviceExtension->DeviceInformation.DeviceSpeed == UsbLowSpeed; + NodeConnectionInfo->DeviceAddress = ChildDeviceExtension->DeviceInformation.DeviceAddress; + NodeConnectionInfo->NumberOfOpenPipes = ChildDeviceExtension->DeviceInformation.NumberOfOpenPipes; + NodeConnectionInfo->ConnectionStatus = DeviceConnected; //FIXME + + if (NodeConnectionInfo->NumberOfOpenPipes) + { + DPRINT1("Need to copy pipe information\n"); + } + break; + } + // done + Irp->IoStatus.Information = sizeof(USB_NODE_INFORMATION); + Status = STATUS_SUCCESS; + } + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_CONNECTION_INFORMATION)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // get node connection info + NodeKey = (PUSB_NODE_CONNECTION_DRIVERKEY_NAME)Irp->AssociatedIrp.SystemBuffer; + + // sanity checks + ASSERT(NodeKey); + + for(Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index] == NULL) + continue; + + // get child device extension + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)HubDeviceExtension->ChildDeviceObject[Index]->DeviceExtension; + + if (ChildDeviceExtension->PortNumber != NodeKey->ConnectionIndex) + continue; + + // get driver key + Status = IoGetDeviceProperty(HubDeviceExtension->ChildDeviceObject[Index], DevicePropertyDriverKeyName, + IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME), + NodeKey->DriverKeyName, + &Length); + + if (Status == STATUS_BUFFER_TOO_SMALL) + { + // normalize status + Status = STATUS_SUCCESS; + } + + if (Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME) > IoStack->Parameters.DeviceIoControl.OutputBufferLength) + { + // terminate node key name + NodeKey->DriverKeyName[0] = UNICODE_NULL; + Irp->IoStatus.Information = sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); + } + else + { + // result size + Irp->IoStatus.Information = Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); + } + + // length of driver name + NodeKey->ActualLength = Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); + break; + } + } + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_CONNECTION_NAME) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_CONNECTION_NAME)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // FIXME support hubs + ConnectionName = (PUSB_NODE_CONNECTION_NAME)Irp->AssociatedIrp.SystemBuffer; + ConnectionName->ActualLength = 0; + ConnectionName->NodeName[0] = UNICODE_NULL; + + // done + Irp->IoStatus.Information = sizeof(USB_NODE_CONNECTION_NAME); + Status = STATUS_SUCCESS; + } + } + else + { + DPRINT1("UNIMPLEMENTED FdoHandleDeviceControl IoCtl %x InputBufferLength %x OutputBufferLength %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, + IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); + } + + // finish irp + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; } Modified: branches/ros-csrss/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbhub/us… ============================================================================== --- branches/ros-csrss/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/ros-csrss/drivers/usb/usbhub/usbhub.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -184,8 +184,39 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; + PIO_STACK_LOCATION IoStack; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("Power Function %x\n", IoStack->MinorFunction); + + if (IoStack->MinorFunction == IRP_MN_SET_POWER) + { + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_POWER) + { + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + + } + else if (IoStack->MinorFunction == IRP_MN_WAIT_WAKE) + { + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; } VOID Modified: branches/ros-csrss/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbhub/us… ============================================================================== --- branches/ros-csrss/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ branches/ros-csrss/drivers/usb/usbhub/usbhub.h [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -68,6 +68,7 @@ PUSB_CONFIGURATION_DESCRIPTOR FullConfigDesc; UNICODE_STRING SymbolicLinkName; USB_BUS_INTERFACE_USBDI_V2 DeviceInterface; + USB_DEVICE_INFORMATION_0 DeviceInformation; } HUB_CHILDDEVICE_EXTENSION, *PHUB_CHILDDEVICE_EXTENSION; typedef struct _HUB_DEVICE_EXTENSION Modified: branches/ros-csrss/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/d… ============================================================================== --- branches/ros-csrss/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/ros-csrss/drivers/usb/usbstor/disk.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -174,11 +174,13 @@ { DPRINT1("SRB_FUNCTION_FLUSH / SRB_FUNCTION_FLUSH_QUEUE / SRB_FUNCTION_SHUTDOWN\n"); + // HACK: don't flush pending requests +#if 0 // we really need a proper storage stack // // wait for pending requests to finish // USBSTOR_QueueWaitForPendingRequests(PDODeviceExtension->LowerDeviceObject); - +#endif // // set status success // Modified: branches/ros-csrss/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/hidparser… ============================================================================== --- branches/ros-csrss/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ branches/ros-csrss/lib/drivers/hidparser/api.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -630,11 +630,10 @@ ASSERT(ReportItem->ByteOffset < ReportDescriptorLength); // - // one extra shift for skipping the prepended report id - // - Data = 0; - Parser->Copy(&Data, &ReportDescriptor[ReportItem->ByteOffset +1], min(sizeof(ULONG), ReportDescriptorLength - (ReportItem->ByteOffset + 1))); - //Data = ReportDescriptor[ReportItem->ByteOffset + 1]; + // FIXME: support items with variable bitlength + // + ASSERT(ReportItem->BitCount == 16); + Data = (ReportDescriptor[ReportItem->ByteOffset +1] & 0xFF) | (ReportDescriptor[ReportItem->ByteOffset +2] & 0xFF) << 8; // // shift data Modified: branches/ros-csrss/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/po/power.c?r… ============================================================================== --- branches/ros-csrss/ntoskrnl/po/power.c [iso-8859-1] (original) +++ branches/ros-csrss/ntoskrnl/po/power.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -21,6 +21,7 @@ PREQUEST_POWER_COMPLETE CompletionRoutine; POWER_STATE PowerState; PVOID Context; + PDEVICE_OBJECT TopDeviceObject; } REQUEST_POWER_ITEM, *PREQUEST_POWER_ITEM; typedef struct _POWER_STATE_TRAVERSE_CONTEXT @@ -56,10 +57,10 @@ RequestPowerItem->Context, &Irp->IoStatus); + IoFreeIrp(Irp); + + ObDereferenceObject(RequestPowerItem->TopDeviceObject); ExFreePool(Context); - - IoFreeIrp(Irp); - ObDereferenceObject(DeviceObject); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -573,6 +574,7 @@ RequestPowerItem->CompletionRoutine = CompletionFunction; RequestPowerItem->PowerState = PowerState; RequestPowerItem->Context = Context; + RequestPowerItem->TopDeviceObject = TopDeviceObject; if (pIrp != NULL) *pIrp = Irp; Modified: branches/ros-csrss/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/include/ntuse… ============================================================================== --- branches/ros-csrss/win32ss/include/ntuser.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/include/ntuser.h [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -56,7 +56,8 @@ otHidData, otDeviceInfo, otTouchInput, - otGestureInfo + otGestureInfo, + USER_HANDLE_TYPE_COUNT } USER_OBJECT_TYPE; typedef enum _USERTHREADINFOCLASS Modified: branches/ros-csrss/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/main.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -26,6 +26,7 @@ SHORT gusLanguageID; PPROCESSINFO ppiScrnSaver; +PPROCESSINFO gppiList = NULL; extern ULONG_PTR Win32kSSDT[]; extern UCHAR Win32kSSPT[]; @@ -55,7 +56,7 @@ Win32kProcessCallback(struct _EPROCESS *Process, BOOLEAN Create) { - PPROCESSINFO ppiCurrent; + PPROCESSINFO ppiCurrent, *pppi; DECLARE_RETURN(NTSTATUS); ASSERT(Process->Peb); @@ -160,6 +161,10 @@ ASSERT(ppiCurrent->pPoolDcAttr); ASSERT(ppiCurrent->pPoolBrushAttr); ASSERT(ppiCurrent->pPoolRgnAttr); + + /* Add the process to the global list */ + ppiCurrent->ppiNext = gppiList; + gppiList = ppiCurrent; } else { @@ -212,11 +217,25 @@ if (gppiInputProvider == ppiCurrent) gppiInputProvider = NULL; + pppi = &gppiList; + while (*pppi != NULL && *pppi != ppiCurrent) + pppi = &(*pppi)->ppiNext; + + ASSERT(*pppi == ppiCurrent); + + *pppi = ppiCurrent->ppiNext; + TRACE_CH(UserProcess,"Freeing ppi 0x%p\n", ppiCurrent); /* Ftee the PROCESSINFO */ PsSetProcessWin32Process(Process, NULL); ExFreePoolWithTag(ppiCurrent, USERTAG_PROCESSINFO); +#if DBG + if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) + { + DbgUserDumpHandleTable(); + } +#endif } RETURN( STATUS_SUCCESS); Modified: branches/ros-csrss/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/n… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/ntuser.h [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -12,6 +12,7 @@ extern BOOL gbInitialized; extern PSERVERINFO gpsi; extern PTHREADINFO gptiCurrent; +extern PPROCESSINFO gppiList; extern PPROCESSINFO ppiScrnSaver; extern PPROCESSINFO gppiInputProvider; Modified: branches/ros-csrss/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/object.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -12,6 +12,66 @@ //int usedHandles=0; PUSER_HANDLE_TABLE gHandleTable = NULL; +#if DBG + +void DbgUserDumpHandleTable() +{ + int HandleCounts[USER_HANDLE_TYPE_COUNT]; + PPROCESSINFO ppiList; + int i; + PWCHAR TypeNames[] = {L"Free",L"Window",L"Menu", L"CursorIcon", L"SMWP", L"Hook", L"ClipBoardData", L"CallProc", + L"Accel", L"DDEaccess", L"DDEconv", L"DDExact", L"Monitor", L"KBDlayout", L"KBDfile", + L"Event", L"Timer", L"InputContext", L"HidData", L"DeviceInfo", L"TouchInput",L"GestureInfo"}; + + ERR("Total handles count: %d\n", gpsi->cHandleEntries); + + memset(HandleCounts, 0, sizeof(HandleCounts)); + + /* First of all count the number of handles per tpe */ + ppiList = gppiList; + while (ppiList) + { + ERR("Process %s (%d) handles count: %d\n\t", ppiList->peProcess->ImageFileName, ppiList->peProcess->UniqueProcessId, ppiList->UserHandleCount); + + for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + { + HandleCounts[i] += ppiList->DbgHandleCount[i]; + + DbgPrint("%S: %d, ", TypeNames[i], ppiList->DbgHandleCount[i]); + if (i % 6 == 0) + DbgPrint("\n\t"); + } + DbgPrint("\n"); + + ppiList = ppiList->ppiNext; + } + + /* Print total type counts */ + ERR("Total handles of the running processes: \n\t"); + for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + { + DbgPrint("%S: %d, ", TypeNames[i], HandleCounts[i]); + if (i % 6 == 0) + DbgPrint("\n\t"); + } + DbgPrint("\n"); + + /* Now count the handle counts that are allocated from the handle table */ + memset(HandleCounts, 0, sizeof(HandleCounts)); + for (i = 0; i < gHandleTable->nb_handles; i++) + HandleCounts[gHandleTable->handles[i].type]++; + + ERR("Total handles count allocated: \n\t"); + for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + { + DbgPrint("%S: %d, ", TypeNames[i], HandleCounts[i]); + if (i % 6 == 0) + DbgPrint("\n\t"); + } + DbgPrint("\n"); +} + +#endif PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle ) { @@ -51,55 +111,12 @@ if (ht->nb_handles >= ht->allocated_handles) /* Need to grow the array */ { -/**/ - int i, iFree = 0, iWindow = 0, iMenu = 0, iCursorIcon = 0, - iHook = 0, iCallProc = 0, iAccel = 0, iMonitor = 0, iTimer = 0, iEvent = 0, iSMWP = 0; - /**/ - ERR("Out of user handles! Used -> %i, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); -//#if 0 - for(i = 0; i < ht->nb_handles; i++) - { - switch (ht->handles[i].type) - { - case otFree: // Should be zero. - iFree++; - break; - case otWindow: - iWindow++; - break; - case otMenu: - iMenu++; - break; - case otCursorIcon: - iCursorIcon++; - break; - case otHook: - iHook++; - break; - case otCallProc: - iCallProc++; - break; - case otAccel: - iAccel++; - break; - case otMonitor: - iMonitor++; - break; - case otTimer: - iTimer++; - break; - case otEvent: - iEvent++; - break; - case otSMWP: - iSMWP++; - default: - break; - } - } - ERR("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d Timer = %d Event = %d SMWP = %d\n", - iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor, iTimer, iEvent, iSMWP ); -//#endif + ERR("Out of user handles! Used -> %i, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); + +#if DBG + DbgUserDumpHandleTable(); +#endif + return NULL; #if 0 PUSER_HANDLE_ENTRY new_handles; @@ -138,6 +155,11 @@ { PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); void *ret; + +#if DBG + ppi->DbgHandleCount[entry->type]--; +#endif + ret = entry->ptr; entry->ptr = ht->freelist; entry->type = 0; @@ -261,11 +283,11 @@ BOOL FASTCALL UserCreateHandleTable(VOID) { - PVOID mem; + INT HandleCount = 1024 * 4; // FIXME: Don't alloc all at once! Must be mapped into umode also... - mem = UserHeapAlloc(sizeof(USER_HANDLE_ENTRY) * 1024*2); + mem = UserHeapAlloc(sizeof(USER_HANDLE_ENTRY) * HandleCount); if (!mem) { ERR("Failed creating handle table\n"); @@ -281,7 +303,7 @@ } // FIXME: Make auto growable - UserInitHandleTable(gHandleTable, mem, sizeof(USER_HANDLE_ENTRY) * 1024*2); + UserInitHandleTable(gHandleTable, mem, sizeof(USER_HANDLE_ENTRY) * HandleCount); return TRUE; } @@ -339,6 +361,10 @@ return NULL; } +#if DBG + ppi->DbgHandleCount[type]++; +#endif + RtlZeroMemory(Object, size); switch (type) Modified: branches/ros-csrss/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/object.h [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -39,6 +39,7 @@ PVOID UserGetObjectNoErr(PUSER_HANDLE_TABLE, HANDLE, USER_OBJECT_TYPE); BOOL FASTCALL UserCreateHandleTable(VOID); BOOL FASTCALL UserObjectInDestroy(HANDLE); +void DbgUserDumpHandleTable(); static __inline VOID UserRefObjectCo(PVOID obj, PUSER_REFERENCE_ENTRY UserReferenceEntry) Modified: branches/ros-csrss/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/win32.h [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -195,6 +195,7 @@ PTHREADINFO ptiList; PTHREADINFO ptiMainThread; struct _DESKTOP* rpdeskStartup; + PPROCESSINFO ppiNext; PCLS pclsPrivateList; PCLS pclsPublicList; INT cThreads; @@ -224,6 +225,7 @@ #if DBG BYTE DbgChannelLevel[DbgChCount]; + DWORD DbgHandleCount[USER_HANDLE_TYPE_COUNT]; #endif } PROCESSINFO; Modified: branches/ros-csrss/win32ss/user/ntuser/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/win32kdebug.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/win32kdebug.h [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -125,7 +125,7 @@ #define DBG_ENABLE_CHANNEL(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] |= level) #define DBG_DISABLE_CHANNEL(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] &= ~level) - #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] & level) + #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) (((ppi)->DbgChannelLevel[ch] & level) == level) #define DBG_PRINT(ppi,ch,level,fmt, ...) do { \ if((level == ERR_LEVEL) || (ppi && DBG_IS_CHANNEL_ENABLED(ppi,ch,level))) \

1 0

[jgardou] 57629: [FREELDR] - Use a better workaround for the objcopy bug
by jgardou＠svn.reactos.org 28 Oct '12

28 Oct '12

Author: jgardou Date: Sun Oct 28 01:58:36 2012 New Revision: 57629 URL: http://svn.reactos.org/svn/reactos?rev=57629&view=rev Log: [FREELDR] - Use a better workaround for the objcopy bug Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Oct 28 01:58:36 2012 @@ -1,7 +1,8 @@ if(SEPARATE_DBG) # FIXME: http://sourceware.org/bugzilla/show_bug.cgi?id=11822 - set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + set(CMAKE_LDR_PE_HELPER_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + set(CMAKE_LDR_PE_HELPER_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") endif() spec2def(freeldr.sys freeldr.spec) @@ -171,6 +172,10 @@ if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) + if(SEPARATE_DBG) + set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + set_target_properties(freeldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + endif() else() add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) @@ -231,6 +236,10 @@ if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) + if(SEPARATE_DBG) + set_target_properties(setupldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + set_target_properties(setupldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + endif() else() add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})

1 0

[hbelusca] 57628: [WIN32SS/USER32] - Use the new subsystems header winmsg.h - Use the new USER_API_MESSAGE structure, and adapt co_CsrNotify in consequence. - Code formatting. [KERNEL32] - Use the ...
by hbelusca＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: hbelusca Date: Sat Oct 27 23:52:28 2012 New Revision: 57628 URL: http://svn.reactos.org/svn/reactos?rev=57628&view=rev Log: [WIN32SS/USER32] - Use the new subsystems header winmsg.h - Use the new USER_API_MESSAGE structure, and adapt co_CsrNotify in consequence. - Code formatting. [KERNEL32] - Use the new subsystems headers basemsg.h, conmsg.h, winmsg.h, etc... [NTDLL] - Code formatting only. Modified: branches/ros-csrss/dll/ntdll/csr/connect.c branches/ros-csrss/dll/win32/kernel32/k32.h branches/ros-csrss/win32ss/pch.h branches/ros-csrss/win32ss/user/ntuser/csr.c branches/ros-csrss/win32ss/user/ntuser/csr.h branches/ros-csrss/win32ss/user/ntuser/desktop.c branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/user32/include/user32.h branches/ros-csrss/win32ss/user/user32/misc/exit.c branches/ros-csrss/win32ss/user/user32/misc/misc.c Modified: branches/ros-csrss/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -60,7 +60,7 @@ ApiMessage->Header.u2.ZeroInit = 0; ApiMessage->Header.u1.s1.TotalLength = FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; - /* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data) */ + /* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data) */ ApiMessage->Header.u1.s1.DataLength = ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); Modified: branches/ros-csrss/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/k3… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/k32.h [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -37,6 +37,10 @@ /* CSRSS Header */ #include <csr/csr.h> +#include <win/base.h> +#include <win/basemsg.h> +#include <win/conmsg.h> +#include <win/winmsg.h> //#include <csr/csrss.h> // FIXME: data header. /* C Headers */ Modified: branches/ros-csrss/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/pch.h?rev=576… ============================================================================== --- branches/ros-csrss/win32ss/pch.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/pch.h [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -71,8 +71,8 @@ #include <pseh/pseh2.h> /* CSRSS Header */ -#include <csrss/client.h> -#include <csrss/csrss.h> // FIXME: data header. +#include <csr/csr.h> +#include <csr/csrss.h> // FIXME: data header. /* Public Win32K headers */ #include <include/callback.h> Modified: branches/ros-csrss/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -46,46 +46,51 @@ NTSTATUS FASTCALL -co_CsrNotify(PCSR_API_MESSAGE Request) +co_CsrNotify(IN OUT PCSR_API_MESSAGE ApiMessage, + IN ULONG DataLength) { - NTSTATUS Status; - PEPROCESS OldProcess; + NTSTATUS Status; + PEPROCESS OldProcess; - if (NULL == CsrProcess) - { - return STATUS_INVALID_PORT_HANDLE; - } + if (NULL == CsrProcess) + { + return STATUS_INVALID_PORT_HANDLE; + } - Request->Header.u2.ZeroInit = 0; - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); + /* Fill out the Port Message Header */ + ApiMessage->Header.u2.ZeroInit = 0; + ApiMessage->Header.u1.s1.TotalLength = + FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; + /* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data) */ + ApiMessage->Header.u1.s1.DataLength = + ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); - /* Switch to the process in which the WindowsApiPort handle is valid */ - OldProcess = PsGetCurrentProcess(); - if (CsrProcess != OldProcess) - { - KeAttachProcess(&CsrProcess->Pcb); - } + /* Switch to the process in which the WindowsApiPort handle is valid */ + OldProcess = PsGetCurrentProcess(); + if (CsrProcess != OldProcess) + { + KeAttachProcess(&CsrProcess->Pcb); + } - UserLeaveCo(); + UserLeaveCo(); - Status = ZwRequestWaitReplyPort(WindowsApiPort, - &Request->Header, - &Request->Header); + Status = ZwRequestWaitReplyPort(WindowsApiPort, + &ApiMessage->Header, + &ApiMessage->Header); - UserEnterCo(); + UserEnterCo(); - if (CsrProcess != OldProcess) - { - KeDetachProcess(); - } + if (CsrProcess != OldProcess) + { + KeDetachProcess(); + } - if (NT_SUCCESS(Status)) - { - Status = Request->Status; - } + if (NT_SUCCESS(Status)) + { + Status = ApiMessage->Status; + } - return Status; + return Status; } Modified: branches/ros-csrss/win32ss/user/ntuser/csr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/csr.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/csr.h [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -12,7 +12,8 @@ extern PEPROCESS CsrProcess; NTSTATUS FASTCALL CsrInit(void); -NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request); +NTSTATUS FASTCALL co_CsrNotify(IN OUT PCSR_API_MESSAGE ApiMessage, + IN ULONG DataLength); NTSTATUS FASTCALL CsrCloseHandle(HANDLE Handle); NTSTATUS WINAPI CsrInsertObject(HANDLE ObjectHandle, ACCESS_MASK DesiredAccess, Modified: branches/ros-csrss/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/d… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/desktop.c [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -1220,7 +1220,8 @@ RETURN( NULL); } - Status = co_CsrNotify(&Request); + Status = co_CsrNotify((PCSR_API_MESSAGE)&Request, + sizeof(CSR_API_MESSAGE)); if (! NT_SUCCESS(Status)) { CsrCloseHandle(Request.Data.CreateDesktopRequest.DesktopHandle); Modified: branches/ros-csrss/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/s… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -17,7 +17,7 @@ { PEPROCESS Process; NTSTATUS Status; - CSR_API_MESSAGE Request; + USER_API_MESSAGE Request; Status = PsLookupProcessByProcessId(ProcessId, &Process); @@ -52,12 +52,13 @@ ObDereferenceObject(Process); - Request.ApiNumber = CSR_CREATE_API_NUMBER(CSR_GUI, REGISTER_LOGON_PROCESS); + Request.ApiNumber = CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterLogonProcess); Request.Data.RegisterLogonProcessRequest.ProcessId = ProcessId; Request.Data.RegisterLogonProcessRequest.Register = Register; - Status = co_CsrNotify(&Request); - if (! NT_SUCCESS(Status)) + Status = co_CsrNotify((PCSR_API_MESSAGE)&Request, + sizeof(CSRSS_REGISTER_LOGON_PROCESS)); + if (!NT_SUCCESS(Status)) { ERR("Failed to register logon process with CSRSS\n"); return FALSE; Modified: branches/ros-csrss/win32ss/user/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/i… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/include/user32.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/include/user32.h [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -30,8 +30,8 @@ #include <ndk/umfuncs.h> /* CSRSS Header */ -#include <csrss/client.h> -#include <csrss/csrss.h> // FIXME: data header. +#include <csr/csr.h> +#include <win/winmsg.h> /* Public Win32K Headers */ #include <ntusrtyp.h> Modified: branches/ros-csrss/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/misc/exit.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/misc/exit.c [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -67,17 +67,17 @@ ExitWindowsEx(UINT uFlags, DWORD dwReserved) { - CSR_API_MESSAGE Request; + USER_API_MESSAGE ApiMessage; NTSTATUS Status; - Request.Data.ExitReactosRequest.Flags = uFlags; - Request.Data.ExitReactosRequest.Reserved = dwReserved; + ApiMessage.Data.ExitReactosRequest.Flags = uFlags; + ApiMessage.Data.ExitReactosRequest.Reserved = dwReserved; - Status = CsrClientCallServer(&Request, + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, - CSR_CREATE_API_NUMBER(CSR_GUI, EXIT_REACTOS), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpExitWindowsEx), + sizeof(CSRSS_EXIT_REACTOS)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) { SetLastError(RtlNtStatusToDosError(Status)); return FALSE; @@ -93,16 +93,16 @@ BOOL WINAPI RegisterServicesProcess(DWORD ServicesProcessId) { - CSR_API_MESSAGE Request; + USER_API_MESSAGE ApiMessage; NTSTATUS Status; - Request.Data.RegisterServicesProcessRequest.ProcessId = UlongToHandle(ServicesProcessId); + ApiMessage.Data.RegisterServicesProcessRequest.ProcessId = UlongToHandle(ServicesProcessId); - Status = CsrClientCallServer(&Request, + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, - CSR_CREATE_API_NUMBER(CSR_GUI, REGISTER_SERVICES_PROCESS), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterServicesProcess), + sizeof(CSRSS_REGISTER_SERVICES_PROCESS)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) { SetLastError(RtlNtStatusToDosError(Status)); return FALSE; Modified: branches/ros-csrss/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/misc/misc.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/misc/misc.c [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -42,7 +42,7 @@ WINAPI RegisterLogonProcess(DWORD dwProcessId, BOOL bRegister) { - return NtUserxRegisterLogonProcess(dwProcessId,bRegister); + return NtUserxRegisterLogonProcess(dwProcessId, bRegister); } /* @@ -50,7 +50,7 @@ */ BOOL WINAPI -SetLogonNotifyWindow (HWND Wnd, HWINSTA WinSta) +SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta) { /* Maybe we should call NtUserSetLogonNotifyWindow and let that one inform CSRSS??? */ CSR_API_MESSAGE Request;

1 0

[hbelusca] 57627: [BASESRV] Remove unneeded comments.
by hbelusca＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: hbelusca Date: Sat Oct 27 23:18:49 2012 New Revision: 57627 URL: http://svn.reactos.org/svn/reactos?rev=57627&view=rev Log: [BASESRV] Remove unneeded comments. Modified: branches/ros-csrss/include/reactos/subsys/win/basemsg.h Modified: branches/ros-csrss/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1] Sat Oct 27 23:18:49 2012 @@ -191,13 +191,13 @@ { BASE_CREATE_PROCESS CreateProcessRequest; BASE_CREATE_THREAD CreateThreadRequest; - BASE_EXIT_PROCESS ExitProcessRequest; // CSRSS_TERMINATE_PROCESS TerminateProcessRequest; + BASE_EXIT_PROCESS ExitProcessRequest; BASE_GET_TEMP_FILE GetTempFile; BASE_CHECK_VDM CheckVdm; BASE_UPDATE_VDM_ENTRY UpdateVdmEntry; BASE_GET_VDM_EXIT_CODE GetVdmExitCode; - BASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest; // CSRSS_SET_SHUTDOWN_PARAMETERS - BASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest; // CSRSS_GET_SHUTDOWN_PARAMETERS + BASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest; + BASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest; BASE_SOUND_SENTRY SoundSentryRequest; BASE_DEFINE_DOS_DEVICE DefineDosDeviceRequest; } Data;

1 0

[ekohl] 57626: [SAMSRV] - Fix MSVC build warnings. - Implement SamrAddMultipeMembersToAlias. - Add missing user attributes to the user setup code.
by ekohl＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: ekohl Date: Sat Oct 27 19:38:12 2012 New Revision: 57626 URL: http://svn.reactos.org/svn/reactos?rev=57626&view=rev Log: [SAMSRV] - Fix MSVC build warnings. - Implement SamrAddMultipeMembersToAlias. - Add missing user attributes to the user setup code. Modified: trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Sat Oct 27 19:38:12 2012 @@ -764,8 +764,8 @@ goto done; } - String->Length = Length - sizeof(WCHAR); - String->MaximumLength = Length; + String->Length = (USHORT)(Length - sizeof(WCHAR)); + String->MaximumLength = (USHORT)Length; String->Buffer = midl_user_allocate(Length); if (String->Buffer == NULL) { Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Oct 27 19:38:12 2012 @@ -16,6 +16,7 @@ /* GLOBALS ********************************************************************/ static SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; + /* FUNCTIONS ***************************************************************/ @@ -3051,6 +3052,8 @@ Use->Count = 0; } + TRACE("Returned Status %lx\n", Status); + return Status; } @@ -3145,8 +3148,8 @@ if (NT_SUCCESS(Status)) { - Names->Element[i].MaximumLength = DataLength; - Names->Element[i].Length = DataLength - sizeof(WCHAR); + Names->Element[i].MaximumLength = (USHORT)DataLength; + Names->Element[i].Length = (USHORT)(DataLength - sizeof(WCHAR)); Status = SampRegQueryValue(AccountKeyHandle, L"Name", @@ -3201,8 +3204,8 @@ if (NT_SUCCESS(Status)) { - Names->Element[i].MaximumLength = DataLength; - Names->Element[i].Length = DataLength - sizeof(WCHAR); + Names->Element[i].MaximumLength = (USHORT)DataLength; + Names->Element[i].Length = (USHORT)(DataLength - sizeof(WCHAR)); Status = SampRegQueryValue(AccountKeyHandle, L"Name", @@ -3259,8 +3262,8 @@ if (NT_SUCCESS(Status)) { - Names->Element[i].MaximumLength = DataLength; - Names->Element[i].Length = DataLength - sizeof(WCHAR); + Names->Element[i].MaximumLength = (USHORT)DataLength; + Names->Element[i].Length = (USHORT)(DataLength - sizeof(WCHAR)); Status = SampRegQueryValue(AccountKeyHandle, L"Name", @@ -4319,6 +4322,7 @@ return Status; } + /* Function 34 */ NTSTATUS NTAPI @@ -4366,6 +4370,7 @@ return STATUS_SUCCESS; } + /* Function 35 */ NTSTATUS @@ -4676,8 +4681,6 @@ return Status; } - - static @@ -6283,6 +6286,7 @@ return Status; } + /* Function 51 */ NTSTATUS NTAPI @@ -6299,15 +6303,34 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 52 */ NTSTATUS NTAPI SamrAddMultipleMembersToAlias(IN SAMPR_HANDLE AliasHandle, IN PSAMPR_PSID_ARRAY MembersBuffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + ULONG i; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("SamrAddMultipleMembersToAlias(%p %p)\n", + AliasHandle, MembersBuffer); + + for (i = 0; i < MembersBuffer->Count; i++) + { + Status = SamrAddMemberToAlias(AliasHandle, + ((PSID *)MembersBuffer->Sids)[i]); + + if (Status == STATUS_MEMBER_IN_ALIAS) + Status = STATUS_SUCCESS; + + if (!NT_SUCCESS(Status)) + break; + } + + return Status; +} + /* Function 53 */ NTSTATUS Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sat Oct 27 19:38:12 2012 @@ -224,6 +224,7 @@ ULONG ulRelativeId) { SAM_USER_FIXED_DATA FixedUserData; + LPWSTR lpEmptyString = L""; DWORD dwDisposition; WCHAR szAccountKeyName[32]; HKEY hAccountKey = NULL; @@ -260,6 +261,62 @@ REG_SZ, (LPVOID)lpAccountName, (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"FullName", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"HomeDirectory", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"HomeDirectoryDrive", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"ScriptPath", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"ProfilePath", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"AdminComment", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"UserComment", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"WorkStations", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); RegCloseKey(hAccountKey); }

1 0

[hbelusca] 57625: [NTDLL] - Code formatting. - Fix CSR message length computation. [CSR] - Remove unneeded comments. - Correct arguments names.
by hbelusca＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: hbelusca Date: Sat Oct 27 19:05:10 2012 New Revision: 57625 URL: http://svn.reactos.org/svn/reactos?rev=57625&view=rev Log: [NTDLL] - Code formatting. - Fix CSR message length computation. [CSR] - Remove unneeded comments. - Correct arguments names. Modified: branches/ros-csrss/dll/ntdll/csr/api.c branches/ros-csrss/dll/ntdll/csr/capture.c branches/ros-csrss/dll/ntdll/csr/connect.c branches/ros-csrss/include/reactos/subsys/csr/csr.h branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h Modified: branches/ros-csrss/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/api.c?r… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/api.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/api.c [iso-8859-1] Sat Oct 27 19:05:10 2012 @@ -6,16 +6,16 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntdll.h> #define NDEBUG #include <debug.h> -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ extern HANDLE CsrApiPort; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ /* * @implemented @@ -78,7 +78,7 @@ Status = CsrClientCallServer(&ApiMessage, NULL, CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpIdentifyAlertable), - sizeof(CSR_SET_PRIORITY_CLASS)); + sizeof(CSR_IDENTIFY_ALTERTABLE_THREAD)); /* Return to caller */ return Status; Modified: branches/ros-csrss/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/capture… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/capture.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/capture.c [iso-8859-1] Sat Oct 27 19:05:10 2012 @@ -6,16 +6,16 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntdll.h> #define NDEBUG #include <debug.h> -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ extern HANDLE CsrPortHeap; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ /* * @implemented Modified: branches/ros-csrss/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] Sat Oct 27 19:05:10 2012 @@ -6,13 +6,13 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntdll.h> #define NDEBUG #include <debug.h> -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ HANDLE CsrApiPort; HANDLE CsrProcessId; @@ -28,7 +28,7 @@ #define UNICODE_PATH_SEP L"\\" -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ /* * @implemented @@ -45,10 +45,10 @@ */ NTSTATUS NTAPI -CsrClientCallServer(PCSR_API_MESSAGE ApiMessage, - PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, - CSR_API_NUMBER ApiNumber, - ULONG RequestLength) +CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, + IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, + IN CSR_API_NUMBER ApiNumber, + IN ULONG DataLength) { NTSTATUS Status; ULONG PointerCount; @@ -58,8 +58,11 @@ /* Fill out the Port Message Header */ ApiMessage->Header.u2.ZeroInit = 0; - ApiMessage->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); - ApiMessage->Header.u1.s1.TotalLength = RequestLength; + ApiMessage->Header.u1.s1.TotalLength = + FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; + /* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data) */ + ApiMessage->Header.u1.s1.DataLength = + ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); /* Fill out the CSR Header */ ApiMessage->ApiNumber = ApiNumber; @@ -113,7 +116,7 @@ /* Check if we got a a Capture Buffer */ if (CaptureBuffer) { - /* We have to convert from the remote view to our remote view */ + /* We have to convert back from the remote view to our local view */ DPRINT("Reconverting CaptureBuffer\n"); ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR) ApiMessage->CsrCaptureData - @@ -168,7 +171,7 @@ NTSTATUS NTAPI -CsrConnectToServer(IN PWSTR ObjectDirectory) +CsrpConnectToServer(IN PWSTR ObjectDirectory) { ULONG PortNameLength; UNICODE_STRING PortName; @@ -318,11 +321,11 @@ */ NTSTATUS NTAPI -CsrClientConnectToServer(PWSTR ObjectDirectory, - ULONG ServerId, - PVOID ConnectionInfo, - PULONG ConnectionInfoSize, - PBOOLEAN ServerToServerCall) +CsrClientConnectToServer(IN PWSTR ObjectDirectory, + IN ULONG ServerId, + IN PVOID ConnectionInfo, + IN OUT PULONG ConnectionInfoSize, + OUT PBOOLEAN ServerToServerCall) { NTSTATUS Status; PIMAGE_NT_HEADERS NtHeader; @@ -397,7 +400,7 @@ if (!CsrApiPort) { /* No, set it up now */ - if (!NT_SUCCESS(Status = CsrConnectToServer(ObjectDirectory))) + if (!NT_SUCCESS(Status = CsrpConnectToServer(ObjectDirectory))) { /* Failed */ DPRINT1("Failure to connect to CSR\n"); @@ -410,8 +413,7 @@ ClientConnect->ConnectionInfoSize = *ConnectionInfoSize; /* Setup a buffer for the connection info */ - CaptureBuffer = CsrAllocateCaptureBuffer(1, - ClientConnect->ConnectionInfoSize); + CaptureBuffer = CsrAllocateCaptureBuffer(1, ClientConnect->ConnectionInfoSize); if (CaptureBuffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -435,12 +437,6 @@ CaptureBuffer, CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpClientConnect), sizeof(CSR_CLIENT_CONNECT)); -/* - Status = CsrClientCallServer(&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CSR_NATIVE, CONNECT_PROCESS), - sizeof(CSR_API_MESSAGE)); -*/ } else { Modified: branches/ros-csrss/include/reactos/subsys/csr/csr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csr.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csr.h [iso-8859-1] Sat Oct 27 19:05:10 2012 @@ -33,10 +33,10 @@ NTSTATUS NTAPI -CsrClientCallServer(IN OUT PCSR_API_MESSAGE Request, +CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, - IN ULONG ApiNumber, - IN ULONG RequestLength); + IN CSR_API_NUMBER ApiNumber, + IN ULONG DataLength); PVOID NTAPI Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Sat Oct 27 19:05:10 2012 @@ -94,7 +94,7 @@ struct _CSR_CAPTURE_BUFFER *PreviousCaptureBuffer; ULONG PointerCount; ULONG_PTR BufferEnd; - ULONG_PTR PointerArray[1]; // MessagePointerOffsets // Offsets within CSR_API_MSG of pointers + ULONG_PTR PointerArray[1]; } CSR_CAPTURE_BUFFER, *PCSR_CAPTURE_BUFFER; @@ -122,8 +122,6 @@ CSR_SET_PRIORITY_CLASS SetPriorityClass; CSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; - // ULONG_PTR ApiMessageData[39]; //// what to do ???? - /*** win32csr thingies to remove. ***/ #if 1 CSRSS_CREATE_DESKTOP CreateDesktopRequest;

1 0

[gadamopoulos] 57624: [win32k] - Double the size of the user handle table in order to allow the test suite to complete despite the horrible object leaks
by gadamopoulos＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: gadamopoulos Date: Sat Oct 27 18:06:10 2012 New Revision: 57624 URL: http://svn.reactos.org/svn/reactos?rev=57624&view=rev Log: [win32k] - Double the size of the user handle table in order to allow the test suite to complete despite the horrible object leaks Modified: trunk/reactos/win32ss/user/ntuser/object.c Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Sat Oct 27 18:06:10 2012 @@ -283,11 +283,11 @@ BOOL FASTCALL UserCreateHandleTable(VOID) { - PVOID mem; + INT HandleCount = 1024 * 4; // FIXME: Don't alloc all at once! Must be mapped into umode also... - mem = UserHeapAlloc(sizeof(USER_HANDLE_ENTRY) * 1024*2); + mem = UserHeapAlloc(sizeof(USER_HANDLE_ENTRY) * HandleCount); if (!mem) { ERR("Failed creating handle table\n"); @@ -303,7 +303,7 @@ } // FIXME: Make auto growable - UserInitHandleTable(gHandleTable, mem, sizeof(USER_HANDLE_ENTRY) * 1024*2); + UserInitHandleTable(gHandleTable, mem, sizeof(USER_HANDLE_ENTRY) * HandleCount); return TRUE; }

1 0

[gadamopoulos] 57623: [win32k] - Fix WARN macros - Keep a list of the PROCESSINFO of all the running processes - Count how many handles a process owns per type in PROCESSINFO - Improve the debug ou...
by gadamopoulos＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: gadamopoulos Date: Sat Oct 27 16:39:18 2012 New Revision: 57623 URL: http://svn.reactos.org/svn/reactos?rev=57623&view=rev Log: [win32k] - Fix WARN macros - Keep a list of the PROCESSINFO of all the running processes - Count how many handles a process owns per type in PROCESSINFO - Improve the debug output when we run out of user handles to show all handle counts per process Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntuser.h trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/object.h trunk/reactos/win32ss/user/ntuser/win32.h trunk/reactos/win32ss/user/ntuser/win32kdebug.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -56,7 +56,8 @@ otHidData, otDeviceInfo, otTouchInput, - otGestureInfo + otGestureInfo, + USER_HANDLE_TYPE_COUNT } USER_OBJECT_TYPE; typedef enum _USERTHREADINFOCLASS Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -26,6 +26,7 @@ SHORT gusLanguageID; PPROCESSINFO ppiScrnSaver; +PPROCESSINFO gppiList = NULL; extern ULONG_PTR Win32kSSDT[]; extern UCHAR Win32kSSPT[]; @@ -55,7 +56,7 @@ Win32kProcessCallback(struct _EPROCESS *Process, BOOLEAN Create) { - PPROCESSINFO ppiCurrent; + PPROCESSINFO ppiCurrent, *pppi; DECLARE_RETURN(NTSTATUS); ASSERT(Process->Peb); @@ -160,6 +161,10 @@ ASSERT(ppiCurrent->pPoolDcAttr); ASSERT(ppiCurrent->pPoolBrushAttr); ASSERT(ppiCurrent->pPoolRgnAttr); + + /* Add the process to the global list */ + ppiCurrent->ppiNext = gppiList; + gppiList = ppiCurrent; } else { @@ -212,11 +217,25 @@ if (gppiInputProvider == ppiCurrent) gppiInputProvider = NULL; + pppi = &gppiList; + while (*pppi != NULL && *pppi != ppiCurrent) + pppi = &(*pppi)->ppiNext; + + ASSERT(*pppi == ppiCurrent); + + *pppi = ppiCurrent->ppiNext; + TRACE_CH(UserProcess,"Freeing ppi 0x%p\n", ppiCurrent); /* Ftee the PROCESSINFO */ PsSetProcessWin32Process(Process, NULL); ExFreePoolWithTag(ppiCurrent, USERTAG_PROCESSINFO); +#if DBG + if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) + { + DbgUserDumpHandleTable(); + } +#endif } RETURN( STATUS_SUCCESS); 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] Sat Oct 27 16:39:18 2012 @@ -12,6 +12,7 @@ extern BOOL gbInitialized; extern PSERVERINFO gpsi; extern PTHREADINFO gptiCurrent; +extern PPROCESSINFO gppiList; extern PPROCESSINFO ppiScrnSaver; extern PPROCESSINFO gppiInputProvider; Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -12,6 +12,66 @@ //int usedHandles=0; PUSER_HANDLE_TABLE gHandleTable = NULL; +#if DBG + +void DbgUserDumpHandleTable() +{ + int HandleCounts[USER_HANDLE_TYPE_COUNT]; + PPROCESSINFO ppiList; + int i; + PWCHAR TypeNames[] = {L"Free",L"Window",L"Menu", L"CursorIcon", L"SMWP", L"Hook", L"ClipBoardData", L"CallProc", + L"Accel", L"DDEaccess", L"DDEconv", L"DDExact", L"Monitor", L"KBDlayout", L"KBDfile", + L"Event", L"Timer", L"InputContext", L"HidData", L"DeviceInfo", L"TouchInput",L"GestureInfo"}; + + ERR("Total handles count: %d\n", gpsi->cHandleEntries); + + memset(HandleCounts, 0, sizeof(HandleCounts)); + + /* First of all count the number of handles per tpe */ + ppiList = gppiList; + while (ppiList) + { + ERR("Process %s (%d) handles count: %d\n\t", ppiList->peProcess->ImageFileName, ppiList->peProcess->UniqueProcessId, ppiList->UserHandleCount); + + for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + { + HandleCounts[i] += ppiList->DbgHandleCount[i]; + + DbgPrint("%S: %d, ", TypeNames[i], ppiList->DbgHandleCount[i]); + if (i % 6 == 0) + DbgPrint("\n\t"); + } + DbgPrint("\n"); + + ppiList = ppiList->ppiNext; + } + + /* Print total type counts */ + ERR("Total handles of the running processes: \n\t"); + for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + { + DbgPrint("%S: %d, ", TypeNames[i], HandleCounts[i]); + if (i % 6 == 0) + DbgPrint("\n\t"); + } + DbgPrint("\n"); + + /* Now count the handle counts that are allocated from the handle table */ + memset(HandleCounts, 0, sizeof(HandleCounts)); + for (i = 0; i < gHandleTable->nb_handles; i++) + HandleCounts[gHandleTable->handles[i].type]++; + + ERR("Total handles count allocated: \n\t"); + for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + { + DbgPrint("%S: %d, ", TypeNames[i], HandleCounts[i]); + if (i % 6 == 0) + DbgPrint("\n\t"); + } + DbgPrint("\n"); +} + +#endif PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle ) { @@ -51,55 +111,12 @@ if (ht->nb_handles >= ht->allocated_handles) /* Need to grow the array */ { -/**/ - int i, iFree = 0, iWindow = 0, iMenu = 0, iCursorIcon = 0, - iHook = 0, iCallProc = 0, iAccel = 0, iMonitor = 0, iTimer = 0, iEvent = 0, iSMWP = 0; - /**/ - ERR("Out of user handles! Used -> %i, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); -//#if 0 - for(i = 0; i < ht->nb_handles; i++) - { - switch (ht->handles[i].type) - { - case otFree: // Should be zero. - iFree++; - break; - case otWindow: - iWindow++; - break; - case otMenu: - iMenu++; - break; - case otCursorIcon: - iCursorIcon++; - break; - case otHook: - iHook++; - break; - case otCallProc: - iCallProc++; - break; - case otAccel: - iAccel++; - break; - case otMonitor: - iMonitor++; - break; - case otTimer: - iTimer++; - break; - case otEvent: - iEvent++; - break; - case otSMWP: - iSMWP++; - default: - break; - } - } - ERR("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d Timer = %d Event = %d SMWP = %d\n", - iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor, iTimer, iEvent, iSMWP ); -//#endif + ERR("Out of user handles! Used -> %i, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); + +#if DBG + DbgUserDumpHandleTable(); +#endif + return NULL; #if 0 PUSER_HANDLE_ENTRY new_handles; @@ -138,6 +155,11 @@ { PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); void *ret; + +#if DBG + ppi->DbgHandleCount[entry->type]--; +#endif + ret = entry->ptr; entry->ptr = ht->freelist; entry->type = 0; @@ -339,6 +361,10 @@ return NULL; } +#if DBG + ppi->DbgHandleCount[type]++; +#endif + RtlZeroMemory(Object, size); switch (type) Modified: trunk/reactos/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -39,6 +39,7 @@ PVOID UserGetObjectNoErr(PUSER_HANDLE_TABLE, HANDLE, USER_OBJECT_TYPE); BOOL FASTCALL UserCreateHandleTable(VOID); BOOL FASTCALL UserObjectInDestroy(HANDLE); +void DbgUserDumpHandleTable(); static __inline VOID UserRefObjectCo(PVOID obj, PUSER_REFERENCE_ENTRY UserReferenceEntry) Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -195,6 +195,7 @@ PTHREADINFO ptiList; PTHREADINFO ptiMainThread; struct _DESKTOP* rpdeskStartup; + PPROCESSINFO ppiNext; PCLS pclsPrivateList; PCLS pclsPublicList; INT cThreads; @@ -224,6 +225,7 @@ #if DBG BYTE DbgChannelLevel[DbgChCount]; + DWORD DbgHandleCount[USER_HANDLE_TYPE_COUNT]; #endif } PROCESSINFO; Modified: trunk/reactos/win32ss/user/ntuser/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32k… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32kdebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32kdebug.h [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -125,7 +125,7 @@ #define DBG_ENABLE_CHANNEL(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] |= level) #define DBG_DISABLE_CHANNEL(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] &= ~level) - #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] & level) + #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) (((ppi)->DbgChannelLevel[ch] & level) == level) #define DBG_PRINT(ppi,ch,level,fmt, ...) do { \ if((level == ERR_LEVEL) || (ppi && DBG_IS_CHANNEL_ENABLED(ppi,ch,level))) \

1 0

[hbelusca] 57622: [CSRSRV] Code formatting only.
by hbelusca＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: hbelusca Date: Sat Oct 27 14:30:32 2012 New Revision: 57622 URL: http://svn.reactos.org/svn/reactos?rev=57622&view=rev Log: [CSRSRV] Code formatting only. Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c branches/ros-csrss/subsystems/win32/csrsrv/server.c branches/ros-csrss/subsystems/win32/csrsrv/session.c branches/ros-csrss/subsystems/win32/csrsrv/wait.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Sat Oct 27 14:30:32 2012 @@ -7,14 +7,14 @@ * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "srv.h" #define NDEBUG #include <debug.h> -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ static unsigned ApiDefinitionsCount = 0; static PCSRSS_API_DEFINITION ApiDefinitions = NULL; @@ -25,7 +25,7 @@ volatile LONG CsrpDynamicThreadTotal; extern ULONG CsrMaxApiRequestThreads; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ #if 0 NTSTATUS FASTCALL Modified: branches/ros-csrss/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] Sat Oct 27 14:30:32 2012 @@ -6,14 +6,14 @@ * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "srv.h" #define NDEBUG #include <debug.h> -/* DATA **********************************************************************/ +/* DATA ***********************************************************************/ PCSR_API_ROUTINE CsrServerApiDispatchTable[CsrpMaxApiNumber] = { @@ -49,7 +49,7 @@ ULONG CsrSrvSharedSectionSize; HANDLE CsrSrvSharedSection; -/* PRIVATE FUNCTIONS**********************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ /*++ * @name CsrServerDllInitialization @@ -583,7 +583,7 @@ return STATUS_INVALID_PARAMETER; } -/* PUBLIC FUNCTIONS***********************************************************/ +/* PUBLIC FUNCTIONS ***********************************************************/ /*++ * @name CsrSetCallingSpooler Modified: branches/ros-csrss/subsystems/win32/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] Sat Oct 27 14:30:32 2012 @@ -6,14 +6,14 @@ * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "srv.h" #define NDEBUG #include <debug.h> -/* DATA **********************************************************************/ +/* DATA ***********************************************************************/ RTL_CRITICAL_SECTION CsrNtSessionLock; LIST_ENTRY CsrNtSessionList; @@ -37,7 +37,7 @@ "Unknown Csr Sb Api Number" }; -/* PRIVATE FUNCTIONS *********************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ /*++ * @name CsrInitializeNtSessionList @@ -191,7 +191,7 @@ } } -/* SESSION MANAGER FUNCTIONS**************************************************/ +/* SESSION MANAGER FUNCTIONS **************************************************/ /*++ * @name CsrSbCreateSession Modified: branches/ros-csrss/subsystems/win32/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/wait.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/wait.c [iso-8859-1] Sat Oct 27 14:30:32 2012 @@ -7,18 +7,18 @@ * Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "srv.h" #define NDEBUG #include <debug.h> -/* DATA **********************************************************************/ +/* DATA ***********************************************************************/ RTL_CRITICAL_SECTION CsrWaitListsLock; -/* PRIVATE FUNCTIONS *********************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ /*++ * @name CsrInitializeWait @@ -183,7 +183,7 @@ return FALSE; } -/* PUBLIC FUNCTIONS **********************************************************/ +/* PUBLIC FUNCTIONS ***********************************************************/ /*++ * @name CsrCreateWait

1 0

← Newer
1
2
3
4
5
6
7
...
22
Older →

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 October 2012