Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[tkreuzer] 36820: Win32 structure cleanup (WIP): - use rpdeskParent instead of Desktop in WINDOWCLASS - use PDESKTOP instead of DESKTOPINFO in several places

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 18 20:06:30 2008 New Revision: 36820 URL: http://svn.reactos.org/svn/reactos?rev=36820&view=rev Log: Win32 structure cleanup (WIP): - use rpdeskParent instead of Desktop in WINDOWCLASS - use PDESKTOP instead of DESKTOPINFO in several places Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Oct 18 20:06:30 2008 @@ -73,7 +73,6 @@ struct _WINDOWCLASS *Next; struct _WINDOWCLASS *Clone; struct _WINDOWCLASS *Base; - PDESKTOPINFO Desktop; struct _DESKTOP *rpdeskParent; RTL_ATOM Atom; ULONG Windows; Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Sat Oct 18 20:06:30 2008 @@ -2,6 +2,7 @@ #define _WIN32K_CLASS_H #include <include/win32.h> +#include <include/desktop.h> #define IS_ATOM(x) \ (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) @@ -46,7 +47,7 @@ PWINDOWCLASS IntReferenceClass(IN OUT PWINDOWCLASS BaseClass, IN OUT PWINDOWCLASS *ClassLink, - IN PDESKTOPINFO Desktop); + IN PDESKTOP Desktop); VOID IntDereferenceClass(IN OUT PWINDOWCLASS Class, @@ -95,7 +96,7 @@ OUT RTL_ATOM *Atom); BOOL -IntCheckProcessDesktopClasses(IN PDESKTOPINFO Desktop, +IntCheckProcessDesktopClasses(IN PDESKTOP Desktop, IN BOOL FreeOnFailure); #endif /* _WIN32K_CLASS_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Sat Oct 18 20:06:30 2008 @@ -136,31 +136,31 @@ static __inline PVOID -DesktopHeapAlloc(IN PDESKTOPINFO Desktop, +DesktopHeapAlloc(IN PDESKTOP Desktop, IN SIZE_T Bytes) { - return RtlAllocateHeap(Desktop->hKernelHeap, + return RtlAllocateHeap(Desktop->DesktopInfo->hKernelHeap, HEAP_NO_SERIALIZE, Bytes); } static __inline BOOL -DesktopHeapFree(IN PDESKTOPINFO Desktop, +DesktopHeapFree(IN PDESKTOP Desktop, IN PVOID lpMem) { - return RtlFreeHeap(Desktop->hKernelHeap, + return RtlFreeHeap(Desktop->DesktopInfo->hKernelHeap, HEAP_NO_SERIALIZE, lpMem); } static __inline PVOID -DesktopHeapReAlloc(IN PDESKTOPINFO Desktop, +DesktopHeapReAlloc(IN PDESKTOP Desktop, IN PVOID lpMem, IN SIZE_T Bytes) { #if 0 /* NOTE: ntoskrnl doesn't export RtlReAllocateHeap... */ - return RtlReAllocateHeap(Desktop->hKernelHeap, + return RtlReAllocateHeap(Desktop->DesktopInfo->hKernelHeap, HEAP_NO_SERIALIZE, lpMem, Bytes); @@ -168,14 +168,14 @@ SIZE_T PrevSize; PVOID pNew; - PrevSize = RtlSizeHeap(Desktop->hKernelHeap, + PrevSize = RtlSizeHeap(Desktop->DesktopInfo->hKernelHeap, HEAP_NO_SERIALIZE, lpMem); if (PrevSize == Bytes) return lpMem; - pNew = RtlAllocateHeap(Desktop->hKernelHeap, + pNew = RtlAllocateHeap(Desktop->DesktopInfo->hKernelHeap, HEAP_NO_SERIALIZE, Bytes); if (pNew != NULL) @@ -187,7 +187,7 @@ lpMem, Bytes); - RtlFreeHeap(Desktop->hKernelHeap, + RtlFreeHeap(Desktop->DesktopInfo->hKernelHeap, HEAP_NO_SERIALIZE, lpMem); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sat Oct 18 20:06:30 2008 @@ -85,9 +85,9 @@ } /* free the structure */ - if (Class->Desktop != NULL) - { - DesktopHeapFree(Class->Desktop, + if (Class->rpdeskParent != NULL) + { + DesktopHeapFree(Class->rpdeskParent, Class); } else @@ -395,7 +395,7 @@ static PWINDOWCLASS IntGetClassForDesktop(IN OUT PWINDOWCLASS BaseClass, IN OUT PWINDOWCLASS *ClassLink, - IN PDESKTOPINFO Desktop) + IN PDESKTOP Desktop) { SIZE_T ClassSize; PWINDOWCLASS Class; @@ -403,7 +403,7 @@ ASSERT(Desktop != NULL); ASSERT(BaseClass->Base == BaseClass); - if (BaseClass->Desktop == Desktop) + if (BaseClass->rpdeskParent == Desktop) { /* it is most likely that a window is created on the same desktop as the window class. */ @@ -411,7 +411,7 @@ return BaseClass; } - if (BaseClass->Desktop == NULL) + if (BaseClass->rpdeskParent == NULL) { ASSERT(BaseClass->Windows == 0); ASSERT(BaseClass->Clone == NULL); @@ -430,7 +430,7 @@ Class = BaseClass->Clone; while (Class != NULL) { - if (Class->Desktop == Desktop) + if (Class->rpdeskParent == Desktop) { ASSERT(Class->Base == BaseClass); ASSERT(Class->Clone == NULL); @@ -457,10 +457,10 @@ ClassSize); /* update some pointers and link the class */ - Class->Desktop = Desktop; + Class->rpdeskParent = Desktop; Class->Windows = 0; - if (BaseClass->Desktop == NULL) + if (BaseClass->rpdeskParent == NULL) { /* we don't really need the base class on the shared heap anymore, delete it so the only class left is @@ -502,7 +502,7 @@ PWINDOWCLASS IntReferenceClass(IN OUT PWINDOWCLASS BaseClass, IN OUT PWINDOWCLASS *ClassLink, - IN PDESKTOPINFO Desktop) + IN PDESKTOP Desktop) { PWINDOWCLASS Class; @@ -528,9 +528,9 @@ ASSERT(Class->Base != Class); ASSERT(Class->Base->Clone != NULL); - ASSERT(Class->Desktop != NULL); + ASSERT(Class->rpdeskParent != NULL); ASSERT(Class->Windows != 0); - ASSERT(Class->Base->Desktop != NULL); + ASSERT(Class->Base->rpdeskParent != NULL); ASSERT(Class->Base->Windows == 0); /* unlink the clone */ @@ -648,7 +648,7 @@ SIZE_T ClassSize; ASSERT(Class->Base == Class); - ASSERT(Class->Desktop != NULL); + ASSERT(Class->rpdeskParent != NULL); ASSERT(Class->Windows == 0); ASSERT(Class->Clone == NULL); @@ -662,7 +662,7 @@ Class, ClassSize); - NewClass->Desktop = NULL; + NewClass->rpdeskParent = NULL; NewClass->Base = NewClass; /* replace the class in the list */ @@ -680,7 +680,7 @@ } static VOID -IntCheckDesktopClasses(IN PDESKTOPINFO Desktop, +IntCheckDesktopClasses(IN PDESKTOP Desktop, IN OUT PWINDOWCLASS *ClassList, IN BOOL FreeOnFailure, OUT BOOL *Ret) @@ -704,7 +704,7 @@ ASSERT(Class->Base == Class); - if (Class->Desktop == Desktop && + if (Class->rpdeskParent == Desktop && Class->Windows == 0) { /* there shouldn't be any clones around anymore! */ @@ -749,7 +749,7 @@ } BOOL -IntCheckProcessDesktopClasses(IN PDESKTOPINFO Desktop, +IntCheckProcessDesktopClasses(IN PDESKTOP Desktop, IN BOOL FreeOnFailure) { PW32PROCESSINFO pi; @@ -792,7 +792,7 @@ IN PUNICODE_STRING MenuName, IN WNDPROC wpExtra, IN DWORD dwFlags, - IN PDESKTOPINFO Desktop, + IN PDESKTOP Desktop, IN PW32PROCESSINFO pi) { SIZE_T ClassSize; @@ -838,7 +838,7 @@ RtlZeroMemory(Class, ClassSize); - Class->Desktop = Desktop; + Class->rpdeskParent = Desktop; Class->Base = Class; Class->Atom = Atom; @@ -1131,6 +1131,7 @@ IN WNDPROC wpExtra, IN DWORD dwFlags) { + PTHREADINFO pti; PW32THREADINFO ti; PW32PROCESSINFO pi; PWINDOWCLASS Class; @@ -1139,6 +1140,7 @@ /* NOTE: Accessing the buffers in ClassName and MenuName may raise exceptions! */ + pti = PsGetCurrentThreadWin32Thread(); ti = GetW32ThreadInfo(); if (ti == NULL || !ti->kpi->RegisteredSysClasses) { @@ -1180,7 +1182,7 @@ MenuName, wpExtra, dwFlags, - ti->Desktop, + pti->Desktop, pi); if (Class != NULL) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sat Oct 18 20:06:30 2008 @@ -1914,7 +1914,7 @@ } if (OldDesktop != NULL && - !IntCheckProcessDesktopClasses(OldDesktop->DesktopInfo, + !IntCheckProcessDesktopClasses(OldDesktop, FreeOnFailure)) { DPRINT1("Failed to move process classes to shared heap!\n"); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Oct 18 20:06:30 2008 @@ -343,12 +343,12 @@ { Wnd->WindowName.Length = 0; Wnd->WindowName.MaximumLength = 0; - DesktopHeapFree(Wnd->pdesktop->DesktopInfo, + DesktopHeapFree(Wnd->pdesktop, Wnd->WindowName.Buffer); Wnd->WindowName.Buffer = NULL; } - DesktopHeapFree(Wnd->pdesktop->DesktopInfo, Wnd); + DesktopHeapFree(Wnd->pdesktop, Wnd); WindowObject->Wnd = NULL; } @@ -1601,7 +1601,7 @@ Class = IntReferenceClass(Class, ClassLink, - pti->Desktop->DesktopInfo); + pti->Desktop); if (Class == NULL) { DPRINT1("Failed to reference window class!\n"); @@ -1619,7 +1619,7 @@ otWindow, sizeof(WINDOW_OBJECT)); if (Window) { - Window->Wnd = DesktopHeapAlloc(pti->Desktop->DesktopInfo, + Window->Wnd = DesktopHeapAlloc(pti->Desktop, sizeof(WINDOW) + Class->WndExtra); if (!Window->Wnd) goto AllocErr; @@ -1719,7 +1719,7 @@ if (NULL != WindowName->Buffer && WindowName->Length > 0) { - Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->pdesktop->DesktopInfo, + Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->pdesktop, WindowName->Length + sizeof(UNICODE_NULL)); if (Wnd->WindowName.Buffer == NULL) { @@ -4592,11 +4592,11 @@ Wnd->WindowName.Buffer = NULL; if (buf != NULL) { - DesktopHeapFree(Wnd->pdesktop->DesktopInfo, + DesktopHeapFree(Wnd->pdesktop, buf); } - Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->pdesktop->DesktopInfo, + Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->pdesktop, SafeText.Length + sizeof(UNICODE_NULL)); if (Wnd->WindowName.Buffer != NULL) {

16 years, 7 months

[tkreuzer] 36819: Win32 structure cleanup (WIP): - make use of pdesktop member in WINDOW structure - replace usage of Wnd->ti->Desktop with Wnd->pdesktop->DesktopInfo

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 18 19:43:54 2008 New Revision: 36819 URL: http://svn.reactos.org/svn/reactos?rev=36819&view=rev Log: Win32 structure cleanup (WIP): - make use of pdesktop member in WINDOW structure - replace usage of Wnd->ti->Desktop with Wnd->pdesktop->DesktopInfo Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Oct 18 19:43:54 2008 @@ -343,12 +343,12 @@ { Wnd->WindowName.Length = 0; Wnd->WindowName.MaximumLength = 0; - DesktopHeapFree(Wnd->ti->Desktop, + DesktopHeapFree(Wnd->pdesktop->DesktopInfo, Wnd->WindowName.Buffer); Wnd->WindowName.Buffer = NULL; } - DesktopHeapFree(ti->Desktop, Wnd); + DesktopHeapFree(Wnd->pdesktop->DesktopInfo, Wnd); WindowObject->Wnd = NULL; } @@ -1601,7 +1601,7 @@ Class = IntReferenceClass(Class, ClassLink, - ti->Desktop); + pti->Desktop->DesktopInfo); if (Class == NULL) { DPRINT1("Failed to reference window class!\n"); @@ -1619,7 +1619,7 @@ otWindow, sizeof(WINDOW_OBJECT)); if (Window) { - Window->Wnd = DesktopHeapAlloc(ti->Desktop, + Window->Wnd = DesktopHeapAlloc(pti->Desktop->DesktopInfo, sizeof(WINDOW) + Class->WndExtra); if (!Window->Wnd) goto AllocErr; @@ -1630,6 +1630,7 @@ Wnd->ti = ti; Wnd->pi = ti->kpi; + Wnd->pdesktop = pti->Desktop; Wnd->hWndLastActive = hWnd; } @@ -1718,7 +1719,7 @@ if (NULL != WindowName->Buffer && WindowName->Length > 0) { - Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->ti->Desktop, + Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->pdesktop->DesktopInfo, WindowName->Length + sizeof(UNICODE_NULL)); if (Wnd->WindowName.Buffer == NULL) { @@ -4591,11 +4592,11 @@ Wnd->WindowName.Buffer = NULL; if (buf != NULL) { - DesktopHeapFree(Wnd->ti->Desktop, + DesktopHeapFree(Wnd->pdesktop->DesktopInfo, buf); } - Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->ti->Desktop, + Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->pdesktop->DesktopInfo, SafeText.Length + sizeof(UNICODE_NULL)); if (Wnd->WindowName.Buffer != NULL) {

16 years, 7 months

[tkreuzer] 36818: Win32 structure cleanup (WIP): Add some members to usermode shared structures to be used soon.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 18 19:39:40 2008 New Revision: 36818 URL: http://svn.reactos.org/svn/reactos?rev=36818&view=rev Log: Win32 structure cleanup (WIP): Add some members to usermode shared structures to be used soon. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Oct 18 19:39:40 2008 @@ -37,6 +37,9 @@ typedef struct _DESKTOPINFO { + PVOID pvDesktopBase; + PVOID pvDesktopLimit; + HANDLE hKernelHeap; ULONG_PTR HeapLimit; HWND hTaskManWindow; @@ -71,6 +74,7 @@ struct _WINDOWCLASS *Clone; struct _WINDOWCLASS *Base; PDESKTOPINFO Desktop; + struct _DESKTOP *rpdeskParent; RTL_ATOM Atom; ULONG Windows; @@ -113,6 +117,7 @@ is moved to this structure */ struct _W32PROCESSINFO *pi; /* FIXME: Move to object header some day */ struct _W32THREADINFO *ti; + struct _DESKTOP *pdesktop; RECT WindowRect; RECT ClientRect;

16 years, 7 months

[tkreuzer] 36817: Win32 structure cleanup (WIP): Initialite THREADINFOs pClientInfo member

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 18 18:01:57 2008 New Revision: 36817 URL: http://svn.reactos.org/svn/reactos?rev=36817&view=rev Log: Win32 structure cleanup (WIP): Initialite THREADINFOs pClientInfo member Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sat Oct 18 18:01:57 2008 @@ -203,6 +203,7 @@ if (Type == PsW32ThreadCalloutInitialize) { HWINSTA hWinSta = NULL; + PTEB pTeb; HDESK hDesk = NULL; NTSTATUS Status; PUNICODE_STRING DesktopPath; @@ -270,6 +271,9 @@ Win32Thread->IsExiting = FALSE; co_IntDestroyCaret(Win32Thread); Win32Thread->ppi = PsGetCurrentProcessWin32Process(); + pTeb = NtCurrentTeb(); + if (pTeb) + Win32Thread->pClientInfo = (PCLIENTINFO)pTeb->Win32ClientInfo; Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); if (Win32Thread->ThreadInfo)

16 years, 7 months

[cfinck] 36816: Allocate enough memory for Value (problem was spotted by Pigglesworth) This problem was revealed by r36797 (thanks to aicom, elhoir, Lone_Rifle and vicmarcal for the help with regression testing) Fixes ipconfig, ping and other network apps crashing with a buffer overflow.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Oct 18 17:22:09 2008 New Revision: 36816 URL: http://svn.reactos.org/svn/reactos?rev=36816&view=rev Log: Allocate enough memory for Value (problem was spotted by Pigglesworth) This problem was revealed by r36797 (thanks to aicom, elhoir, Lone_Rifle and vicmarcal for the help with regression testing) Fixes ipconfig, ping and other network apps crashing with a buffer overflow. Modified: trunk/reactos/dll/win32/iphlpapi/registry.c Modified: trunk/reactos/dll/win32/iphlpapi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/registr… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] Sat Oct 18 17:22:09 2008 @@ -50,7 +50,7 @@ } ValueLen = MaxAdapterName; - Value = (PWCHAR)HeapAlloc( GetProcessHeap(), 0, MaxAdapterName ); + Value = (PWCHAR)HeapAlloc( GetProcessHeap(), 0, MaxAdapterName * sizeof(WCHAR) ); Status = RegEnumKeyExW( RegHandle, n, Value, &ValueLen, NULL, NULL, NULL, NULL ); if (Status != ERROR_SUCCESS)

16 years, 7 months

[gschneider] 36815: Initialize variables and close keys only if they were opened, based on wine code. Fixes CIDs 787, 788.

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Oct 18 16:38:25 2008 New Revision: 36815 URL: http://svn.reactos.org/svn/reactos?rev=36815&view=rev Log: Initialize variables and close keys only if they were opened, based on wine code. Fixes CIDs 787, 788. Modified: trunk/reactos/dll/directx/devenum/devenum_main.c Modified: trunk/reactos/dll/directx/devenum/devenum_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… ============================================================================== --- trunk/reactos/dll/directx/devenum/devenum_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/devenum/devenum_main.c [iso-8859-1] Sat Oct 18 16:38:25 2008 @@ -299,7 +299,7 @@ { HRESULT res = S_OK; WCHAR dll_module[MAX_PATH]; - LPOLESTR clsidString; + LPOLESTR clsidString = NULL; HKEY hkeyClsid; HKEY hkeySub; HKEY hkeyInproc32; @@ -321,6 +321,7 @@ for (i = 0; i < count; i++) { + hkeySub = 0; if (SUCCEEDED(res)) { res = StringFromCLSID(pRegInfo[i].clsid, &clsidString); @@ -361,7 +362,7 @@ (lstrlenW(pszThreadingModel) + 1) * sizeof(WCHAR)); RegCloseKey(hkeyInproc32); } - RegCloseKey(hkeySub); + if (hkeySub) RegCloseKey(hkeySub); CoTaskMemFree(clsidString); clsidString = NULL; }

16 years, 7 months

[khornicek] 36814: fix the fix, sorry

by khornicek＠svn.reactos.org

Author: khornicek Date: Sat Oct 18 16:29:44 2008 New Revision: 36814 URL: http://svn.reactos.org/svn/reactos?rev=36814&view=rev Log: fix the fix, sorry Modified: trunk/reactos/base/shell/explorer/services/startup.c Modified: trunk/reactos/base/shell/explorer/services/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/servic… ============================================================================== --- trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] Sat Oct 18 16:29:44 2008 @@ -390,6 +390,7 @@ } free(szValue); + free(szCmdLine); res=ERROR_SUCCESS; end:

16 years, 7 months

[khornicek] 36813: fix resource leak, CID 611

by khornicek＠svn.reactos.org

Author: khornicek Date: Sat Oct 18 16:07:45 2008 New Revision: 36813 URL: http://svn.reactos.org/svn/reactos?rev=36813&view=rev Log: fix resource leak, CID 611 Modified: trunk/reactos/base/shell/explorer/services/startup.c Modified: trunk/reactos/base/shell/explorer/services/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/servic… ============================================================================== --- trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] Sat Oct 18 16:07:45 2008 @@ -349,6 +349,7 @@ { printf("Couldn't allocate memory for the value names\n"); + free(szCmdLine); res=ERROR_NOT_ENOUGH_MEMORY; goto end; } @@ -388,6 +389,7 @@ printf("Done processing cmd #%ld\n", i); } + free(szValue); res=ERROR_SUCCESS; end:

16 years, 7 months

[cfinck] 36812: Marcelo Slomp (mslomp@linuxmail.org): - Prevent a redefinition of _pctype in newer GCC versions (like 4.3.2) See issue #3598 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Oct 18 15:49:00 2008 New Revision: 36812 URL: http://svn.reactos.org/svn/reactos?rev=36812&view=rev Log: Marcelo Slomp (mslomp(a)linuxmail.org): - Prevent a redefinition of _pctype in newer GCC versions (like 4.3.2) See issue #3598 for more details. Modified: trunk/reactos/base/applications/network/telnet/src/tkeymap.h trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp Modified: trunk/reactos/base/applications/network/telnet/src/tkeymap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tkeymap.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tkeymap.h [iso-8859-1] Sat Oct 18 15:49:00 2008 @@ -1,5 +1,7 @@ #ifndef __TKEYMAP_H #define __TKEYMAP_H + +#include "tkeydef.h" #ifdef __BORLANDC__ #include <classlib\arrays.h> @@ -7,8 +9,6 @@ #include <string> #include "stl_bids.h" #endif - -#include "tkeydef.h" //AVS typedef TArrayAsVector<TKeyDef> keyArray; Modified: trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp [iso-8859-1] Sat Oct 18 15:49:00 2008 @@ -29,16 +29,15 @@ // originally part of KeyTrans.cpp // ///////////////////////////////////////////////////////// +#include "tmapldr.h" +#include "tnconfig.h" + #ifdef __BORLANDC__ #include <fstream.h> #else #include <string> #include <fstream> #endif - -#include "tmapldr.h" -#include "tnerror.h" -#include "tnconfig.h" // It's probably a good idea to turn off the "identifier was truncated" warning // in MSVC (Paul Brannan 5/25/98)

16 years, 7 months

[tkreuzer] 36811: Change return type of PsGetCurrentProcessWin32Process to PVOID.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 18 15:34:36 2008 New Revision: 36811 URL: http://svn.reactos.org/svn/reactos?rev=36811&view=rev Log: Change return type of PsGetCurrentProcessWin32Process to PVOID. Modified: trunk/reactos/include/ndk/psfuncs.h trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/subsystems/win32/win32k/eng/driverobj.c trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/w32k.h Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Sat Oct 18 15:34:36 2008 @@ -42,7 +42,7 @@ ); NTKERNELAPI -struct _W32PROCESS* +PVOID NTAPI PsGetCurrentProcessWin32Process( VOID Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Sat Oct 18 15:34:36 2008 @@ -1118,11 +1118,11 @@ /* * @implemented */ -struct _W32PROCESS* +PVOID NTAPI PsGetCurrentProcessWin32Process(VOID) { - return (struct _W32PROCESS*)PsGetCurrentProcess()->Win32Process; + return PsGetCurrentProcess()->Win32Process; } /* Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/driverobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/driverobj.c [iso-8859-1] Sat Oct 18 15:34:36 2008 @@ -43,17 +43,19 @@ PW32PROCESS Win32Process) { PDRIVERGDI DrvObjInt; + PW32PROCESS CurrentWin32Process; - IntEngLockProcessDriverObjs(PsGetCurrentProcessWin32Process()); + CurrentWin32Process = PsGetCurrentProcessWin32Process(); + IntEngLockProcessDriverObjs(CurrentWin32Process); while (!IsListEmpty(&Win32Process->DriverObjListHead)) { DrvObjInt = CONTAINING_RECORD(Win32Process->DriverObjListHead.Flink, DRIVERGDI, ListEntry); - IntEngUnLockProcessDriverObjs(PsGetCurrentProcessWin32Process()); + IntEngUnLockProcessDriverObjs(CurrentWin32Process); EngDeleteDriverObj((HDRVOBJ)(&DrvObjInt->DriverObj), TRUE, FALSE); - IntEngLockProcessDriverObjs(PsGetCurrentProcessWin32Process()); + IntEngLockProcessDriverObjs(CurrentWin32Process); } - IntEngUnLockProcessDriverObjs(PsGetCurrentProcessWin32Process()); + IntEngUnLockProcessDriverObjs(CurrentWin32Process); } @@ -70,6 +72,7 @@ { PDRIVERGDI DrvObjInt; PDRIVEROBJ DrvObjUser; + PW32PROCESS CurrentWin32Process; /* Create DRIVEROBJ */ DrvObjInt = EngAllocMem(0, sizeof (DRIVERGDI), TAG_DRIVEROBJ); @@ -88,9 +91,10 @@ /* fill internal object */ ExInitializeFastMutex(&DrvObjInt->Lock); - IntEngLockProcessDriverObjs(PsGetCurrentProcessWin32Process()); - InsertTailList(&PsGetCurrentProcessWin32Process()->DriverObjListHead, &DrvObjInt->ListEntry); - IntEngUnLockProcessDriverObjs(PsGetCurrentProcessWin32Process()); + CurrentWin32Process = PsGetCurrentProcessWin32Process(); + IntEngLockProcessDriverObjs(CurrentWin32Process); + InsertTailList(&CurrentWin32Process->DriverObjListHead, &DrvObjInt->ListEntry); + IntEngUnLockProcessDriverObjs(CurrentWin32Process); return (HDRVOBJ)DrvObjUser; } @@ -109,6 +113,7 @@ { PDRIVEROBJ DrvObjUser = (PDRIVEROBJ)hdo; PDRIVERGDI DrvObjInt = ObjToGDI(DrvObjUser, DRIVER); + PW32PROCESS CurrentWin32Process; /* Make sure the obj is locked */ if (!bLocked) @@ -129,9 +134,10 @@ } /* Free the DRIVEROBJ */ - IntEngLockProcessDriverObjs(PsGetCurrentProcessWin32Process()); + CurrentWin32Process = PsGetCurrentProcessWin32Process(); + IntEngLockProcessDriverObjs(CurrentWin32Process); RemoveEntryList(&DrvObjInt->ListEntry); - IntEngUnLockProcessDriverObjs(PsGetCurrentProcessWin32Process()); + IntEngUnLockProcessDriverObjs(CurrentWin32Process); EngFreeMem(DrvObjInt); return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Sat Oct 18 15:34:36 2008 @@ -201,6 +201,7 @@ { PW32HEAP_USER_MAPPING Mapping; PTHREADINFO pti; + PW32PROCESS W32Process; HANDLE hDesktopHeap; ULONG_PTR Delta = 0; @@ -210,7 +211,8 @@ hDesktopHeap = pti->Desktop->hDesktopHeap; - Mapping = PsGetCurrentProcessWin32Process()->HeapMappings.Next; + W32Process = PsGetCurrentProcessWin32Process(); + Mapping = W32Process->HeapMappings.Next; while (Mapping != NULL) { if (Mapping->KernelMapping == (PVOID)hDesktopHeap) @@ -229,8 +231,10 @@ DesktopHeapAddressToUser(PVOID lpMem) { PW32HEAP_USER_MAPPING Mapping; - - Mapping = PsGetCurrentProcessWin32Process()->HeapMappings.Next; + PW32PROCESS W32Process; + + W32Process = PsGetCurrentProcessWin32Process(); + Mapping = W32Process->HeapMappings.Next; while (Mapping != NULL) { if ((ULONG_PTR)lpMem >= (ULONG_PTR)Mapping->KernelMapping && Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sat Oct 18 15:34:36 2008 @@ -1732,10 +1732,14 @@ IntUnmapDesktopView(IN PDESKTOP DesktopObject) { PW32THREADINFO ti; - PW32HEAP_USER_MAPPING HeapMapping, *PrevLink = &PsGetCurrentProcessWin32Process()->HeapMappings.Next; + PW32PROCESS CurrentWin32Process; + PW32HEAP_USER_MAPPING HeapMapping, *PrevLink; NTSTATUS Status = STATUS_SUCCESS; TRACE("DO %p\n"); + + CurrentWin32Process = PsGetCurrentProcessWin32Process(); + PrevLink = &CurrentWin32Process->HeapMappings.Next; /* unmap if we're the last thread using the desktop */ HeapMapping = *PrevLink; @@ -1780,11 +1784,15 @@ IntMapDesktopView(IN PDESKTOP DesktopObject) { PW32THREADINFO ti; - PW32HEAP_USER_MAPPING HeapMapping, *PrevLink = &PsGetCurrentProcessWin32Process()->HeapMappings.Next; + PW32PROCESS CurrentWin32Process; + PW32HEAP_USER_MAPPING HeapMapping, *PrevLink; PVOID UserBase = NULL; SIZE_T ViewSize = 0; LARGE_INTEGER Offset; NTSTATUS Status; + + CurrentWin32Process = PsGetCurrentProcessWin32Process(); + PrevLink = &CurrentWin32Process->HeapMappings.Next; /* find out if another thread already mapped the desktop heap */ HeapMapping = *PrevLink; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Sat Oct 18 15:34:36 2008 @@ -313,6 +313,7 @@ IntCreateMenu(PHANDLE Handle, BOOL IsMenuBar) { PMENU_OBJECT Menu; + PW32PROCESS CurrentWin32Process; Menu = (PMENU_OBJECT)UserCreateObject( gHandleTable, Handle, @@ -346,7 +347,8 @@ Menu->MenuItemList = NULL; /* Insert menu item into process menu handle list */ - InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry); + CurrentWin32Process = PsGetCurrentProcessWin32Process(); + InsertTailList(&CurrentWin32Process->MenuListHead, &Menu->ListEntry); return Menu; } @@ -416,6 +418,7 @@ PMENU_OBJECT FASTCALL IntCloneMenu(PMENU_OBJECT Source) { + PW32PROCESS CurrentWin32Process; HANDLE hMenu; PMENU_OBJECT Menu; @@ -450,7 +453,8 @@ Menu->MenuItemList = NULL; /* Insert menu item into process menu handle list */ - InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry); + CurrentWin32Process = PsGetCurrentProcessWin32Process(); + InsertTailList(&CurrentWin32Process->MenuListHead, &Menu->ListEntry); IntCloneMenuItems(Menu, Source); Modified: trunk/reactos/subsystems/win32/win32k/w32k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32k.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32k.h [iso-8859-1] Sat Oct 18 15:34:36 2008 @@ -137,8 +137,9 @@ static __inline PVOID UserHeapAddressToUser(PVOID lpMem) { + PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); return (PVOID)(((ULONG_PTR)lpMem - (ULONG_PTR)GlobalUserHeap) + - (ULONG_PTR)PsGetCurrentProcessWin32Process()->HeapMappings.UserMapping); + (ULONG_PTR)W32Process->HeapMappings.UserMapping); } #endif /* __W32K_H */

16 years, 7 months

← Newer
1
...
28
29
30
31
32
33
34
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008