Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[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

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)

16 years, 7 months

[gschneider] 36809: Close file after processing it. Fixes CIDs 626, 627.

by gschneider＠svn.reactos.org

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);

16 years, 7 months

[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

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

16 years, 7 months

[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

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;

16 years, 7 months

[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

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])) {

16 years, 7 months

[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

16 years, 7 months

[cgutman] 36804: - Merge aicom-network-fixes up to r36803

by cgutman＠svn.reactos.org

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 ); }

16 years, 7 months

[cgutman] 36803: - Disable the locking debug prints

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Oct 17 22:47:13 2008 New Revision: 36803 URL: http://svn.reactos.org/svn/reactos?rev=36803&view=rev Log: - Disable the locking debug prints Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/lock.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] Fri Oct 17 22:47:13 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 ); }

16 years, 7 months

[cgutman] 36802: - Remove some empty folders

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Oct 17 22:28:34 2008 New Revision: 36802 URL: http://svn.reactos.org/svn/reactos?rev=36802&view=rev Log: - Remove some empty folders Removed: branches/aicom-network-fixes/drivers/network/tcpip/transport/

16 years, 7 months

[mkupfer] 36801: draw disk usage bar from "used" to "free" (left to right)

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Fri Oct 17 16:54:03 2008 New Revision: 36801 URL: http://svn.reactos.org/svn/reactos?rev=36801&view=rev Log: draw disk usage bar from "used" to "free" (left to right) Modified: trunk/reactos/dll/win32/shell32/drive.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Fri Oct 17 16:54:03 2008 @@ -350,11 +350,11 @@ horzsize = rect.right - rect.left; Result.QuadPart = (Result.QuadPart * horzsize) / 100; - rect.right = rect.left + Result.QuadPart; - FillRect(drawItem->hDC, &rect, hMagBrush); + rect.right = drawItem->rcItem.right - Result.QuadPart; + FillRect(drawItem->hDC, &rect, hBlueBrush); rect.left = rect.right; rect.right = drawItem->rcItem.right; - FillRect(drawItem->hDC, &rect, hBlueBrush); + FillRect(drawItem->hDC, &rect, hMagBrush); DeleteObject(hBlueBrush); DeleteObject(hMagBrush); }

16 years, 7 months

← Newer
1
...
29
30
31
32
33
34
35
...
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