Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[mf] 20513: lean explorer: select initial folder in shell namespace
by mf＠svn.reactos.org 01 Jan '06

01 Jan '06

lean explorer: select initial folder in shell namespace Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/mainframe.cp p Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/mainframe.cp p --- branches/lean-explorer/reactos/subsys/system/explorer/shell/mainframe.cp p 2006-01-01 14:26:25 UTC (rev 20512) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/mainframe.cp p 2006-01-01 14:32:17 UTC (rev 20513) @@ -304,7 +304,7 @@ if (wparam & OWM_ROOTED) _create_info._root_shell_path = shell_path; else - _create_info._root_shell_path = SpecialFolderPath(CSIDL_DRIVES, _hwnd); + _create_info._root_shell_path = DesktopFolderPath(); //SpecialFolderPath(CSIDL_DRIVES, _hwnd); jump_to(shell_path, (OPEN_WINDOW_MODE)wparam); return TRUE;} // success _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp --- branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp 2006-01-01 14:26:25 UTC (rev 20512) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp 2006-01-01 14:32:17 UTC (rev 20513) @@ -611,13 +611,11 @@ { CONTEXT("ShellBrowserChild::expand_folder()"); - //HTREEITEM hitem_sel = TreeView_GetSelection(_left_hwnd); if (!_last_sel) return false; - if (expand) - if (!TreeView_Expand(_left_hwnd, _last_sel, TVE_EXPAND)) - return false; + if (!TreeView_Expand(_left_hwnd, _last_sel, TVE_EXPAND)) + return false; for(HTREEITEM hitem=TreeView_GetChild(_left_hwnd,_last_sel); hitem; hitem=TreeView_GetNextSibling(_left_hwnd,hitem)) { if ((ShellDirectory*)TreeView_GetItemData(_left_hwnd,hitem) == dir) {

1 0

[ekohl] 20512: Forward QueryServiceLockStatusA/W to services.exe.
by ekohl＠svn.reactos.org 01 Jan '06

01 Jan '06

Forward QueryServiceLockStatusA/W to services.exe. Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2006-01-01 13:45:09 UTC (rev 20511) +++ trunk/reactos/lib/advapi32/service/scm.c 2006-01-01 14:26:25 UTC (rev 20512) @@ -1665,38 +1665,84 @@ /********************************************************************** * QueryServiceLockStatusA * - * @unimplemented + * @implemented */ -BOOL -STDCALL -QueryServiceLockStatusA( - SC_HANDLE hSCManager, - LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded) +BOOL STDCALL +QueryServiceLockStatusA(SC_HANDLE hSCManager, + LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded) { - DPRINT1("QueryServiceLockStatusA is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD dwError; + + DPRINT("QueryServiceLockStatusA() called\n"); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrQueryServiceLockStatusA(BindingHandle, + (unsigned int)hSCManager, + (unsigned char *)lpLockStatus, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + DPRINT("ScmrQueryServiceLockStatusA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + if (lpLockStatus->lpLockOwner != NULL) + { + lpLockStatus->lpLockOwner = + (LPSTR)((UINT_PTR)lpLockStatus + (UINT_PTR)lpLockStatus->lpLockOwner); + } + + DPRINT("QueryServiceLockStatusA() done\n"); + + return TRUE; } /********************************************************************** * QueryServiceLockStatusW * - * @unimplemented + * @implemented */ -BOOL -STDCALL -QueryServiceLockStatusW( - SC_HANDLE hSCManager, - LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded) +BOOL STDCALL +QueryServiceLockStatusW(SC_HANDLE hSCManager, + LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded) { - DPRINT1("QueryServiceLockStatusW is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD dwError; + + DPRINT("QueryServiceLockStatusW() called\n"); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrQueryServiceLockStatusW(BindingHandle, + (unsigned int)hSCManager, + (unsigned char *)lpLockStatus, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + DPRINT("ScmrQueryServiceLockStatusW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + if (lpLockStatus->lpLockOwner != NULL) + { + lpLockStatus->lpLockOwner = + (LPWSTR)((UINT_PTR)lpLockStatus + (UINT_PTR)lpLockStatus->lpLockOwner); + } + + DPRINT("QueryServiceLockStatusW() done\n"); + + return TRUE; }

1 0

[weiden] 20511: Fixed calculating the size of empty message boxes. Fixes bug 1224
by weiden＠svn.reactos.org 01 Jan '06

01 Jan '06

Fixed calculating the size of empty message boxes. Fixes bug 1224 Modified: trunk/reactos/lib/user32/windows/messagebox.c _____ Modified: trunk/reactos/lib/user32/windows/messagebox.c --- trunk/reactos/lib/user32/windows/messagebox.c 2006-01-01 13:36:06 UTC (rev 20510) +++ trunk/reactos/lib/user32/windows/messagebox.c 2006-01-01 13:45:09 UTC (rev 20511) @@ -493,7 +493,15 @@ txtrect.right -= GetSystemMetrics(SM_CXICON) + MSGBOXEX_SPACING; txtrect.top = txtrect.left = txtrect.bottom = 0; SelectObject(hDC, hFont); - DrawTextW(hDC, text, textlen, &txtrect, DT_LEFT | DT_NOPREFIX | DT_WORDBREAK | DT_CALCRECT); + if (textlen != 0) + { + DrawTextW(hDC, text, textlen, &txtrect, DT_LEFT | DT_NOPREFIX | DT_WORDBREAK | DT_CALCRECT); + } + else + { + txtrect.right = txtrect.left + 1; + txtrect.bottom = txtrect.top + 1; + } txtrect.right++; /* calculate position and size of the icon */

1 0

[greatlrd] 20510: Fixing a small bug for hide mouse. Save the current surface under the mouse. But do not blt the mouse pointer. it take care of small glict I have seen in winqauke.
by greatlrd＠svn.reactos.org 01 Jan '06

01 Jan '06

Fixing a small bug for hide mouse. Save the current surface under the mouse. But do not blt the mouse pointer. it take care of small glict I have seen in winqauke. Modified: trunk/reactos/subsys/win32k/eng/mouse.c _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2006-01-01 13:31:26 UTC (rev 20509) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2006-01-01 13:36:06 UTC (rev 20510) @@ -210,15 +210,9 @@ { return; } + + pgp->Enabled = TRUE; - if (pgp->ShowPointer < 0) - { - return ; - } - - - pgp->Enabled = TRUE; - pt.x = pgp->Pos.x - pgp->HotSpot.x; pt.y = pgp->Pos.y - pgp->HotSpot.y; @@ -281,14 +275,19 @@ { if((ColorSurf = EngLockSurface(pgp->ColorSurface))) { - IntEngBitBltEx(DestSurface, ColorSurf, MaskSurf, NULL, + if (pgp->ShowPointer >= 0) + { + IntEngBitBltEx(DestSurface, ColorSurf, MaskSurf, NULL, pgp->XlateObject, &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, R4_MASK, FALSE); - EngUnlockSurface(ColorSurf); + EngUnlockSurface(ColorSurf); + } } } else { + if (pgp->ShowPointer >= 0) + { IntEngBitBltEx(DestSurface, MaskSurf, NULL, NULL, pgp->XlateObject, &DestRect, &SrcPoint, NULL, NULL, NULL, ROP3_TO_ROP4(SRCAND), FALSE); @@ -296,6 +295,7 @@ IntEngBitBltEx(DestSurface, MaskSurf, NULL, NULL, pgp->XlateObject, &DestRect, &SrcPoint, NULL, NULL, NULL, ROP3_TO_ROP4(SRCINVERT), FALSE); + } } EngUnlockSurface(MaskSurf); }

1 0

[weiden] 20509: fixed uninitialized variable warning
by weiden＠svn.reactos.org 01 Jan '06

01 Jan '06

fixed uninitialized variable warning Modified: trunk/reactos/ntoskrnl/mm/pagefile.c _____ Modified: trunk/reactos/ntoskrnl/mm/pagefile.c --- trunk/reactos/ntoskrnl/mm/pagefile.c 2006-01-01 12:00:13 UTC (rev 20508) +++ trunk/reactos/ntoskrnl/mm/pagefile.c 2006-01-01 13:31:26 UTC (rev 20509) @@ -776,7 +776,7 @@ IN PLARGE_INTEGER MaximumSize, IN ULONG Reserved) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE FileHandle; IO_STATUS_BLOCK IoStatus;

1 0

[ekohl] 20508: Forward EnumDependentServicesA/W to services.exe.
by ekohl＠svn.reactos.org 01 Jan '06

01 Jan '06

Forward EnumDependentServicesA/W to services.exe. Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2006-01-01 11:52:34 UTC (rev 20507) +++ trunk/reactos/lib/advapi32/service/scm.c 2006-01-01 12:00:13 UTC (rev 20508) @@ -408,8 +408,7 @@ * * @implemented */ -SC_HANDLE -STDCALL +SC_HANDLE STDCALL CreateServiceA(SC_HANDLE hSCManager, LPCSTR lpServiceName, LPCSTR lpDisplayName, @@ -558,12 +557,12 @@ LPCWSTR lpPassword) { SC_HANDLE hService = NULL; + DWORD dwDependenciesLength = 0; DWORD dwError; - DWORD dwDependenciesLength = 0; DWORD dwLength; LPWSTR lpStr; - DPRINT1("CreateServiceW() called\n"); + DPRINT("CreateServiceW() called\n"); /* Calculate the Dependencies length*/ if (lpDependencies != NULL) @@ -602,7 +601,7 @@ (unsigned int *)&hService); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrCreateServiceW() failed (Error %lu)\n", dwError); + DPRINT("ScmrCreateServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -642,31 +641,65 @@ /********************************************************************** * EnumDependentServicesA * - * @unimplemented + * @implemented */ -BOOL -STDCALL -EnumDependentServicesA( - SC_HANDLE hService, - DWORD dwServiceState, - LPENUM_SERVICE_STATUSA lpServices, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded, - LPDWORD lpServicesReturned) +BOOL STDCALL +EnumDependentServicesA(SC_HANDLE hService, + DWORD dwServiceState, + LPENUM_SERVICE_STATUSA lpServices, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded, + LPDWORD lpServicesReturned) { - DPRINT1("EnumDependentServicesA is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LPENUM_SERVICE_STATUSA lpStatusPtr; + DWORD dwError = ERROR_SUCCESS; + DWORD dwCount; + + DPRINT("EnumServicesStatusA() called\n"); + + HandleBind(); + + dwError = ScmrEnumDependentServicesA(BindingHandle, + (unsigned int)hService, + dwServiceState, + (unsigned char *)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned); + + lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpServices; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } + + if (dwError != ERROR_SUCCESS) + { + DPRINT("ScmrEnumDependentServicesA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + DPRINT("EnumDependentServicesA() done\n"); + + return TRUE; } /********************************************************************** * EnumDependentServicesW * - * @unimplemented + * @implemented */ -BOOL -STDCALL +BOOL STDCALL EnumDependentServicesW(SC_HANDLE hService, DWORD dwServiceState, LPENUM_SERVICE_STATUSW lpServices, @@ -674,9 +707,46 @@ LPDWORD pcbBytesNeeded, LPDWORD lpServicesReturned) { - DPRINT1("EnumDependentServicesW is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LPENUM_SERVICE_STATUSW lpStatusPtr; + DWORD dwError = ERROR_SUCCESS; + DWORD dwCount; + + DPRINT("EnumServicesStatusW() called\n"); + + HandleBind(); + + dwError = ScmrEnumDependentServicesW(BindingHandle, + (unsigned int)hService, + dwServiceState, + (unsigned char *)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned); + + lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } + + if (dwError != ERROR_SUCCESS) + { + DPRINT("ScmrEnumDependentServicesW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + DPRINT("EnumDependentServicesW() done\n"); + + return TRUE; } @@ -691,7 +761,7 @@ SC_HANDLE hSCManager, DWORD dwServiceType, DWORD dwServiceState, - LPENUM_SERVICE_STATUSA lpServices, + LPENUM_SERVICE_STATUSW lpServices, DWORD cbBufSize, LPDWORD pcbBytesNeeded, LPDWORD lpServicesReturned, @@ -758,7 +828,7 @@ return FALSE; } - DPRINT("ScmrEnumServicesStatusA() done\n"); + DPRINT("EnumServicesStatusA() done\n"); return TRUE; } @@ -818,7 +888,7 @@ return FALSE; } - DPRINT("ScmrEnumServicesStatusW() done\n"); + DPRINT("EnumServicesStatusW() done\n"); return TRUE; } @@ -882,7 +952,7 @@ return FALSE; } - DPRINT("ScmrEnumServicesStatusExA() done\n"); + DPRINT("EnumServicesStatusExA() done\n"); return TRUE; } @@ -946,7 +1016,7 @@ return FALSE; } - DPRINT("ScmrEnumServicesStatusExW() done\n"); + DPRINT("EnumServicesStatusExW() done\n"); return TRUE; } _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2006-01-01 11:52:34 UTC (rev 20507) +++ trunk/reactos/subsys/system/services/rpcserver.c 2006-01-01 12:00:13 UTC (rev 20508) @@ -1252,6 +1252,8 @@ DWORD dwError = ERROR_SUCCESS; DPRINT1("ScmrEnumDependentServicesW() called\n"); + *pcbBytesNeeded = 0; + *lpServicesReturned = 0; DPRINT1("ScmrEnumDependentServicesW() done (Error %lu)\n", dwError); @@ -1951,6 +1953,8 @@ unsigned long *lpServicesReturned) { DPRINT1("ScmrEnumDependentServicesA() is unimplemented\n"); + *pcbBytesNeeded = 0; + *lpServicesReturned = 0; return ERROR_CALL_NOT_IMPLEMENTED; }

1 0

[gvg] 20507: Revert accidental commit 20505
by gvg＠svn.reactos.org 01 Jan '06

01 Jan '06

Revert accidental commit 20505 Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp.xml _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp.xml --- trunk/reactos/drivers/lib/oskittcp/oskittcp.xml 2006-01-01 11:50:54 UTC (rev 20506) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp.xml 2006-01-01 11:52:34 UTC (rev 20507) @@ -5,7 +5,6 @@ <define name="_DISABLE_TIDENTS"/> <define name="__USE_W32API"/> <define name="__NO_CTYPE_INLINES" /> - <define name="MEMTRACK" /> <include>drivers/lib/oskittcp/include/freebsd</include> <include>drivers/lib/oskittcp/include/freebsd/sys/include</include> <include>drivers/lib/oskittcp/include/freebsd/src/sys</include>

1 0

[gvg] 20506: Exiting the loop while someone else still might have a lock kind of defeats
by gvg＠svn.reactos.org 01 Jan '06

01 Jan '06

Exiting the loop while someone else still might have a lock kind of defeats the purpose of acquiring the lock ourselves Modified: trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c _____ Modified: trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c --- trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c 2006-01-01 11:48:11 UTC (rev 20505) +++ trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c 2006-01-01 11:50:54 UTC (rev 20506) @@ -38,7 +38,6 @@ FALSE, NULL ); ExAcquireFastMutex( &RecMutex->Mutex ); - if( Status == STATUS_SUCCESS ) break; } RecMutex->Locked = TRUE; RecMutex->Writer = ToWrite;

1 0

[gvg] 20505: Fix memory tracking
by gvg＠svn.reactos.org 01 Jan '06

01 Jan '06

Fix memory tracking Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/malloc.h Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/mbuf.h Modified: trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h Modified: trunk/reactos/drivers/lib/oskittcp/include/oskittcp.h Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp.xml _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/malloc.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/malloc.h 2006-01-01 11:44:55 UTC (rev 20504) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/malloc.h 2006-01-01 11:48:11 UTC (rev 20505) @@ -329,8 +329,8 @@ extern void *malloc __P((unsigned long size, ...)); extern void free __P((void *addr, ...)); #else -#define malloc fbsd_malloc -#define free fbsd_free +#define malloc(size, flags, id) fbsd_malloc(size, __FILE__, __LINE__) +#define free(area, flags) fbsd_free(area, __FILE__, __LINE__) #endif #endif /* KERNEL */ #endif /* !_SYS_MALLOC_H_ */ _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/mbuf.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/mbuf.h 2006-01-01 11:44:55 UTC (rev 20504) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/mbuf.h 2006-01-01 11:48:11 UTC (rev 20505) @@ -304,7 +304,7 @@ #ifdef __REACTOS__ #define MCLGET(m, how) { \ OS_DbgPrint(OSK_MID_TRACE,("(MCLGET) m = %x\n", m)); \ - (m)->m_ext.ext_buf = malloc(MCLBYTES); \ + (m)->m_ext.ext_buf = malloc(MCLBYTES,__FILE__,__LINE__); \ if ((m)->m_ext.ext_buf != NULL) { \ (m)->m_data = (m)->m_ext.ext_buf; \ (m)->m_flags |= M_EXT; \ @@ -313,7 +313,7 @@ } #define MCLFREE(p) { \ - free( (p) ); \ + free( (p), 0 ); \ } #else #define MCLGET(m, how) \ _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h --- trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h 2006-01-01 11:44:55 UTC (rev 20504) +++ trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h 2006-01-01 11:48:11 UTC (rev 20505) @@ -30,6 +30,6 @@ #define panic(...) do { printf(__VA_ARGS__); \ oskittcp_die(__FILE__,__LINE__); } while(0) #endif//_MSC_VER -#define kmem_malloc(x,y,z) malloc(y) +#define kmem_malloc(x,y,z) malloc(y,0,0) #endif//_OSKITFREEBSD_H _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/oskittcp.h --- trunk/reactos/drivers/lib/oskittcp/include/oskittcp.h 2006-01-01 11:44:55 UTC (rev 20504) +++ trunk/reactos/drivers/lib/oskittcp/include/oskittcp.h 2006-01-01 11:48:11 UTC (rev 20505) @@ -155,8 +155,8 @@ #undef errno -void *fbsd_malloc( unsigned int bytes, ... ); -void fbsd_free( void *data, ... ); +void *fbsd_malloc( unsigned int bytes, char *file, unsigned line, ... ); +void fbsd_free( void *data, char *file, unsigned line, ... ); #if 0 #define malloc(x) fbsd_malloc(x,__FILE__,__LINE__) #define free(x) fbsd_free(x,__FILE__,__LINE__) _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2006-01-01 11:44:55 UTC (rev 20504) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2006-01-01 11:48:11 UTC (rev 20505) @@ -33,15 +33,15 @@ int isprint(int c); int _snprintf(char * buf, size_t cnt, const char *fmt, ...); -void *fbsd_malloc( unsigned int bytes, ... ) { +void *fbsd_malloc( unsigned int bytes, char *file, unsigned line, ... ) { if( !OtcpEvent.TCPMalloc ) panic("no malloc"); return OtcpEvent.TCPMalloc - ( OtcpEvent.ClientData, (OSK_UINT)bytes, "*", 0 ); + ( OtcpEvent.ClientData, (OSK_UINT)bytes, file, line ); } -void fbsd_free( void *data, ... ) { +void fbsd_free( void *data, char *file, unsigned line, ... ) { if( !OtcpEvent.TCPFree ) panic("no free"); - OtcpEvent.TCPFree( OtcpEvent.ClientData, data, "*", 0 ); + OtcpEvent.TCPFree( OtcpEvent.ClientData, data, file, line ); } void InitOskitTCP() { _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp.xml --- trunk/reactos/drivers/lib/oskittcp/oskittcp.xml 2006-01-01 11:44:55 UTC (rev 20504) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp.xml 2006-01-01 11:48:11 UTC (rev 20505) @@ -5,6 +5,7 @@ <define name="_DISABLE_TIDENTS"/> <define name="__USE_W32API"/> <define name="__NO_CTYPE_INLINES" /> + <define name="MEMTRACK" /> <include>drivers/lib/oskittcp/include/freebsd</include> <include>drivers/lib/oskittcp/include/freebsd/sys/include</include> <include>drivers/lib/oskittcp/include/freebsd/src/sys</include>

1 0

[gvg] 20504: Memory is properly released, no need to untrack it
by gvg＠svn.reactos.org 01 Jan '06

01 Jan '06

Memory is properly released, no need to untrack it Modified: trunk/reactos/drivers/lib/ip/transport/tcp/accept.c _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/accept.c --- trunk/reactos/drivers/lib/ip/transport/tcp/accept.c 2006-01-01 11:41:05 UTC (rev 20503) +++ trunk/reactos/drivers/lib/ip/transport/tcp/accept.c 2006-01-01 11:44:55 UTC (rev 20504) @@ -115,9 +115,6 @@ ListEntry = ListEntry->Flink; if( Bucket->AssociatedEndpoint == Connection ) { -#ifdef MEMTRACK - UntrackFL( __FILE__, __LINE__, Bucket->Request.RequestContext ); -#endif RemoveEntryList( ListEntry->Blink ); ExFreePool( Bucket ); }

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 January 2006