Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[weiden] 20663: fixed removing the children in ShellBrowser::InsertSubitems()
by weiden＠svn.reactos.org 07 Jan '06

07 Jan '06

fixed removing the children in ShellBrowser::InsertSubitems() Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2006-01-07 17:10:51 UTC (rev 20662) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2006-01-07 18:19:10 UTC (rev 20663) @@ -293,6 +293,7 @@ int ShellBrowser::InsertSubitems(HTREEITEM hParentItem, Entry* entry, IShellFolder* pParentFolder) { + HTREEITEM hchild, hnext; CONTEXT("ShellBrowser::InsertSubitems()"); WaitCursor wait; @@ -308,7 +309,8 @@ } // remove old children items - for(HTREEITEM hchild,hnext=TreeView_GetChild(_left_hwnd, hParentItem); hchild=hnext; ) { + hnext = hchild = TreeView_GetChild(_left_hwnd, hParentItem); + while((hchild=hnext) != NULL) { hnext = TreeView_GetNextSibling(_left_hwnd, hchild); TreeView_DeleteItem(_left_hwnd, hchild); }

1 0

[gedmurphy] 20662: - fix startup type
by gedmurphy＠svn.reactos.org 07 Jan '06

07 Jan '06

- fix startup type - add top level headers Modified: trunk/reactos/subsys/system/servman/about.c Modified: trunk/reactos/subsys/system/servman/geterror.c Modified: trunk/reactos/subsys/system/servman/propsheet.c Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/servman.c _____ Modified: trunk/reactos/subsys/system/servman/about.c --- trunk/reactos/subsys/system/servman/about.c 2006-01-07 08:50:54 UTC (rev 20661) +++ trunk/reactos/subsys/system/servman/about.c 2006-01-07 17:10:51 UTC (rev 20662) @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsys/system/servman/about.c + * PURPOSE: About dialog box message handler + * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + #include "servman.h" extern HINSTANCE hInstance; _____ Modified: trunk/reactos/subsys/system/servman/geterror.c --- trunk/reactos/subsys/system/servman/geterror.c 2006-01-07 08:50:54 UTC (rev 20661) +++ trunk/reactos/subsys/system/servman/geterror.c 2006-01-07 17:10:51 UTC (rev 20662) @@ -1,3 +1,4 @@ + #include "servman.h" /* temp file for debugging */ _____ Modified: trunk/reactos/subsys/system/servman/propsheet.c --- trunk/reactos/subsys/system/servman/propsheet.c 2006-01-07 08:50:54 UTC (rev 20661) +++ trunk/reactos/subsys/system/servman/propsheet.c 2006-01-07 17:10:51 UTC (rev 20662) @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsys/system/servman/propsheet.c + * PURPOSE: Property dialog box message handler + * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + #include "servman.h" extern HINSTANCE hInstance; _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-07 08:50:54 UTC (rev 20661) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-07 17:10:51 UTC (rev 20662) @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsys/system/servman/query.c + * PURPOSE: Query service information + * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + #include "servman.h" extern HINSTANCE hInstance; @@ -18,7 +27,7 @@ BOOL RefreshServiceList(VOID) { - LV_ITEM item; + LVITEM item; TCHAR szNumServices[32]; TCHAR szStatus[128]; DWORD NumServices = 0; @@ -76,12 +85,17 @@ ZeroMemory(&item, sizeof(LV_ITEM)); item.mask = LVIF_TEXT; - //item.iImage = 0; + item.iImage = 0; item.pszText = pServiceStatus[Index].lpDisplayName; + /*_tcsncpy(item.pszText, + pServiceStatus[Index].lpDisplayName, + sizeof(pServiceStatus[Index].lpDisplayName));*/ + item.iItem = ListView_GetItemCount(hListView); - //item.lParam = 0; + item.lParam = 0; item.iItem = ListView_InsertItem(hListView, &item); + /* set the description */ dwValueSize = 0; @@ -149,7 +163,7 @@ _T("Start"), NULL, NULL, - (LPBYTE)StartUp, + (LPBYTE)&StartUp, &dwValueSize)) { RegCloseKey(hKey); @@ -160,21 +174,21 @@ { LoadString(hInstance, IDS_SERVICES_AUTO, szStatus, 128); item.pszText = szStatus; - item.iSubItem = 2; + item.iSubItem = 3; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } else if (StartUp == 0x03) { LoadString(hInstance, IDS_SERVICES_MAN, szStatus, 128); item.pszText = szStatus; - item.iSubItem = 2; + item.iSubItem = 3; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } else if (StartUp == 0x04) { LoadString(hInstance, IDS_SERVICES_DIS, szStatus, 128); item.pszText = szStatus; - item.iSubItem = 2; + item.iSubItem = 3; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-07 08:50:54 UTC (rev 20661) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-07 17:10:51 UTC (rev 20662) @@ -1,6 +1,14 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsys/system/servman/servman.c + * PURPOSE: Main window message handler + * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + #include "servman.h" - const TCHAR ClassName[] = _T("ServiceManager"); HINSTANCE hInstance;

1 0

[ion] 20661: - Forgot to commit these for MSVC build...
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Forgot to commit these for MSVC build... Modified: trunk/reactos/drivers/net/tdi/cte/string.c Modified: trunk/reactos/drivers/net/tdi/cte/stubs.c Modified: trunk/reactos/drivers/net/tdi/tdi/dereg.c Modified: trunk/reactos/drivers/net/tdi/tdi/obsolete.c Modified: trunk/reactos/include/chew/chew.h Modified: trunk/reactos/include/ndk/umtypes.h _____ Modified: trunk/reactos/drivers/net/tdi/cte/string.c --- trunk/reactos/drivers/net/tdi/cte/string.c 2006-01-07 08:28:20 UTC (rev 20660) +++ trunk/reactos/drivers/net/tdi/cte/string.c 2006-01-07 08:50:54 UTC (rev 20661) @@ -9,8 +9,8 @@ BOOLEAN STDCALL CTEAllocateString ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { return FALSE; @@ -23,8 +23,8 @@ BOOLEAN STDCALL CTEInitString ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { return FALSE; _____ Modified: trunk/reactos/drivers/net/tdi/cte/stubs.c --- trunk/reactos/drivers/net/tdi/cte/stubs.c 2006-01-07 08:28:20 UTC (rev 20660) +++ trunk/reactos/drivers/net/tdi/cte/stubs.c 2006-01-07 08:50:54 UTC (rev 20661) @@ -10,7 +10,7 @@ NTSTATUS STDCALL CTEBlock ( - DWORD Unknown0 + ULONG Unknown0 ) { return STATUS_NOT_IMPLEMENTED; @@ -23,8 +23,8 @@ VOID STDCALL CTEInitEvent ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { } @@ -36,7 +36,7 @@ VOID STDCALL CTEInitTimer ( - DWORD Unknown0 + ULONG Unknown0 ) { } @@ -62,13 +62,13 @@ NTSTATUS STDCALL CTELogEvent ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6 + ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3, + ULONG Unknown4, + ULONG Unknown5, + ULONG Unknown6 ) { /* Probably call @@ -85,8 +85,8 @@ BOOLEAN STDCALL CTEScheduleEvent ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { return FALSE; @@ -99,8 +99,8 @@ LONG STDCALL CTESignal ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { #if 0 @@ -122,10 +122,10 @@ BOOLEAN STDCALL CTEStartTimer ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3 + ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3 ) { return FALSE; _____ Modified: trunk/reactos/drivers/net/tdi/tdi/dereg.c --- trunk/reactos/drivers/net/tdi/tdi/dereg.c 2006-01-07 08:28:20 UTC (rev 20660) +++ trunk/reactos/drivers/net/tdi/tdi/dereg.c 2006-01-07 08:50:54 UTC (rev 20661) @@ -41,9 +41,9 @@ NTSTATUS STDCALL TdiRegisterAddressChangeHandler ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2 + ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2 ) { #if 0 @@ -81,8 +81,8 @@ NTSTATUS STDCALL TdiRegisterDeviceObject ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { #if 0 @@ -120,8 +120,8 @@ NTSTATUS STDCALL TdiRegisterNetAddress ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { #if 0 @@ -159,9 +159,9 @@ NTSTATUS STDCALL TdiRegisterNotificationHandler ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2 + ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2 ) { #if 0 _____ Modified: trunk/reactos/drivers/net/tdi/tdi/obsolete.c --- trunk/reactos/drivers/net/tdi/tdi/obsolete.c 2006-01-07 08:28:20 UTC (rev 20660) +++ trunk/reactos/drivers/net/tdi/tdi/obsolete.c 2006-01-07 08:50:54 UTC (rev 20661) @@ -10,7 +10,7 @@ VOID STDCALL TdiMapBuffer ( - DWORD Unknown0 + ULONG Unknown0 ) { /* This function is absolete */ @@ -23,7 +23,7 @@ VOID STDCALL TdiUnmapBuffer ( - DWORD Unknown0 + ULONG Unknown0 ) { /* This function is obsolete */ _____ Modified: trunk/reactos/include/chew/chew.h --- trunk/reactos/include/chew/chew.h 2006-01-07 08:28:20 UTC (rev 20660) +++ trunk/reactos/include/chew/chew.h 2006-01-07 08:50:54 UTC (rev 20661) @@ -31,7 +31,7 @@ * Else, the function returns false and Item is undefined. */ BOOLEAN ChewCreate -( PVOID *Item, UINT Bytes, VOID (*Worker)(PVOID), PVOID UserSpace ); +( PVOID *Item, SIZE_T Bytes, VOID (*Worker)(PVOID), PVOID UserSpace ); /** * Remove a work item, given the pointer returned to Item in ChewCreate. */ _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2006-01-07 08:28:20 UTC (rev 20660) +++ trunk/reactos/include/ndk/umtypes.h 2006-01-07 08:50:54 UTC (rev 20661) @@ -99,7 +99,7 @@ // // Basic NT Types // -#if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) +#if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) && !defined(_NTSECAPI_) typedef struct _UNICODE_STRING { @@ -107,7 +107,6 @@ USHORT MaximumLength; PWSTR Buffer; } UNICODE_STRING, *PUNICODE_STRING; -typedef const UNICODE_STRING* PCUNICODE_STRING; typedef struct _STRING { @@ -116,6 +115,8 @@ PCHAR Buffer; } STRING, *PSTRING; +#endif + typedef struct _OBJECT_ATTRIBUTES { ULONG Length; @@ -125,8 +126,8 @@ PVOID SecurityDescriptor; PVOID SecurityQualityOfService; } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; -#endif +typedef const UNICODE_STRING* PCUNICODE_STRING; typedef STRING ANSI_STRING; typedef PSTRING PANSI_STRING; typedef STRING OEM_STRING;

1 0

[ion] 20660: - get wshtcpip to compile..
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- get wshtcpip to compile.. Modified: trunk/reactos/drivers/net/wshtcpip/wshtcpip.h _____ Modified: trunk/reactos/drivers/net/wshtcpip/wshtcpip.h --- trunk/reactos/drivers/net/wshtcpip/wshtcpip.h 2006-01-07 08:10:10 UTC (rev 20659) +++ trunk/reactos/drivers/net/wshtcpip/wshtcpip.h 2006-01-07 08:28:20 UTC (rev 20660) @@ -8,9 +8,8 @@ #define __WSHTCPIP_H #define WIN32_NO_STATUS -#include <windows.h> -#include <rtlfuncs.h> #include <wsahelp.h> +#include <rtlfuncs.h> #define EXPORT STDCALL

1 0

[ion] 20659: - Deleted npf as recommended by Steven, KJK and Art.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Deleted npf as recommended by Steven, KJK and Art. Modified: trunk/reactos/drivers/net/directory.xml Deleted: trunk/reactos/drivers/net/npf/ _____ Modified: trunk/reactos/drivers/net/directory.xml --- trunk/reactos/drivers/net/directory.xml 2006-01-07 08:07:41 UTC (rev 20658) +++ trunk/reactos/drivers/net/directory.xml 2006-01-07 08:10:10 UTC (rev 20659) @@ -7,9 +7,6 @@ <directory name="ndis"> <xi:include href="ndis/ndis.xml" /> </directory> -<directory name="npf"> - <xi:include href="npf/npf.xml" /> -</directory> <directory name="tcpip"> <xi:include href="tcpip/tcpip.xml" /> </directory>

1 0

[ion] 20658: - Get afd to build.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get afd to build. Modified: trunk/reactos/drivers/net/afd/afd/connect.c Modified: trunk/reactos/drivers/net/afd/afd/listen.c Modified: trunk/reactos/drivers/net/afd/afd/lock.c Modified: trunk/reactos/drivers/net/afd/afd/read.c Modified: trunk/reactos/drivers/net/afd/afd/tdi.c Modified: trunk/reactos/drivers/net/afd/afd/tdiconn.c Modified: trunk/reactos/drivers/net/afd/afd/write.c Modified: trunk/reactos/drivers/net/afd/include/afd.h _____ Modified: trunk/reactos/drivers/net/afd/afd/connect.c --- trunk/reactos/drivers/net/afd/afd/connect.c 2006-01-07 07:56:55 UTC (rev 20657) +++ trunk/reactos/drivers/net/afd/afd/connect.c 2006-01-07 08:07:41 UTC (rev 20658) @@ -65,7 +65,7 @@ return Status; } -static NTSTATUS DDKAPI StreamSocketConnectComplete +static NTSTATUS NTAPI StreamSocketConnectComplete ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ) { _____ Modified: trunk/reactos/drivers/net/afd/afd/listen.c --- trunk/reactos/drivers/net/afd/afd/listen.c 2006-01-07 07:56:55 UTC (rev 20657) +++ trunk/reactos/drivers/net/afd/afd/listen.c 2006-01-07 08:07:41 UTC (rev 20658) @@ -72,7 +72,7 @@ IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); } -static NTSTATUS DDKAPI ListenComplete +static NTSTATUS NTAPI ListenComplete ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ) { _____ Modified: trunk/reactos/drivers/net/afd/afd/lock.c --- trunk/reactos/drivers/net/afd/afd/lock.c 2006-01-07 07:56:55 UTC (rev 20657) +++ trunk/reactos/drivers/net/afd/afd/lock.c 2006-01-07 08:07:41 UTC (rev 20658) @@ -232,7 +232,7 @@ ExReleaseFastMutex( &FCB->Mutex ); } -NTSTATUS DDKAPI UnlockAndMaybeComplete +NTSTATUS NTAPI UnlockAndMaybeComplete ( PAFD_FCB FCB, NTSTATUS Status, PIRP Irp, UINT Information, PIO_COMPLETION_ROUTINE Completion, _____ Modified: trunk/reactos/drivers/net/afd/afd/read.c --- trunk/reactos/drivers/net/afd/afd/read.c 2006-01-07 07:56:55 UTC (rev 20657) +++ trunk/reactos/drivers/net/afd/afd/read.c 2006-01-07 08:07:41 UTC (rev 20658) @@ -47,10 +47,11 @@ UINT i, BytesToCopy = 0, BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; - *TotalBytesCopied = 0; PAFD_MAPBUF Map; NTSTATUS Status; + *TotalBytesCopied = 0; + AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n", BytesAvailable)); @@ -210,7 +211,7 @@ return RetStatus; } -NTSTATUS DDKAPI ReceiveComplete +NTSTATUS NTAPI ReceiveComplete ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ) { @@ -418,7 +419,7 @@ return Status; } -NTSTATUS DDKAPI +NTSTATUS NTAPI PacketSocketRecvComplete( PDEVICE_OBJECT DeviceObject, PIRP Irp, _____ Modified: trunk/reactos/drivers/net/afd/afd/tdi.c --- trunk/reactos/drivers/net/afd/afd/tdi.c 2006-01-07 07:56:55 UTC (rev 20657) +++ trunk/reactos/drivers/net/afd/afd/tdi.c 2006-01-07 08:07:41 UTC (rev 20658) @@ -8,9 +8,7 @@ * CSH 01/09-2000 Created */ #include <afd.h> -#ifndef _MSC_VER #include <pseh/pseh.h> -#endif #include "debug.h" #include "tdiconn.h" #include "tdi_proto.h" _____ Modified: trunk/reactos/drivers/net/afd/afd/tdiconn.c --- trunk/reactos/drivers/net/afd/afd/tdiconn.c 2006-01-07 07:56:55 UTC (rev 20657) +++ trunk/reactos/drivers/net/afd/afd/tdiconn.c 2006-01-07 08:07:41 UTC (rev 20658) @@ -183,6 +183,7 @@ PCHAR LayoutFrame; UINT SizeOfEntry; ULONG TdiAddressSize; + PTDI_CONNECTION_INFORMATION FromTdiConn, ToTdiConn; /* FIXME: Get from socket information */ TdiAddressSize = TdiAddressSizeFromType(From->Address[0].AddressType); @@ -197,8 +198,7 @@ RtlZeroMemory( LayoutFrame, 2 * SizeOfEntry ); - PTDI_CONNECTION_INFORMATION - FromTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame, + FromTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame; ToTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame + SizeOfEntry; if (From != NULL) { _____ Modified: trunk/reactos/drivers/net/afd/afd/write.c --- trunk/reactos/drivers/net/afd/afd/write.c 2006-01-07 07:56:55 UTC (rev 20657) +++ trunk/reactos/drivers/net/afd/afd/write.c 2006-01-07 08:07:41 UTC (rev 20658) @@ -12,7 +12,7 @@ #include "tdiconn.h" #include "debug.h" -static NTSTATUS DDKAPI SendComplete +static NTSTATUS NTAPI SendComplete ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ) { @@ -159,7 +159,7 @@ return STATUS_SUCCESS; } -static NTSTATUS DDKAPI PacketSocketSendComplete +static NTSTATUS NTAPI PacketSocketSendComplete ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ) { _____ Modified: trunk/reactos/drivers/net/afd/include/afd.h --- trunk/reactos/drivers/net/afd/include/afd.h 2006-01-07 07:56:55 UTC (rev 20657) +++ trunk/reactos/drivers/net/afd/include/afd.h 2006-01-07 08:07:41 UTC (rev 20658) @@ -19,6 +19,8 @@ #include <string.h> #define _WINBASE_ #define _WINDOWS_H +#define _INC_WINDOWS +#include <windef.h> #include <winsock2.h> #include <afd/shared.h> @@ -201,7 +203,7 @@ BOOLEAN Write, BOOLEAN LockAddress ); VOID UnlockBuffers( PAFD_WSABUF Buf, UINT Count, BOOL Address ); UINT SocketAcquireStateLock( PAFD_FCB FCB ); -NTSTATUS DDKAPI UnlockAndMaybeComplete +NTSTATUS NTAPI UnlockAndMaybeComplete ( PAFD_FCB FCB, NTSTATUS Status, PIRP Irp, UINT Information, PIO_COMPLETION_ROUTINE Completion, @@ -223,12 +225,12 @@ /* read.c */ -NTSTATUS DDKAPI ReceiveComplete +NTSTATUS NTAPI ReceiveComplete ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ); -NTSTATUS DDKAPI PacketSocketRecvComplete +NTSTATUS NTAPI PacketSocketRecvComplete ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context );

1 0

[ion] 20657: - GEt TCPIP building with msvc.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- GEt TCPIP building with msvc. Modified: trunk/reactos/drivers/net/tcpip/include/precomp.h Modified: trunk/reactos/drivers/net/tcpip/include/router.h Modified: trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c _____ Modified: trunk/reactos/drivers/net/tcpip/include/precomp.h --- trunk/reactos/drivers/net/tcpip/include/precomp.h 2006-01-07 07:40:14 UTC (rev 20656) +++ trunk/reactos/drivers/net/tcpip/include/precomp.h 2006-01-07 07:56:55 UTC (rev 20657) @@ -1,6 +1,8 @@ #include <roscfg.h> #include <limits.h> #include <ntddk.h> +#include <tdi.h> +#include <tdistat.h> #include <../recmutex/recmutex.h> #include <roscfg.h> #include <tcpip.h> _____ Modified: trunk/reactos/drivers/net/tcpip/include/router.h --- trunk/reactos/drivers/net/tcpip/include/router.h 2006-01-07 07:40:14 UTC (rev 20656) +++ trunk/reactos/drivers/net/tcpip/include/router.h 2006-01-07 07:56:55 UTC (rev 20657) @@ -43,7 +43,7 @@ NTSTATUS RouterShutdown( VOID); -UINT CountFIBs(); +UINT CountFIBs(VOID); UINT CopyFIBs( PFIB_ENTRY Target ); _____ Modified: trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c --- trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c 2006-01-07 07:40:14 UTC (rev 20656) +++ trunk/reactos/drivers/net/tcpip/recmutex/recmutex.c 2006-01-07 07:56:55 UTC (rev 20657) @@ -11,7 +11,7 @@ /* NOTE: When we leave, the FAST_MUTEX must have been released. The result * is that we always exit in the same irql as entering */ -UINT RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToWrite ) { +SIZE_T RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToWrite ) { NTSTATUS Status = STATUS_SUCCESS; PVOID CurrentThread = KeGetCurrentThread(); _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c --- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2006-01-07 07:40:14 UTC (rev 20656) +++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2006-01-07 07:56:55 UTC (rev 20657) @@ -160,7 +160,7 @@ DispCancelComplete(DisType->FileObject); } -VOID DDKAPI DispCancelRequest( +VOID NTAPI DispCancelRequest( PDEVICE_OBJECT Device, PIRP Irp) /* @@ -245,7 +245,7 @@ } -VOID DDKAPI DispCancelListenRequest( +VOID NTAPI DispCancelListenRequest( PDEVICE_OBJECT Device, PIRP Irp) /* _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c --- trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c 2006-01-07 07:40:14 UTC (rev 20656) +++ trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c 2006-01-07 07:56:55 UTC (rev 20657) @@ -16,7 +16,6 @@ TDI_STATUS InfoTdiQueryGetAddrTable( PNDIS_BUFFER Buffer, PUINT BufferSize ) { - IF_LIST_ITER(CurrentIF); TDI_STATUS Status = TDI_INVALID_REQUEST; KIRQL OldIrql; UINT Count = 0; @@ -24,6 +23,7 @@ PIPADDR_ENTRY IpAddress = ExAllocatePool( NonPagedPool, sizeof( IPADDR_ENTRY ) * IfCount ); PIPADDR_ENTRY IpCurrent = IpAddress; + IF_LIST_ITER(CurrentIF); TI_DbgPrint(DEBUG_INFO, ("Called.\n")); @@ -66,8 +66,8 @@ TDI_STATUS InfoTdiQueryGetRouteTable( PNDIS_BUFFER Buffer, PUINT BufferSize ) { TDI_STATUS Status; KIRQL OldIrql; - UINT RtCount = CountFIBs(), - Size = sizeof( IPROUTE_ENTRY ) * RtCount; + UINT RtCount = CountFIBs(); + UINT Size = sizeof( IPROUTE_ENTRY ) * RtCount; PFIB_ENTRY RCache = ExAllocatePool( NonPagedPool, sizeof( FIB_ENTRY ) * RtCount ), RCacheCur = RCache; @@ -142,7 +142,7 @@ PUINT BufferSize ) { IPSNMP_INFO SnmpInfo; UINT IfCount = CountInterfaces(); - UINT RouteCount = CountFIBs( NULL ); + UINT RouteCount = CountFIBs(); TDI_STATUS Status = TDI_INVALID_REQUEST; TI_DbgPrint(DEBUG_INFO, ("Called.\n"));

1 0

[ion] 20656: - Do not generate manifest files for drivers or native apps.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Do not generate manifest files for drivers or native apps. - Get portcls to compile. - Commit some fixes I forgot. Modified: trunk/reactos/drivers/multimedia/portcls/portcls.c Modified: trunk/reactos/drivers/multimedia/portcls/portcls.h Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h Modified: trunk/reactos/drivers/net/tcpip/include/udp.h Modified: trunk/reactos/drivers/net/tcpip/recmutex/recmutex.h Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/drivers/multimedia/portcls/portcls.c --- trunk/reactos/drivers/multimedia/portcls/portcls.c 2006-01-07 07:33:08 UTC (rev 20655) +++ trunk/reactos/drivers/multimedia/portcls/portcls.c 2006-01-07 07:40:14 UTC (rev 20656) @@ -42,8 +42,8 @@ /* * @implemented */ -DWORD STDCALL -DllInitialize(DWORD Unknown) +ULONG STDCALL +DllInitialize(ULONG Unknown) { return 0; } @@ -51,7 +51,7 @@ /* * @implemented */ -DWORD STDCALL +ULONG STDCALL DllUnload(VOID) { return 0; @@ -63,11 +63,11 @@ */ NTSTATUS STDCALL PcAddAdapterDevice( - DWORD DriverObject, - DWORD PhysicalDeviceObject, - DWORD StartDevice, - DWORD MaxObjects, - DWORD DeviceExtensionSize + ULONG DriverObject, + ULONG PhysicalDeviceObject, + ULONG StartDevice, + ULONG MaxObjects, + ULONG DeviceExtensionSize ) { UNIMPLEMENTED; @@ -79,9 +79,9 @@ */ NTSTATUS STDCALL PcAddContentHandlers( - DWORD ContentId, - DWORD paHandlers, - DWORD NumHandlers + ULONG ContentId, + ULONG paHandlers, + ULONG NumHandlers ) { UNIMPLEMENTED; @@ -93,9 +93,9 @@ */ NTSTATUS STDCALL PcCompleteIrp( - DWORD DeviceObject, - DWORD Irp, - DWORD Status + ULONG DeviceObject, + ULONG Irp, + ULONG Status ) { UNIMPLEMENTED; @@ -107,8 +107,8 @@ */ NTSTATUS STDCALL PcCompletePendingPropertyRequest( - DWORD PropertyRequest, - DWORD NtStatus + ULONG PropertyRequest, + ULONG NtStatus ) { UNIMPLEMENTED; @@ -120,9 +120,9 @@ */ NTSTATUS STDCALL PcCreateContentMixed( - DWORD paContentId, - DWORD cContentId, - DWORD pMixedContentId + ULONG paContentId, + ULONG cContentId, + ULONG pMixedContentId ) { UNIMPLEMENTED; @@ -134,7 +134,7 @@ */ NTSTATUS STDCALL PcDestroyContent( - DWORD ContentId + ULONG ContentId ) { UNIMPLEMENTED; @@ -146,8 +146,8 @@ */ NTSTATUS STDCALL PcDispatchIrp( - DWORD DeviceObject, - DWORD Irp + ULONG DeviceObject, + ULONG Irp ) { UNIMPLEMENTED; @@ -159,9 +159,9 @@ */ NTSTATUS STDCALL PcForwardContentToDeviceObject( - DWORD ContentId, - DWORD Reserved, - DWORD DrmForward + ULONG ContentId, + ULONG Reserved, + ULONG DrmForward ) { UNIMPLEMENTED; @@ -173,8 +173,8 @@ */ NTSTATUS STDCALL PcForwardContentToFileObject( - DWORD ContentId, - DWORD FileObject + ULONG ContentId, + ULONG FileObject ) { UNIMPLEMENTED; @@ -186,9 +186,9 @@ */ NTSTATUS STDCALL PcForwardContentToInterface( - DWORD ContentId, - DWORD Unknown, - DWORD NumMethods + ULONG ContentId, + ULONG Unknown, + ULONG NumMethods ) { UNIMPLEMENTED; @@ -200,8 +200,8 @@ */ NTSTATUS STDCALL PcForwardIrpSynchronous( - DWORD DeviceObject, - DWORD Irp + ULONG DeviceObject, + ULONG Irp ) { UNIMPLEMENTED; @@ -213,8 +213,8 @@ */ NTSTATUS STDCALL PcGetContentRights( - DWORD ContentId, - DWORD DrmRights + ULONG ContentId, + ULONG DrmRights ) { UNIMPLEMENTED; @@ -226,11 +226,11 @@ */ NTSTATUS STDCALL PcGetDeviceProperty( - DWORD DeviceObject, - DWORD DeviceProperty, - DWORD BufferLength, - DWORD PropertyBuffer, - DWORD ResultLength + ULONG DeviceObject, + ULONG DeviceProperty, + ULONG BufferLength, + ULONG PropertyBuffer, + ULONG ResultLength ) { UNIMPLEMENTED; @@ -257,9 +257,9 @@ */ NTSTATUS STDCALL PcInitializeAdapterDriver( - DWORD DriverObject, - DWORD RegistryPathName, - DWORD AddDevice + ULONG DriverObject, + ULONG RegistryPathName, + ULONG AddDevice ) { UNIMPLEMENTED; @@ -271,11 +271,11 @@ */ NTSTATUS STDCALL PcNewDmaChannel( - DWORD OutDmaChannel, - DWORD Unknown, - DWORD PoolType, - DWORD DeviceDescription, - DWORD DeviceObject + ULONG OutDmaChannel, + ULONG Unknown, + ULONG PoolType, + ULONG DeviceDescription, + ULONG DeviceObject ) { UNIMPLEMENTED; @@ -287,11 +287,11 @@ */ NTSTATUS STDCALL PcNewInterruptSync( - DWORD OutInterruptSync, - DWORD Unknown, - DWORD ResourceList, - DWORD ResourceIndex, - DWORD Mode + ULONG OutInterruptSync, + ULONG Unknown, + ULONG ResourceList, + ULONG ResourceIndex, + ULONG Mode ) { UNIMPLEMENTED; @@ -303,8 +303,8 @@ */ NTSTATUS STDCALL PcNewMiniport( - DWORD OutMiniport, - DWORD ClassId + ULONG OutMiniport, + ULONG ClassId ) { UNIMPLEMENTED; @@ -316,8 +316,8 @@ */ NTSTATUS STDCALL PcNewPort( - DWORD OutPort, - DWORD ClassId + ULONG OutPort, + ULONG ClassId ) { UNIMPLEMENTED; @@ -329,15 +329,15 @@ */ NTSTATUS STDCALL PcNewRegistryKey( - DWORD OutRegistryKey, - DWORD Unknown, - DWORD RegistryKeyType, - DWORD DesiredAccess, - DWORD DeviceObject, - DWORD SubDevice, - DWORD ObjectAttributes, - DWORD CreateOptions, - DWORD Disposition + ULONG OutRegistryKey, + ULONG Unknown, + ULONG RegistryKeyType, + ULONG DesiredAccess, + ULONG DeviceObject, + ULONG SubDevice, + ULONG ObjectAttributes, + ULONG CreateOptions, + ULONG Disposition ) { UNIMPLEMENTED; @@ -349,11 +349,11 @@ */ NTSTATUS STDCALL PcNewResourceList( - DWORD OutResourceList, - DWORD Unknown, - DWORD PoolType, - DWORD TranslatedResources, - DWORD UntranslatedResources + ULONG OutResourceList, + ULONG Unknown, + ULONG PoolType, + ULONG TranslatedResources, + ULONG UntranslatedResources ) { UNIMPLEMENTED; @@ -365,11 +365,11 @@ */ NTSTATUS STDCALL PcNewResourceSublist( - DWORD OutResourceList, - DWORD Unknown, - DWORD PoolType, - DWORD ParentList, - DWORD MaximumEntries + ULONG OutResourceList, + ULONG Unknown, + ULONG PoolType, + ULONG ParentList, + ULONG MaximumEntries ) { UNIMPLEMENTED; @@ -381,8 +381,8 @@ */ NTSTATUS STDCALL PcNewServiceGroup( - DWORD OutServiceGroup, - DWORD Unknown + ULONG OutServiceGroup, + ULONG Unknown ) { UNIMPLEMENTED; @@ -394,8 +394,8 @@ */ NTSTATUS STDCALL PcRegisterAdapterPowerManagement( - DWORD Unknown, - DWORD pvContext + ULONG Unknown, + ULONG pvContext ) { UNIMPLEMENTED; @@ -407,9 +407,9 @@ */ NTSTATUS STDCALL PcRegisterIoTimeout( - DWORD pDeviceObject, - DWORD pTimerRoutine, - DWORD pContext + ULONG pDeviceObject, + ULONG pTimerRoutine, + ULONG pContext ) { UNIMPLEMENTED; @@ -421,11 +421,11 @@ */ NTSTATUS STDCALL PcRegisterPhysicalConnection( - DWORD DeviceObject, - DWORD FromUnknown, - DWORD FromPin, - DWORD ToUnknown, - DWORD ToPin + ULONG DeviceObject, + ULONG FromUnknown, + ULONG FromPin, + ULONG ToUnknown, + ULONG ToPin ) { UNIMPLEMENTED; @@ -437,11 +437,11 @@ */ NTSTATUS STDCALL PcRegisterPhysicalConnectionFromExternal( - DWORD DeviceObject, - DWORD FromString, - DWORD FromPin, - DWORD ToUnknown, - DWORD ToPin + ULONG DeviceObject, + ULONG FromString, + ULONG FromPin, + ULONG ToUnknown, + ULONG ToPin ) { UNIMPLEMENTED; @@ -453,11 +453,11 @@ */ NTSTATUS STDCALL PcRegisterPhysicalConnectionToExternal( - DWORD DeviceObject, - DWORD FromUnknown, - DWORD FromPin, - DWORD ToString, - DWORD ToPin + ULONG DeviceObject, + ULONG FromUnknown, + ULONG FromPin, + ULONG ToString, + ULONG ToPin ) { UNIMPLEMENTED; @@ -469,9 +469,9 @@ */ NTSTATUS STDCALL PcRegisterSubdevice( - DWORD DeviceObject, - DWORD SubdevName, - DWORD Unknown + ULONG DeviceObject, + ULONG SubdevName, + ULONG Unknown ) { UNIMPLEMENTED; @@ -483,8 +483,8 @@ */ NTSTATUS STDCALL PcRequestNewPowerState( - DWORD pDeviceObject, - DWORD RequestedNewState + ULONG pDeviceObject, + ULONG RequestedNewState ) { UNIMPLEMENTED; @@ -496,9 +496,9 @@ */ NTSTATUS STDCALL PcUnregisterIoTimeout( - DWORD pDeviceObject, - DWORD pTimerRoutine, - DWORD pContext + ULONG pDeviceObject, + ULONG pTimerRoutine, + ULONG pContext ) { UNIMPLEMENTED; _____ Modified: trunk/reactos/drivers/multimedia/portcls/portcls.h --- trunk/reactos/drivers/multimedia/portcls/portcls.h 2006-01-07 07:33:08 UTC (rev 20655) +++ trunk/reactos/drivers/multimedia/portcls/portcls.h 2006-01-07 07:40:14 UTC (rev 20656) @@ -13,96 +13,98 @@ extern "C" { #endif +/* This header is total bull**** */ + #include <ntddk.h> #define PORTCLASSAPI extern PORTCLASSAPI NTSTATUS STDCALL PcAddAdapterDevice( - DWORD DriverObject, - DWORD PhysicalDeviceObject, - DWORD StartDevice, - DWORD MaxObjects, - DWORD DeviceExtensionSize + ULONG DriverObject, + ULONG PhysicalDeviceObject, + ULONG StartDevice, + ULONG MaxObjects, + ULONG DeviceExtensionSize ); PORTCLASSAPI NTSTATUS STDCALL PcAddContentHandlers( - DWORD ContentId, - DWORD paHandlers, - DWORD NumHandlers + ULONG ContentId, + ULONG paHandlers, + ULONG NumHandlers ); PORTCLASSAPI NTSTATUS STDCALL PcCompleteIrp( - DWORD DeviceObject, - DWORD Irp, - DWORD Status + ULONG DeviceObject, + ULONG Irp, + ULONG Status ); PORTCLASSAPI NTSTATUS STDCALL PcCompletePendingPropertyRequest( - DWORD PropertyRequest, - DWORD NtStatus + ULONG PropertyRequest, + ULONG NtStatus ); PORTCLASSAPI NTSTATUS STDCALL PcCreateContentMixed( - DWORD paContentId, - DWORD cContentId, - DWORD pMixedContentId + ULONG paContentId, + ULONG cContentId, + ULONG pMixedContentId ); PORTCLASSAPI NTSTATUS STDCALL PcDestroyContent( - DWORD ContentId + ULONG ContentId ); PORTCLASSAPI NTSTATUS STDCALL PcDispatchIrp( - DWORD DeviceObject, - DWORD Irp + ULONG DeviceObject, + ULONG Irp ); PORTCLASSAPI NTSTATUS STDCALL PcForwardContentToDeviceObject( - DWORD ContentId, - DWORD Reserved, - DWORD DrmForward + ULONG ContentId, + ULONG Reserved, + ULONG DrmForward ); PORTCLASSAPI NTSTATUS STDCALL PcForwardContentToFileObject( - DWORD ContentId, - DWORD FileObject + ULONG ContentId, + ULONG FileObject ); PORTCLASSAPI NTSTATUS STDCALL PcForwardContentToInterface( - DWORD ContentId, - DWORD Unknown, - DWORD NumMethods + ULONG ContentId, + ULONG Unknown, + ULONG NumMethods ); PORTCLASSAPI NTSTATUS STDCALL PcForwardIrpSynchronous( - DWORD DeviceObject, - DWORD Irp + ULONG DeviceObject, + ULONG Irp ); PORTCLASSAPI NTSTATUS STDCALL PcGetContentRights( - DWORD ContentId, - DWORD DrmRights + ULONG ContentId, + ULONG DrmRights ); PORTCLASSAPI NTSTATUS STDCALL PcGetDeviceProperty( - DWORD DeviceObject, - DWORD DeviceProperty, - DWORD BufferLength, - DWORD PropertyBuffer, - DWORD ResultLength + ULONG DeviceObject, + ULONG DeviceProperty, + ULONG BufferLength, + ULONG PropertyBuffer, + ULONG ResultLength ); PORTCLASSAPI ULONGLONG STDCALL @@ -112,136 +114,136 @@ PORTCLASSAPI NTSTATUS STDCALL PcInitializeAdapterDriver( - DWORD DriverObject, - DWORD RegistryPathName, - DWORD AddDevice + ULONG DriverObject, + ULONG RegistryPathName, + ULONG AddDevice ); PORTCLASSAPI NTSTATUS STDCALL PcNewDmaChannel( - DWORD OutDmaChannel, - DWORD Unknown, - DWORD PoolType, - DWORD DeviceDescription, - DWORD DeviceObject + ULONG OutDmaChannel, + ULONG Unknown, + ULONG PoolType, + ULONG DeviceDescription, + ULONG DeviceObject ); PORTCLASSAPI NTSTATUS STDCALL PcNewInterruptSync( - DWORD OutInterruptSync, - DWORD Unknown, - DWORD ResourceList, - DWORD ResourceIndex, - DWORD Mode + ULONG OutInterruptSync, + ULONG Unknown, + ULONG ResourceList, + ULONG ResourceIndex, + ULONG Mode ); PORTCLASSAPI NTSTATUS STDCALL PcNewMiniport( - DWORD OutMiniport, - DWORD ClassId + ULONG OutMiniport, + ULONG ClassId ); PORTCLASSAPI NTSTATUS STDCALL PcNewPort( - DWORD OutPort, - DWORD ClassId + ULONG OutPort, + ULONG ClassId ); PORTCLASSAPI NTSTATUS STDCALL PcNewRegistryKey( - DWORD OutRegistryKey, - DWORD Unknown, - DWORD RegistryKeyType, - DWORD DesiredAccess, - DWORD DeviceObject, - DWORD SubDevice, - DWORD ObjectAttributes, - DWORD CreateOptions, - DWORD Disposition + ULONG OutRegistryKey, + ULONG Unknown, + ULONG RegistryKeyType, + ULONG DesiredAccess, + ULONG DeviceObject, + ULONG SubDevice, + ULONG ObjectAttributes, + ULONG CreateOptions, + ULONG Disposition ); PORTCLASSAPI NTSTATUS STDCALL PcNewResourceList( - DWORD OutResourceList, - DWORD Unknown, - DWORD PoolType, - DWORD TranslatedResources, - DWORD UntranslatedResources + ULONG OutResourceList, + ULONG Unknown, + ULONG PoolType, + ULONG TranslatedResources, + ULONG UntranslatedResources ); PORTCLASSAPI NTSTATUS STDCALL PcNewResourceSublist( - DWORD OutResourceList, - DWORD Unknown, - DWORD PoolType, - DWORD ParentList, - DWORD MaximumEntries + ULONG OutResourceList, + ULONG Unknown, + ULONG PoolType, + ULONG ParentList, + ULONG MaximumEntries ); PORTCLASSAPI NTSTATUS STDCALL PcNewServiceGroup( - DWORD OutServiceGroup, - DWORD Unknown + ULONG OutServiceGroup, + ULONG Unknown ); PORTCLASSAPI NTSTATUS STDCALL PcRegisterAdapterPowerManagement( - DWORD Unknown, - DWORD pvContext + ULONG Unknown, + ULONG pvContext ); PORTCLASSAPI NTSTATUS STDCALL PcRegisterIoTimeout( - DWORD pDeviceObject, - DWORD pTimerRoutine, - DWORD pContext + ULONG pDeviceObject, + ULONG pTimerRoutine, + ULONG pContext ); PORTCLASSAPI NTSTATUS STDCALL PcRegisterPhysicalConnection( - DWORD DeviceObject, - DWORD FromUnknown, - DWORD FromPin, - DWORD ToUnknown, - DWORD ToPin + ULONG DeviceObject, + ULONG FromUnknown, + ULONG FromPin, + ULONG ToUnknown, + ULONG ToPin ); PORTCLASSAPI NTSTATUS STDCALL PcRegisterPhysicalConnectionFromExternal( - DWORD DeviceObject, - DWORD FromString, - DWORD FromPin, - DWORD ToUnknown, - DWORD ToPin + ULONG DeviceObject, + ULONG FromString, + ULONG FromPin, + ULONG ToUnknown, + ULONG ToPin ); PORTCLASSAPI NTSTATUS STDCALL PcRegisterPhysicalConnectionToExternal( - DWORD DeviceObject, - DWORD FromUnknown, - DWORD FromPin, - DWORD ToString, - DWORD ToPin + ULONG DeviceObject, + ULONG FromUnknown, + ULONG FromPin, + ULONG ToString, + ULONG ToPin ); PORTCLASSAPI NTSTATUS STDCALL PcRegisterSubdevice( - DWORD DeviceObject, - DWORD SubdevName, - DWORD Unknown + ULONG DeviceObject, + ULONG SubdevName, + ULONG Unknown ); PORTCLASSAPI NTSTATUS STDCALL PcRequestNewPowerState( - DWORD pDeviceObject, - DWORD RequestedNewState + ULONG pDeviceObject, + ULONG RequestedNewState ); PORTCLASSAPI NTSTATUS STDCALL PcUnregisterIoTimeout( - DWORD pDeviceObject, - DWORD pTimerRoutine, - DWORD pContext + ULONG pDeviceObject, + ULONG pTimerRoutine, + ULONG pContext ); #ifdef __cplusplus _____ Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h --- trunk/reactos/drivers/net/tcpip/include/tcp.h 2006-01-07 07:33:08 UTC (rev 20655) +++ trunk/reactos/drivers/net/tcpip/include/tcp.h 2006-01-07 07:40:14 UTC (rev 20656) @@ -11,6 +11,7 @@ (*PTCP_COMPLETION_ROUTINE)( PVOID Context, NTSTATUS Status, ULONG Count ); /* TCPv4 header structure */ +#include <pshpack1.h> typedef struct TCPv4_HEADER { USHORT SourcePort; /* Source port */ USHORT DestinationPort; /* Destination port */ @@ -21,7 +22,7 @@ USHORT Window; /* Maximum acceptable receive window */ USHORT Checksum; /* Checksum of segment */ USHORT Urgent; /* Pointer to urgent data */ -} __attribute__((packed)) TCPv4_HEADER, *PTCPv4_HEADER; +} TCPv4_HEADER, *PTCPv4_HEADER; /* TCPv4 header flags */ #define TCP_URG 0x20 @@ -49,7 +50,8 @@ UCHAR Zero; /* Reserved */ UCHAR Protocol; /* Protocol */ USHORT TCPLength; /* Size of TCP segment */ -} __attribute__((packed)) TCPv4_PSEUDO_HEADER, *PTCPv4_PSEUDO_HEADER; +} TCPv4_PSEUDO_HEADER, *PTCPv4_PSEUDO_HEADER; +#include <poppack.h> typedef struct _SLEEPING_THREAD { LIST_ENTRY Entry; _____ Modified: trunk/reactos/drivers/net/tcpip/include/udp.h --- trunk/reactos/drivers/net/tcpip/include/udp.h 2006-01-07 07:33:08 UTC (rev 20655) +++ trunk/reactos/drivers/net/tcpip/include/udp.h 2006-01-07 07:40:14 UTC (rev 20656) @@ -11,12 +11,13 @@ #define UDP_DYNAMIC_PORTS 0x8000 /* UDPv4 header structure */ +#include <pshpack1.h> typedef struct UDP_HEADER { USHORT SourcePort; /* Source port */ USHORT DestPort; /* Destination port */ USHORT Length; /* Size of header and data */ USHORT Checksum; /* Checksum of datagram */ -} __attribute__((packed)) UDP_HEADER, *PUDP_HEADER; +} UDP_HEADER, *PUDP_HEADER; /* UDPv4 pseudo header */ typedef struct UDP_PSEUDO_HEADER { @@ -25,9 +26,9 @@ UCHAR Zero; /* Reserved */ UCHAR Protocol; /* Protocol */ USHORT UDPLength; /* Size of UDP datagram */ -} __attribute__((packed)) UDP_PSEUDO_HEADER, *PUDP_PSEUDO_HEADER; +} UDP_PSEUDO_HEADER, *PUDP_PSEUDO_HEADER; +#include <poppack.h> - typedef struct UDP_STATISTICS { ULONG InputDatagrams; ULONG NumPorts; _____ Modified: trunk/reactos/drivers/net/tcpip/recmutex/recmutex.h --- trunk/reactos/drivers/net/tcpip/recmutex/recmutex.h 2006-01-07 07:33:08 UTC (rev 20655) +++ trunk/reactos/drivers/net/tcpip/recmutex/recmutex.h 2006-01-07 07:40:14 UTC (rev 20656) @@ -5,7 +5,7 @@ /* Lock. */ FAST_MUTEX Mutex; /* Number of times this object was locked */ - UINT LockCount; + SIZE_T LockCount; /* CurrentThread */ PVOID CurrentThread; /* Notification event which signals that another thread can take over */ @@ -21,7 +21,7 @@ } RECURSIVE_MUTEX, *PRECURSIVE_MUTEX; extern VOID RecursiveMutexInit( PRECURSIVE_MUTEX RecMutex ); -extern UINT RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToRead ); +extern SIZE_T RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToRead ); extern VOID RecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ); #endif/*_ROSRTL_RECMUTEX_H*/ _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-07 07:33:08 UTC (rev 20655) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-07 07:40:14 UTC (rev 20656) @@ -388,6 +388,7 @@ { fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DriverEntry" : module.entrypoint.c_str ()); @@ -399,6 +400,7 @@ { fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SECTION:INIT,D /ALIGN:0x80\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" ); @@ -408,6 +410,7 @@ { fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20\"\r\n" ); fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 1 ); + fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" ); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ());

1 0

[ion] 20655: - Get oskittcp to compile on msvc.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get oskittcp to compile on msvc. Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h Modified: trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h 2006-01-07 07:08:08 UTC (rev 20654) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h 2006-01-07 07:33:08 UTC (rev 20655) @@ -177,7 +177,7 @@ static int splhigh() { return 0; } static int splimp() { return 0; } static int splnet() { return 0; } -static int splx() { return 0; } +static int splx(x) { return 0; } static int splclock() { return 0; } #elif defined(__GNUC__) _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h 2006-01-07 07:08:08 UTC (rev 20654) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h 2006-01-07 07:33:08 UTC (rev 20655) @@ -62,9 +62,4 @@ char *rindex __P((const char *, int)); int scanc __P((u_int, u_char *, u_char *, int)); int skpc __P((int, int, char *)); -char *strcat __P((char *, const char *)); -int strcmp __P((const char *, const char *)); -char *strcpy __P((char *, const char *)); -size_t strlen __P((const char *)); -int strncmp __P((const char *, const char *, size_t)); -char *strncpy __P((char *, const char *, size_t)); + _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h 2006-01-07 07:08:08 UTC (rev 20654) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h 2006-01-07 07:33:08 UTC (rev 20655) @@ -114,7 +114,7 @@ void *hashinit __P((int count, int type, u_long *hashmask)); void *phashinit __P((int count, int type, u_long *nentries)); -__dead void panic __P((const char *, ...)) __dead2; +//__dead void panic __P((const char *, ...)) __dead2; __dead void boot __P((int)) __dead2; void tablefull __P((const char *)); void addlog __P((const char *, ...)); @@ -126,7 +126,7 @@ #include <oskitdebug.h> -int __cdecl vprintf(const char *, va_list); +//int __cdecl vprintf(const char *, va_list); #define log bsd_log static __inline int bsd_log ( int blah, const char* fmt, ... ) _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h --- trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h 2006-01-07 07:08:08 UTC (rev 20654) +++ trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h 2006-01-07 07:33:08 UTC (rev 20655) @@ -12,7 +12,6 @@ #define printf DbgPrint #define vprintf DbgVPrint #define ovbcopy(x,y,z) bcopy(x,y,z) -void *memset( void *dest, int c, size_t count ); #define bzero(x,y) memset(x,0,y) #define bcopy(src,dst,n) memcpy(dst,src,n) #ifdef _MSC_VER _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2006-01-07 07:08:08 UTC (rev 20654) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2006-01-07 07:33:08 UTC (rev 20655) @@ -30,7 +30,6 @@ struct timeval boottime; void clock_init(); -int isprint(int c); int _snprintf(char * buf, size_t cnt, const char *fmt, ...); void *fbsd_malloc( unsigned int bytes, char *file, unsigned line, ... ) {

1 0

[ion] 20654: - Get IP to compile.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get IP to compile. Modified: trunk/reactos/drivers/lib/ip/network/i386/checksum.S Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c _____ Modified: trunk/reactos/drivers/lib/ip/network/i386/checksum.S --- trunk/reactos/drivers/lib/ip/network/i386/checksum.S 2006-01-07 07:00:31 UTC (rev 20653) +++ trunk/reactos/drivers/lib/ip/network/i386/checksum.S 2006-01-07 07:08:08 UTC (rev 20654) @@ -57,7 +57,7 @@ testl $1, %esi # Check alignment. jz 10f # Jump if alignment is boundary of 2bytes. - # buf is odd + // buf is odd dec %ecx jl 8f movzbl (%esi), %ebx _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c --- trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2006-01-07 07:00:31 UTC (rev 20653) +++ trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2006-01-07 07:08:08 UTC (rev 20654) @@ -376,7 +376,7 @@ * 800, 1000 and process the "fast" events at 200, 400, 600, 800, 1000 and the * "slow" events at 500 and 1000. */ -static VOID DDKAPI +static VOID NTAPI TimerThread(PVOID Context) { LARGE_INTEGER Timeout;

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
59
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 January 2006