Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 36813: fix resource leak, CID 611
by khornicek＠svn.reactos.org 18 Oct '08

18 Oct '08

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:

1 0

[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 18 Oct '08

18 Oct '08

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)

1 0

[tkreuzer] 36811: Change return type of PsGetCurrentProcessWin32Process to PVOID.
by tkreuzer＠svn.reactos.org 18 Oct '08

18 Oct '08

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 */

1 0

[tkreuzer] 36810: Win32 structure cleanup (WIP): - Add ppi to THREADINFO and initialize it - Initialize THREADINFO.PtiLink and DESKTOP.PtiList and link the thread to it's desktop
by tkreuzer＠svn.reactos.org 18 Oct '08

18 Oct '08

Author: tkreuzer Date: Sat Oct 18 14:54:59 2008 New Revision: 36810 URL: http://svn.reactos.org/svn/reactos?rev=36810&view=rev Log: Win32 structure cleanup (WIP): - Add ppi to THREADINFO and initialize it - Initialize THREADINFO.PtiLink and DESKTOP.PtiList and link the thread to it's desktop Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat Oct 18 14:54:59 2008 @@ -27,6 +27,7 @@ typedef struct _THREADINFO { W32THREAD W32Thread; + PVOID ppi; // FIXME: use PPROCESSINFO PDESKTOPINFO pDeskInfo; PCLIENTINFO pClientInfo; LIST_ENTRY PtiLink; 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 14:54:59 2008 @@ -212,6 +212,7 @@ InitializeListHead(&Win32Thread->WindowListHead); InitializeListHead(&Win32Thread->W32CallbackListHead); + InitializeListHead(&Win32Thread->PtiLink); /* * inherit the thread desktop and process window station (if not yet inherited) from the process startup @@ -268,6 +269,7 @@ } Win32Thread->IsExiting = FALSE; co_IntDestroyCaret(Win32Thread); + Win32Thread->ppi = PsGetCurrentProcessWin32Process(); Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); if (Win32Thread->ThreadInfo) 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 14:54:59 2008 @@ -1022,6 +1022,7 @@ IntGetDesktopWorkArea(DesktopObject, NULL); /* Initialize some local (to win32k) desktop state. */ + InitializeListHead(&DesktopObject->PtiList); DesktopObject->ActiveMessageQueue = NULL; ExFreePoolWithTag(DesktopName.Buffer, TAG_STRING); @@ -1918,9 +1919,14 @@ return FALSE; } + /* Remove the thread from the old desktop's list */ + RemoveEntryList(&W32Thread->PtiLink); + if (DesktopObject != NULL) { ObReferenceObject(DesktopObject); + /* Insert into new desktop's list */ + InsertTailList(&DesktopObject->PtiList, &W32Thread->PtiLink); } if (OldDesktop != NULL)

1 0

[gschneider] 36809: Close file after processing it. Fixes CIDs 626, 627.
by gschneider＠svn.reactos.org 18 Oct '08

18 Oct '08

Author: gschneider Date: Sat Oct 18 14:42:31 2008 New Revision: 36809 URL: http://svn.reactos.org/svn/reactos?rev=36809&view=rev Log: Close file after processing it. Fixes CIDs 626, 627. Modified: trunk/reactos/base/applications/regedit/regedit.c Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Sat Oct 18 14:42:31 2008 @@ -168,6 +168,7 @@ reg_file = fopen(filename, "r"); if (reg_file) { processRegLines(reg_file, doSetValue); + fclose(reg_file); } else { perror(""); fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), filename);

1 0

[sginsberg] 36808: - Fix ObIsKernelHandle routine to return what it should rather than always returning FALSE (Note: the macro version we use internally is correct)
by sginsberg＠svn.reactos.org 18 Oct '08

18 Oct '08

Author: sginsberg Date: Sat Oct 18 10:04:26 2008 New Revision: 36808 URL: http://svn.reactos.org/svn/reactos?rev=36808&view=rev Log: - Fix ObIsKernelHandle routine to return what it should rather than always returning FALSE (Note: the macro version we use internally is correct) Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Sat Oct 18 10:04:26 2008 @@ -3301,7 +3301,7 @@ ObIsKernelHandle(IN HANDLE Handle) { /* We know we're kernel mode, so just check for the kernel handle flag */ - return (BOOLEAN)((ULONG_PTR)Handle & KERNEL_HANDLE_FLAG); + return (BOOLEAN)(((ULONG_PTR)Handle & KERNEL_HANDLE_FLAG) != 0); } /* EOF */

1 0

[mjmartin] 36807: - Fixed typo in SetMenuAndButtonStates. See bug 3792 for more info. - Pass correct size for ServiceStatusProcess to QueryServiceStatusEx which prevents trashing the next services information in Info buffer. - Added missing CloseServiceHandle calls.
by mjmartin＠svn.reactos.org 18 Oct '08

18 Oct '08

Author: mjmartin Date: Sat Oct 18 06:49:25 2008 New Revision: 36807 URL: http://svn.reactos.org/svn/reactos?rev=36807&view=rev Log: - Fixed typo in SetMenuAndButtonStates. See bug 3792 for more info. - Pass correct size for ServiceStatusProcess to QueryServiceStatusEx which prevents trashing the next services information in Info buffer. - Added missing CloseServiceHandle calls. Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/query.c Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Sat Oct 18 06:49:25 2008 @@ -161,7 +161,7 @@ for (i = ID_START; i <= ID_RESTART; i++) { EnableMenuItem(hMainMenu, i, MF_GRAYED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_START, MF_GRAYED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), i, MF_GRAYED); SendMessage(Info->hTool, TB_SETSTATE, i, (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); } Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] Sat Oct 18 06:49:25 2008 @@ -127,10 +127,14 @@ { bRet = TRUE; } + + CloseServiceHandle(hSc); } UnlockServiceDatabase(scLock); } + + CloseServiceHandle(hSCManager); } if (!bRet) @@ -359,11 +363,14 @@ QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&pService->ServiceStatusProcess, - sizeof(*pService), + sizeof(SERVICE_STATUS_PROCESS), &size); + CloseServiceHandle(hService); bRet = TRUE; } + + CloseServiceHandle(hScm); } return bRet;

1 0

[cfinck] 36806: RosCMS changes for the Wiki changes: - Remove an ugly hack from the Login stuff, add a new not-that-ugly hack to Logout :-) Wiki needs to know when a user logged out to handle the cache correctly. - Fix cookie_domain() to also work properly, when $_SERVER["SERVER_NAME"] is an IP address
by cfinck＠svn.reactos.org 18 Oct '08

18 Oct '08

Author: cfinck Date: Sat Oct 18 05:20:53 2008 New Revision: 36806 URL: http://svn.reactos.org/svn/reactos?rev=36806&view=rev Log: RosCMS changes for the Wiki changes: - Remove an ugly hack from the Login stuff, add a new not-that-ugly hack to Logout :-) Wiki needs to know when a user logged out to handle the cache correctly. - Fix cookie_domain() to also work properly, when $_SERVER["SERVER_NAME"] is an IP address Modified: trunk/web/reactos.org/htdocs/roscms/inc/utils.php trunk/web/reactos.org/htdocs/roscms/logon/logout.php trunk/web/reactos.org/htdocs/roscms/logon/subsys_login.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/utils.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/utils.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/utils.php [iso-8859-1] Sat Oct 18 05:20:53 2008 @@ -25,23 +25,16 @@ */ function cookie_domain() { - if (isset($_SERVER['SERVER_NAME'])) - { - if (preg_match('/(\.[^.]+\.[^.]+$)/', $_SERVER['SERVER_NAME'], $matches)) - { - $domain = $matches[1]; - } - else - { - $domain = ''; - } - } - else - { - $domain = ''; - } - - return $domain; + /* Server name might be just an IP address */ + if(preg_match("#[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}#", $_SERVER["SERVER_NAME"])) + return $_SERVER["SERVER_NAME"]; + + /* If it' a DNS address, return the domain name along with the suffix */ + if(preg_match("#(\.[^.]+\.[^.]+$)#", $_SERVER["SERVER_NAME"], $matches)) + return $matches[1]; + + /* Otherwise return nothing */ + return ""; } function row_exists($table_name, $where) Modified: trunk/web/reactos.org/htdocs/roscms/logon/logout.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logo… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/logout.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/logon/logout.php [iso-8859-1] Sat Oct 18 05:20:53 2008 @@ -40,6 +40,10 @@ "'"; $logout_usr_key_post_list = mysql_query($logout_usr_key_post) or die("DB error (logout)!"); + + // Set the Logout cookie for the Wiki, so the user won't see cached pages + // 5 = $wgClockSkewFudge in the Wiki + setcookie("wikiLoggedOut", gmdate("YmdHis", time() + 5), time() + 86400, "/", cookie_domain()); } Modified: trunk/web/reactos.org/htdocs/roscms/logon/subsys_login.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logo… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/subsys_login.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/logon/subsys_login.php [iso-8859-1] Sat Oct 18 05:20:53 2008 @@ -101,14 +101,6 @@ { /* Login session found */ $userid = $row[0]; - - // For the Wiki, we have to start a session - if( $subsys == "wiki" ) - { - define('MEDIAWIKI', ''); - require_once(ROSCMS_PATH . "../wiki/includes/GlobalFunctions.php"); - wfSetupSession(); - } if (isset($row[1])) {

1 0

[cfinck] 36805: Upgrade our Wiki to MediaWiki 1.13.2 (along with an updated version of the ParserFunctions extension) This also includes a rework of the RosCMS integration: - Fixes a Cache problem people were experiencing when logging in/out from RosCMS: You had to press Ctrl+F5, so that the login changes took effect. Now this works properly without a forced reload. - The RosCMS skin supports more MediaWiki features in the left toolbox. - Works properly in all major browsers. Tested ones include
by cfinck＠svn.reactos.org 18 Oct '08

18 Oct '08

1 0

[cgutman] 36804: - Merge aicom-network-fixes up to r36803
by cgutman＠svn.reactos.org 18 Oct '08

18 Oct '08

Author: cgutman Date: Fri Oct 17 23:32:30 2008 New Revision: 36804 URL: http://svn.reactos.org/svn/reactos?rev=36804&view=rev Log: - Merge aicom-network-fixes up to r36803 Removed: trunk/reactos/drivers/network/tcpip/transport/ Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/tcpip/lock.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Fri Oct 17 23:32:30 2008 @@ -964,7 +964,6 @@ IP_ADDRESS DefaultMask = { 0 }; ULONG Lookahead = LOOKAHEAD_SIZE; NTSTATUS Status; - HANDLE RegHandle = 0; TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); @@ -1007,16 +1006,10 @@ GetName( RegistryPath, &IF->Name ); - Status = OpenRegistryKey( RegistryPath, &RegHandle ); - - if(NT_SUCCESS(Status)) { - Status = FindDeviceDescForAdapter( &IF->Name, &IF->Description ); - TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", - &IF->Description)); - } else { - IPDestroyInterface( IF ); - return FALSE; - } + Status = FindDeviceDescForAdapter( &IF->Name, &IF->Description ); + + TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", + &IF->Description)); DefaultMask.Type = IP_ADDRESS_V4; Modified: trunk/reactos/drivers/network/tcpip/tcpip/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] Fri Oct 17 23:32:30 2008 @@ -50,13 +50,12 @@ UINT TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToWrite ) { UINT Ret; - TI_DbgPrint(DEBUG_LOCK,("Locking\n")); + //TI_DbgPrint(DEBUG_LOCK,("Locking\n")); Ret = RecursiveMutexEnter( RecMutex, ToWrite ); - TI_DbgPrint(DEBUG_LOCK,("Locked\n")); return Ret; } VOID TcpipRecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ) { - TI_DbgPrint(DEBUG_LOCK,("Unlocking\n")); + //TI_DbgPrint(DEBUG_LOCK,("Unlocking\n")); RecursiveMutexLeave( RecMutex ); }

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