Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 20667: increased buffer size to max needed size
by cwittich＠svn.reactos.org 07 Jan '06

07 Jan '06

increased buffer size to max needed size replaced _stprintf with _sntprintf Modified: trunk/reactos/subsys/system/servman/query.c _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-07 19:28:04 UTC (rev 20666) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-07 19:54:50 UTC (rev 20667) @@ -39,7 +39,7 @@ { HICON hiconItem; /* icon for list-view items */ HIMAGELIST hSmall; /* image list for other views */ - TCHAR buf[256]; + TCHAR buf[300]; /* Create the icon image lists */ hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), @@ -53,7 +53,7 @@ /* set the number of services in the status bar */ LoadString(hInstance, IDS_SERVICES_NUM_SERVICES, szNumServices, 32); - _stprintf(buf, szNumServices, NumServices); + _sntprintf(buf, 300, szNumServices, NumServices); SendMessage(hStatus, SB_SETTEXT, 0, (LPARAM)buf); @@ -67,7 +67,7 @@ DWORD dwValueSize; /* open the registry key for the service */ - _stprintf(buf, _T("System\\CurrentControlSet\\Services\\%s"), + _sntprintf(buf, 300, _T("System\\CurrentControlSet\\Services\\%s"), pServiceStatus[Index].lpServiceName); if( RegOpenKeyEx(HKEY_LOCAL_MACHINE,

1 0

[fireball] 20666: USB 2.6 Upgrading branch
by fireball＠svn.reactos.org 07 Jan '06

07 Jan '06

USB 2.6 Upgrading branch Added: branches/usb2_6/ _____ Copied: branches/usb2_6 (from rev 20457, trunk)

1 0

[gedmurphy] 20665: Fix a buffer overflow. Thanks to Christoph for spotting this.
by gedmurphy＠svn.reactos.org 07 Jan '06

07 Jan '06

Fix a buffer overflow. Thanks to Christoph for spotting this. Modified: trunk/reactos/subsys/system/servman/query.c _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-07 18:53:26 UTC (rev 20664) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-07 19:14:03 UTC (rev 20665) @@ -39,7 +39,7 @@ { HICON hiconItem; /* icon for list-view items */ HIMAGELIST hSmall; /* image list for other views */ - TCHAR buf[40]; + TCHAR buf[256]; /* Create the icon image lists */ hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), @@ -85,14 +85,8 @@ ZeroMemory(&item, sizeof(LV_ITEM)); item.mask = LVIF_TEXT; - 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.iItem = ListView_InsertItem(hListView, &item); @@ -137,7 +131,12 @@ HeapFree(GetProcessHeap(), 0, Description); } - + else + { + item.pszText = '\0'; + item.iSubItem = 1; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } /* set the status */

1 0

[jimtabor] 20664: Thx Filip, for pointing this out. Added the missing break, if wState did not get set to CBF_EDIT.
by jimtabor＠svn.reactos.org 07 Jan '06

07 Jan '06

Thx Filip, for pointing this out. Added the missing break, if wState did not get set to CBF_EDIT. Modified: trunk/reactos/lib/user32/controls/combo.c _____ Modified: trunk/reactos/lib/user32/controls/combo.c --- trunk/reactos/lib/user32/controls/combo.c 2006-01-07 18:19:10 UTC (rev 20663) +++ trunk/reactos/lib/user32/controls/combo.c 2006-01-07 18:53:26 UTC (rev 20664) @@ -2314,9 +2314,10 @@ return (lphc->wState & CBF_EUI) ? TRUE : FALSE; case CB_GETCOMBOBOXINFO: return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam); - case CB_LIMITTEXT: - if( lphc->wState & CBF_EDIT ) - return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); + case CB_LIMITTEXT: + if( lphc->wState & CBF_EDIT ) + return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); + break; default: if (message >= WM_USER) WARN("unknown msg WM_USER+%04x wp=%04x lp=%08lx\n",

1 0

[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

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