Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 50812: [CMAKE] - Fix hhctrl msvc build.
by akhaldi＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: akhaldi Date: Fri Feb 18 19:48:33 2011 New Revision: 50812 URL: http://svn.reactos.org/svn/reactos?rev=50812&view=rev Log: [CMAKE] - Fix hhctrl msvc build. Modified: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt branches/cmake-bringup/include/reactos/wine/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hhctrl.… ============================================================================== --- branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Fri Feb 18 19:48:33 2011 @@ -19,12 +19,11 @@ stream.c webbrowser.c hhctrl.rc - #${REACTOS_BINARY_DIR}/include/reactos/wine/itss_i.c ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def) set_module_type(hhctrl win32ocx) -target_link_libraries(hhctrl uuid wine) +target_link_libraries(hhctrl uuid wine itss_guid) add_importlibs(hhctrl advapi32 Modified: branches/cmake-bringup/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] Fri Feb 18 19:48:33 2011 @@ -5,4 +5,5 @@ add_rpc_library(epmrpc epm.idl) add_rpc_library(irotrpc irot.idl) -add_iid_library(wined3d_guid wined3d.idl) +add_iid_library(wined3d_guid wined3d.idl) +add_iid_library(itss_guid itss.idl)

1 0

[akhaldi] 50811: [CMAKE] - Fix LINK (msvc) warnings.
by akhaldi＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: akhaldi Date: Fri Feb 18 19:40:51 2011 New Revision: 50811 URL: http://svn.reactos.org/svn/reactos?rev=50811&view=rev Log: [CMAKE] - Fix LINK (msvc) warnings. Modified: branches/cmake-bringup/dll/win32/cryptdlg/cryptdlg.spec Modified: branches/cmake-bringup/dll/win32/cryptdlg/cryptdlg.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptdl… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptdlg/cryptdlg.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptdlg/cryptdlg.spec [iso-8859-1] Fri Feb 18 19:40:51 2011 @@ -15,7 +15,7 @@ 15 stub CertSelectCertificateW 16 stdcall CertViewPropertiesA(ptr) 17 stdcall CertViewPropertiesW(ptr) -18 stdcall -private DllRegisterServer() -19 stdcall -private DllUnregisterServer() +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 20 stdcall GetFriendlyNameOfCertA(ptr ptr long) 21 stdcall GetFriendlyNameOfCertW(ptr ptr long)

1 0

[tkreuzer] 50810: [CMAKE] Add support for VS 8-10 and SDK to configure script, add error checks. Patch by Samuel Serapion with small modifications by me.
by tkreuzer＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: tkreuzer Date: Fri Feb 18 17:35:50 2011 New Revision: 50810 URL: http://svn.reactos.org/svn/reactos?rev=50810&view=rev Log: [CMAKE] Add support for VS 8-10 and SDK to configure script, add error checks. Patch by Samuel Serapion with small modifications by me. Modified: branches/cmake-bringup/configure.cmd Modified: branches/cmake-bringup/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev… ============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Fri Feb 18 17:35:50 2011 @@ -1,16 +1,14 @@ @echo off -rem Get the source root directory -set ROS_SOURCE_DIR=%~dp0 +:: Get the source root directory +set REACTOS_SOURCE_DIR=%~dp0 -rem Detect build environment (Mingw, VS, WDK, ...) -if not "%ROS_ARCH%" == "" ( +:: Detect build environment (MinGW, VS, WDK, ...) +if defined ROS_ARCH ( + set BUILD_ENVIRONMENT=MinGW + set ARCH=%ROS_ARCH% echo Detected RosBE for %ROS_ARCH% - set BUILD_ENVIRONMENT=MINGW - set ARCH=%ROS_ARCH% -) -if not "%DDK_TARGET_OS%" == "" ( - echo Detected DDK/WDK for %_BUILDARCH% +) else if defined DDK_TARGET_OS ( if "%_BUILDARCH%" == "x86" ( set ARCH=i386 ) @@ -18,43 +16,131 @@ set ARCH=amd64 ) set BUILD_ENVIRONMENT=WDK + echo Detected DDK/WDK for %DDK_TARGET_OS%-%ARCH% +)else if defined VCINSTALLDIR ( +:: VS command prompt does not put this in enviroment vars + cl 2>&1 | find "x86" > NUL && set ARCH=i386 + cl 2>&1 | find "x64" > NUL && set ARCH=amd64 + cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8 + cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9 + cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10 + if not defined BUILD_ENVIRONMENT ( + echo Error: Visual Studio version too old or version detection failed. + exit /b + ) + echo Detected Visual Studio Environment %BUILD_ENVIRONMENT%-%ARCH% +) else if defined sdkdir ( + if "%TARGET_CPU%" == "x86" ( + set ARCH=i386 + ) + if "%TARGET_CPU%" == "x64" ( + set ARCH=amd64 + ) + set BUILD_ENVIRONMENT=SDK + echo Detected Windows SDK %TARGET_PLATFORM%-%ARCH% ) +if defined ARCH if defined BUILD_ENVIRONMENT ( + goto createdirs +) -rem Create directories -echo Preparing host tools... +echo Error: Critical variable missing. Configure script failure. +exit /b + +:: Create directories +:createdirs + +set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH% +if "%REACTOS_SOURCE_DIR%" == "%CD%" ( + echo test + echo Creating directories in %REACTOS_OUTPUT_PATH% + + if not exist %REACTOS_OUTPUT_PATH% ( + mkdir %REACTOS_OUTPUT_PATH% + ) + cd %REACTOS_OUTPUT_PATH% +) + if not exist host-tools ( mkdir host-tools ) +if not exist reactos ( + mkdir reactos +) + +:hostprep +echo Preparing host tools... cd host-tools if EXIST CMakeCache.txt ( del CMakeCache.txt /q ) set REACTOS_BUILD_TOOLS_DIR=%CD% -if "%BUILD_ENVIRONMENT%" == "MINGW" ( - cmake -G "MinGW Makefiles" -DARCH=%ARCH% %ROS_SOURCE_DIR% -) -if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" -DARCH=%ARCH% %ROS_SOURCE_DIR% + +if "%BUILD_ENVIRONMENT%" == "MinGW" ( + cmake -G "MinGW Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "WDK" ( + cmake -G "NMake Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "SDK" ( + cmake -G "NMake Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "VS8" ( + if "%ARCH%" == "amd64" ( + cmake -G "Visual Studio 8 2005 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "Visual Studio 8 2005" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) +) else if "%BUILD_ENVIRONMENT%" == "VS9" ( + if "%ARCH%" == "amd64" ( + cmake -G "Visual Studio 9 2008 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "Visual Studio 9 2008" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) +) else if "%BUILD_ENVIRONMENT%" == "VS10" ( + if "%ARCH%" == "amd64" ( + cmake -G "Visual Studio 10 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "Visual Studio 10" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) ) cd.. +:reactprep echo Preparing reactos... -if not exist reactos ( - mkdir reactos -) cd reactos if EXIST CMakeCache.txt ( del CMakeCache.txt /q ) -if "%BUILD_ENVIRONMENT%" == "MINGW" ( - cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% + +if "%BUILD_ENVIRONMENT%" == "MinGW" ( + cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "WDK" ( + cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "SDK" ( + cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "VS8" ( + if "%ARCH%" == "amd64" ( + cmake -G "Visual Studio 8 2005 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "Visual Studio 8 2005" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) +) else if "%BUILD_ENVIRONMENT%" == "VS9" ( + if "%ARCH%" == "amd64" ( + cmake -G "Visual Studio 9 2008 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "Visual Studio 9 2008" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) +) else if "%BUILD_ENVIRONMENT%" == "VS10" ( + if "%ARCH%" == "amd64" ( + cmake -G "Visual Studio 10 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "Visual Studio 10" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) ) -if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% + +cd.. +if not ERRORLEVEL == 0 ( + echo Warning: errors occured. ) -cd.. -rem Create a root makefile -rem echo ... > makefile +echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, nmake, etc...). +

1 0

[akhaldi] 50809: [CMAKE] - Fix shlwapi msvc build.
by akhaldi＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: akhaldi Date: Fri Feb 18 17:34:55 2011 New Revision: 50809 URL: http://svn.reactos.org/svn/reactos?rev=50809&view=rev Log: [CMAKE] - Fix shlwapi msvc build. Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Fri Feb 18 17:34:55 2011 @@ -47,6 +47,8 @@ version shell32 kernel32 + userenv + wininet msvcrt ntdll)

1 0

[akhaldi] 50808: [CMAKE] - Fix shlwapi build. This reverts r50794.
by akhaldi＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: akhaldi Date: Fri Feb 18 17:30:19 2011 New Revision: 50808 URL: http://svn.reactos.org/svn/reactos?rev=50808&view=rev Log: [CMAKE] - Fix shlwapi build. This reverts r50794. Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Fri Feb 18 17:30:19 2011 @@ -34,7 +34,6 @@ add_importlibs(shlwapi user32 - user32env gdi32 advapi32 oleaut32

1 0

[gadamopoulos] 50807: [win32k] - Fix a bug that caused problems when the user clicks in the caption of a window to activate it
by gadamopoulos＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: gadamopoulos Date: Fri Feb 18 16:28:52 2011 New Revision: 50807 URL: http://svn.reactos.org/svn/reactos?rev=50807&view=rev Log: [win32k] - Fix a bug that caused problems when the user clicks in the caption of a window to activate it Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Feb 18 16:28:52 2011 @@ -1093,7 +1093,7 @@ /* Activate the window if needed */ - if (msg->hwnd != MessageQueue->ActiveWindow) + if (msg->hwnd != UserGetForegroundWindow()) { PWND pwndTop = pwndMsg; while (pwndTop)

1 0

[tkreuzer] 50806: [NTOSKRNL] Alex messed up. Fix by Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl>
by tkreuzer＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: tkreuzer Date: Fri Feb 18 15:59:32 2011 New Revision: 50806 URL: http://svn.reactos.org/svn/reactos?rev=50806&view=rev Log: [NTOSKRNL] Alex messed up. Fix by Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl> Modified: trunk/reactos/ntoskrnl/ps/state.c Modified: trunk/reactos/ntoskrnl/ps/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/state.c?rev=50… ============================================================================== --- trunk/reactos/ntoskrnl/ps/state.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/state.c [iso-8859-1] Fri Feb 18 15:59:32 2011 @@ -510,7 +510,7 @@ ExGetPreviousMode(), (PVOID)&Thread, NULL); - if (NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) return Status; /* Check if this is a System Thread */ if (Thread->SystemThread)

1 0

[janderwald] 50805: - Fix for the fix (suggested by cmake doyen)
by janderwald＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: janderwald Date: Fri Feb 18 15:09:22 2011 New Revision: 50805 URL: http://svn.reactos.org/svn/reactos?rev=50805&view=rev Log: - Fix for the fix (suggested by cmake doyen) Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Fri Feb 18 15:09:22 2011 @@ -7,6 +7,10 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() + +if(MSVC) + add_definitions(-Disnan=_isnan) +endif() spec2def(wined3.dll wined3d.spec) Modified: branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c [iso-8859-1] Fri Feb 18 15:09:22 2011 @@ -43,7 +43,7 @@ /* Deal with special numbers */ if (*in == 0.0f) return 0x0000; - if(_isnan(*in)) return 0x7C01; + if(isnan(*in)) return 0x7C01; if (isinf(*in)) return (*in < 0.0f ? 0xFC00 : 0x7c00); if(tmp < powf(2, 10)) {

1 0

[tkreuzer] 50804: [WIN32K] Fix a bug in GDIOBJ_LockObj, that would cause a deadlock, when an object was deleted while another thread was waiting to acquire the handle lock.
by tkreuzer＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: tkreuzer Date: Fri Feb 18 15:08:50 2011 New Revision: 50804 URL: http://svn.reactos.org/svn/reactos?rev=50804&view=rev Log: [WIN32K] Fix a bug in GDIOBJ_LockObj, that would cause a deadlock, when an object was deleted while another thread was waiting to acquire the handle lock. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Feb 18 15:08:50 2011 @@ -1005,16 +1005,6 @@ } ProcessId = (HANDLE)((ULONG_PTR)PsGetCurrentProcessId() & ~1); - HandleProcessId = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~1); - - /* Check for invalid owner. */ - if (ProcessId != HandleProcessId && HandleProcessId != NULL) - { - DPRINT1("Tried to lock object (0x%p) of wrong owner! ProcessId = %p, HandleProcessId = %p\n", hObj, ProcessId, HandleProcessId); - GDIDBG_TRACECALLER(); - GDIDBG_TRACEALLOCATOR(hObj); - return NULL; - } /* * Prevent the thread from being terminated during the locking process. @@ -1031,6 +1021,17 @@ for (;;) { + HandleProcessId = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~1); + + /* Check for invalid owner. */ + if (ProcessId != HandleProcessId && HandleProcessId != NULL) + { + DPRINT1("Tried to lock object (0x%p) of wrong owner! ProcessId = %p, HandleProcessId = %p\n", hObj, ProcessId, HandleProcessId); + GDIDBG_TRACECALLER(); + GDIDBG_TRACEALLOCATOR(hObj); + break; + } + /* Lock the handle table entry. */ LockedProcessId = (HANDLE)((ULONG_PTR)HandleProcessId | 0x1); PrevProcId = InterlockedCompareExchangePointer((PVOID*)&Entry->ProcessId,

1 0

[tkreuzer] 50803: [CSRSRV] Dereference all threads, when a process is terminated. Fixes ghost processes in taskmgr! Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl> See issue #1567 for more details.
by tkreuzer＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: tkreuzer Date: Fri Feb 18 15:01:00 2011 New Revision: 50803 URL: http://svn.reactos.org/svn/reactos?rev=50803&view=rev Log: [CSRSRV] Dereference all threads, when a process is terminated. Fixes ghost processes in taskmgr! Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl> See issue #1567 for more details. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Fri Feb 18 15:01:00 2011 @@ -145,6 +145,8 @@ ULONG hash; PCSRSS_PROCESS_DATA pProcessData, *pPrevLink; HANDLE Process; + PLIST_ENTRY NextEntry; + PCSR_THREAD Thread; hash = ((ULONG_PTR)Pid >> 2) % (sizeof(ProcessData) / sizeof(*ProcessData)); pPrevLink = &ProcessData[hash]; @@ -161,14 +163,27 @@ DPRINT("CsrFreeProcessData pid: %d\n", Pid); Process = pProcessData->Process; CallProcessDeleted(pProcessData); + + /* Dereference all process threads */ + NextEntry = pProcessData->ThreadList.Flink; + while (NextEntry != &pProcessData->ThreadList) + { + Thread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); + NextEntry = NextEntry->Flink; + + CsrThreadRefcountZero(Thread); + } + if (pProcessData->CsrSectionViewBase) { NtUnmapViewOfSection(NtCurrentProcess(), pProcessData->CsrSectionViewBase); } + if (pProcessData->ServerCommunicationPort) { NtClose(pProcessData->ServerCommunicationPort); } + *pPrevLink = pProcessData->next; RtlFreeHeap(CsrssApiHeap, 0, pProcessData);

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