Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[greatlrd] 22865: [AUDIT] after looking through code no signs of reverse engineering were found. Alot stuff taken from wine, it contain hard code string like date, contry names, that need to move to msvcrt dll rc file
by greatlrd＠svn.reactos.org 05 Jul '06

05 Jul '06

Author: greatlrd Date: Wed Jul 5 22:49:03 2006 New Revision: 22865 URL: http://svn.reactos.org/svn/reactos?rev=22865&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. Alot stuff taken from wine, it contain hard code string like date, contry names, that need to move to msvcrt dll rc file Modified: trunk/reactos/lib/crt/locale/locale.c (props changed) Propchange: trunk/reactos/lib/crt/locale/locale.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 22864: [AUDIT] after looking through code no signs of reverse engineering were found. Almost all code is from djgpp, few functions is from us.
by greatlrd＠svn.reactos.org 05 Jul '06

05 Jul '06

Author: greatlrd Date: Wed Jul 5 22:43:17 2006 New Revision: 22864 URL: http://svn.reactos.org/svn/reactos?rev=22864&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. Almost all code is from djgpp, few functions is from us. Modified: trunk/reactos/lib/crt/time/clock.c (props changed) trunk/reactos/lib/crt/time/ctime.c (props changed) trunk/reactos/lib/crt/time/difftime.c (props changed) trunk/reactos/lib/crt/time/ftime.c (props changed) trunk/reactos/lib/crt/time/posixrul.h (props changed) trunk/reactos/lib/crt/time/strdate.c (props changed) trunk/reactos/lib/crt/time/strftime.c (props changed) trunk/reactos/lib/crt/time/strtime.c (props changed) trunk/reactos/lib/crt/time/time.c (props changed) trunk/reactos/lib/crt/time/tz_vars.c (props changed) trunk/reactos/lib/crt/time/tzfile.h (props changed) trunk/reactos/lib/crt/time/wctime.c (props changed) trunk/reactos/lib/crt/time/wstrdate.c (props changed) trunk/reactos/lib/crt/time/wstrtime.c (props changed) Propchange: trunk/reactos/lib/crt/time/clock.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/ctime.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/difftime.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/ftime.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/posixrul.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/strdate.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/strftime.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/strtime.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/time.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/tz_vars.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/tzfile.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/wctime.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/wstrdate.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/time/wstrtime.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 22863: [AUDIT] after looking through code no signs of reverse engineering were found.
by greatlrd＠svn.reactos.org 05 Jul '06

05 Jul '06

Author: greatlrd Date: Wed Jul 5 22:36:44 2006 New Revision: 22863 URL: http://svn.reactos.org/svn/reactos?rev=22863&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. Modified: trunk/reactos/lib/crt/except/abnorter.c (props changed) trunk/reactos/lib/crt/except/exhand2.c (props changed) trunk/reactos/lib/crt/except/matherr.c (props changed) trunk/reactos/lib/crt/except/seh.s (props changed) trunk/reactos/lib/crt/except/unwind.c (props changed) trunk/reactos/lib/crt/except/xcptfil.c (props changed) Propchange: trunk/reactos/lib/crt/except/abnorter.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/except/exhand2.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/except/matherr.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/except/seh.s ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/except/unwind.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/except/xcptfil.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 22862: [AUDIT] after looking through code no signs of reverse engineering were found, and most code is base on djgpp
by greatlrd＠svn.reactos.org 05 Jul '06

05 Jul '06

Author: greatlrd Date: Wed Jul 5 22:34:01 2006 New Revision: 22862 URL: http://svn.reactos.org/svn/reactos?rev=22862&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found, and most code is base on djgpp Modified: trunk/reactos/lib/crt/direct/chdir.c (props changed) trunk/reactos/lib/crt/direct/chdrive.c (props changed) trunk/reactos/lib/crt/direct/getcwd.c (props changed) trunk/reactos/lib/crt/direct/getdcwd.c (props changed) trunk/reactos/lib/crt/direct/getdfree.c (props changed) trunk/reactos/lib/crt/direct/getdrive.c (props changed) trunk/reactos/lib/crt/direct/mkdir.c (props changed) trunk/reactos/lib/crt/direct/rmdir.c (props changed) trunk/reactos/lib/crt/direct/wchdir.c (props changed) trunk/reactos/lib/crt/direct/wgetcwd.c (props changed) trunk/reactos/lib/crt/direct/wgetdcwd.c (props changed) trunk/reactos/lib/crt/direct/wmkdir.c (props changed) trunk/reactos/lib/crt/direct/wrmdir.c (props changed) Propchange: trunk/reactos/lib/crt/direct/chdir.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/direct/chdrive.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/direct/getcwd.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/direct/getdcwd.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/direct/getdfree.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/direct/getdrive.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/direct/mkdir.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/direct/rmdir.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/direct/wchdir.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/direct/wgetcwd.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/direct/wgetdcwd.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/direct/wmkdir.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/direct/wrmdir.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 22861: clean up code and use HeapAlloc + fix memory leaks
by gedmurphy＠svn.reactos.org 05 Jul '06

05 Jul '06

Author: gedmurphy Date: Wed Jul 5 19:29:37 2006 New Revision: 22861 URL: http://svn.reactos.org/svn/reactos?rev=22861&view=rev Log: clean up code and use HeapAlloc + fix memory leaks Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c Wed Jul 5 19:29:37 2006 @@ -1,15 +1,9 @@ /* - * ReactOS Win32 Applications - * Copyright (C) 2005 ReactOS Team - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS arp utility + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL - See COPYING in the top level directory * FILE: apps/utils/net/ipconfig/ipconfig.c - * PURPOSE: - * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) - * REVISIONS: - * GM 14/09/05 Created - * + * PURPOSE: Display IP info for net adapters + * PROGRAMMERS: Copyright 2005 - 2006 Ged Murphy (gedmurphy(a)gmail.com) */ /* * TODO: @@ -17,36 +11,32 @@ * implement flushdns, registerdns, displaydns, showclassid, setclassid * allow globbing on adapter names */ + #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <stdio.h> -#include <stdlib.h> +#include <tchar.h> #include <time.h> -#include <tchar.h> -#include <string.h> -#include <ctype.h> -#include <winsock2.h> #include <iphlpapi.h> -#define UNICODE -#define _UNICODE - - +HANDLE ProcessHeap; LPCTSTR GetNodeTypeName(UINT NodeType) { - switch (NodeType) { - case 1: return _T("Broadcast"); - case 2: return _T("Peer To Peer"); - case 4: return _T("Mixed"); - case 8: return _T("Hybrid"); + switch (NodeType) + { + case 1: return _T("Broadcast"); + case 2: return _T("Peer To Peer"); + case 4: return _T("Mixed"); + case 8: return _T("Hybrid"); default : return _T("unknown"); } } LPCTSTR GetInterfaceTypeName(UINT InterfaceType) { - switch (InterfaceType) { + switch (InterfaceType) + { case MIB_IF_TYPE_OTHER: return _T("Other Type Of Adapter"); case MIB_IF_TYPE_ETHERNET: return _T("Ethernet Adapter"); case MIB_IF_TYPE_TOKENRING: return _T("Token Ring Adapter"); @@ -54,7 +44,7 @@ case MIB_IF_TYPE_PPP: return _T("PPP Adapter"); case MIB_IF_TYPE_LOOPBACK: return _T("Loopback Adapter"); case MIB_IF_TYPE_SLIP: return _T("SLIP Adapter"); - default: return _T("unknown"); + default: return _T("unknown"); } } @@ -87,62 +77,83 @@ _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); LocalFree(lpMsgBuf); - /* return number of TCHAR's stored in output buffer - * excluding '\0' - as FormatMessage does*/ return RetVal; } else return 0; } -INT ShowInfo(BOOL bAll) +VOID ShowInfo(BOOL bAll) { PIP_ADAPTER_INFO pAdapterInfo = NULL; PIP_ADAPTER_INFO pAdapter = NULL; - ULONG adaptOutBufLen; - - PFIXED_INFO pFixedInfo; - ULONG netOutBufLen; + ULONG adaptOutBufLen = 0; + + PFIXED_INFO pFixedInfo = NULL; PIP_ADDR_STRING pIPAddr = NULL; - - DWORD ErrRet = 0; + ULONG netOutBufLen = 0; + + DWORD ErrRet = 0; /* assign memory for call to GetNetworkParams */ - pFixedInfo = (FIXED_INFO *) GlobalAlloc( GPTR, sizeof( FIXED_INFO ) ); - netOutBufLen = sizeof(FIXED_INFO); + pFixedInfo = (FIXED_INFO *)HeapAlloc(ProcessHeap, 0, sizeof(FIXED_INFO)); + if (pFixedInfo == NULL) + { + _tprintf(_T("memory allocation error")); + return; + } + + /* set required buffer size */ + if(GetNetworkParams(pFixedInfo, &netOutBufLen) == ERROR_BUFFER_OVERFLOW) + { + HeapFree(ProcessHeap, 0, pFixedInfo); + pFixedInfo = (FIXED_INFO *)HeapAlloc(ProcessHeap, 0, netOutBufLen); + if (pFixedInfo == NULL) + { + _tprintf(_T("memory allocation error")); + return; + } + } + + if ((ErrRet = GetNetworkParams(pFixedInfo, &netOutBufLen)) != NO_ERROR) + { + _tprintf(_T("GetNetworkParams failed : ")); + DoFormatMessage(ErrRet); + HeapFree(ProcessHeap, 0, pFixedInfo); + return; + } + + /* assign memory for call to GetAdapterInfo */ - pAdapterInfo = (IP_ADAPTER_INFO *) malloc( sizeof(IP_ADAPTER_INFO) ); - adaptOutBufLen = sizeof(IP_ADAPTER_INFO); + pAdapterInfo = (IP_ADAPTER_INFO *)HeapAlloc(ProcessHeap, 0, sizeof(IP_ADAPTER_INFO)); + if (pAdapterInfo == NULL) + { + _tprintf(_T("memory allocation error")); + return; + } /* set required buffer size */ - if(GetNetworkParams(pFixedInfo, &netOutBufLen) == ERROR_BUFFER_OVERFLOW) - { - GlobalFree(pFixedInfo); - pFixedInfo = (FIXED_INFO *) GlobalAlloc(GPTR, netOutBufLen); - } - - /* set required buffer size */ - if (GetAdaptersInfo( pAdapterInfo, &adaptOutBufLen) == ERROR_BUFFER_OVERFLOW) - { - free(pAdapterInfo); - pAdapterInfo = (IP_ADAPTER_INFO *) malloc (adaptOutBufLen); + if (GetAdaptersInfo( pAdapterInfo, &adaptOutBufLen) == ERROR_BUFFER_OVERFLOW) + { + HeapFree(ProcessHeap, 0, pAdapterInfo); + pAdapterInfo = (IP_ADAPTER_INFO *)HeapAlloc(ProcessHeap, 0, adaptOutBufLen); + if (pAdapterInfo == NULL) + { + _tprintf(_T("memory allocation error")); + return; + } } if ((ErrRet = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) != NO_ERROR) - { - _tprintf(_T("GetAdaptersInfo failed : ")); - DoFormatMessage(ErrRet); - return EXIT_FAILURE; - } - - if ((ErrRet = GetNetworkParams(pFixedInfo, &netOutBufLen)) != NO_ERROR) - { - _tprintf(_T("GetNetworkParams failed : ")); - DoFormatMessage(ErrRet); - return EXIT_FAILURE; - } - + { + _tprintf(_T("GetAdaptersInfo failed : ")); + DoFormatMessage(ErrRet); + HeapFree(ProcessHeap, 0, pAdapterInfo); + return ; + } + + pAdapter = pAdapterInfo; _tprintf(_T("\nReactOS IP Configuration\n\n")); @@ -163,11 +174,10 @@ _tprintf(_T("\tDNS Suffix Search List. . . . . . : %s\n"), pFixedInfo->DomainName); } - while (pAdapter) - { - + while (pAdapter) + { _tprintf(_T("\n%s ...... : \n\n"), GetInterfaceTypeName(pAdapter->Type)); - + /* check if the adapter is connected to the media */ if (_tcscmp(pAdapter->IpAddressList.IpAddress.String, "0.0.0.0") == 0) { @@ -175,7 +185,7 @@ pAdapter = pAdapter->Next; continue; } - + _tprintf(_T("\tConnection-specific DNS Suffix. . : %s\n"), pFixedInfo->DomainName); if (bAll) @@ -218,39 +228,50 @@ } } _tprintf(_T("\n")); - - pAdapter = pAdapter->Next; - - } - - return 0; -} - -INT Release(TCHAR Index) + + pAdapter = pAdapter->Next; + + } + + HeapFree(ProcessHeap, 0, pFixedInfo); + HeapFree(ProcessHeap, 0, pAdapterInfo); +} + +VOID Release(LPTSTR Index) { IP_ADAPTER_INDEX_MAP AdapterInfo; DWORD dwRetVal = 0; /* if interface is not given, query GetInterfaceInfo */ - if (Index == (TCHAR)NULL) - { - PIP_INTERFACE_INFO pInfo; - ULONG ulOutBufLen; - pInfo = (IP_INTERFACE_INFO *) malloc(sizeof(IP_INTERFACE_INFO)); - ulOutBufLen = 0; + if (Index == NULL) + { + PIP_INTERFACE_INFO pInfo = NULL; + ULONG ulOutBufLen = 0; + + pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, sizeof(IP_INTERFACE_INFO)); + if (pInfo == NULL) + { + _tprintf(_T("memory allocation error")); + return; + } /* Make an initial call to GetInterfaceInfo to get * the necessary size into the ulOutBufLen variable */ if ( GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) { - GlobalFree(pInfo); - pInfo = (IP_INTERFACE_INFO *) malloc (ulOutBufLen); + HeapFree(ProcessHeap, 0, pInfo); + pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, ulOutBufLen); + if (pInfo == NULL) + { + _tprintf(_T("memory allocation error")); + return; + } } /* Make a second call to GetInterfaceInfo to get the actual data we want */ if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR ) { - AdapterInfo = pInfo->Adapter[0]; + CopyMemory(&AdapterInfo, &pInfo->Adapter[0], sizeof(IP_ADAPTER_INDEX_MAP)); _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name); } else @@ -258,11 +279,14 @@ _tprintf(_T("\nGetInterfaceInfo failed : ")); DoFormatMessage(dwRetVal); } + + HeapFree(ProcessHeap, 0, pInfo); } else { ; - /* we need to be able to release connections by name with support for globbing + /* FIXME: + * we need to be able to release connections by name with support for globbing * i.e. ipconfig /release Eth* will release all cards starting with Eth... * ipconfig /release *con* will release all cards with 'con' in their name */ @@ -275,47 +299,62 @@ _tprintf(_T("\nAn error occured while releasing interface %s : "), _T("*name*")); DoFormatMessage(dwRetVal); } - return 0; -} - - - - -INT Renew(TCHAR Index) + +} + + + + +VOID Renew(LPTSTR Index) { IP_ADAPTER_INDEX_MAP AdapterInfo; DWORD dwRetVal = 0; /* if interface is not given, query GetInterfaceInfo */ - if (Index == (TCHAR)NULL) + if (Index == NULL) { PIP_INTERFACE_INFO pInfo; - ULONG ulOutBufLen; - pInfo = (IP_INTERFACE_INFO *) malloc(sizeof(IP_INTERFACE_INFO)); - ulOutBufLen = 0; + ULONG ulOutBufLen = 0; + + pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, sizeof(IP_INTERFACE_INFO)); + if (pInfo == NULL) + { + _tprintf(_T("memory allocation error")); + return; + } /* Make an initial call to GetInterfaceInfo to get * the necessary size into the ulOutBufLen variable */ if ( GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) { - GlobalFree(pInfo); - pInfo = (IP_INTERFACE_INFO *) malloc (ulOutBufLen); + HeapFree(ProcessHeap, 0, pInfo); + pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, ulOutBufLen); + if (pInfo == NULL) + { + _tprintf(_T("memory allocation error")); + return; + } } /* Make a second call to GetInterfaceInfo to get the actual data we want */ if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR ) { - AdapterInfo = pInfo->Adapter[0]; + CopyMemory(&AdapterInfo, &pInfo->Adapter[0], sizeof(IP_ADAPTER_INDEX_MAP)); _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name); - } else { + } + else + { _tprintf(_T("\nGetInterfaceInfo failed : ")); DoFormatMessage(dwRetVal); } + + HeapFree(ProcessHeap, 0, pInfo); } else { ; - /* we need to be able to renew connections by name with support for globbing + /* FIXME: + * we need to be able to renew connections by name with support for globbing * i.e. ipconfig /renew Eth* will renew all cards starting with Eth... * ipconfig /renew *con* will renew all cards with 'con' in their name */ @@ -328,48 +367,8 @@ _tprintf(_T("\nAn error occured while renew interface %s : "), _T("*name*")); DoFormatMessage(dwRetVal); } - return 0; -} - -/* temp func for testing purposes */ -VOID Info() -{ - // Declare and initialize variables - PIP_INTERFACE_INFO pInfo; - ULONG ulOutBufLen; - DWORD dwRetVal; - - pInfo = (IP_INTERFACE_INFO *) malloc( sizeof(IP_INTERFACE_INFO) ); - ulOutBufLen = sizeof(IP_INTERFACE_INFO); - dwRetVal = 0; - - - // Make an initial call to GetInterfaceInfo to get - // the necessary size in the ulOutBufLen variable - if ( GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) - { - free(pInfo); - pInfo = (IP_INTERFACE_INFO *) malloc (ulOutBufLen); - } - - // Make a second call to GetInterfaceInfo to get - // the actual data we need - if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR ) - { - int i; - for (i=0; i<pInfo->NumAdapters; i++) - { - printf("\tAdapter Name: %S\n", pInfo->Adapter[i].Name); - printf("\tAdapter Index: %ld\n", pInfo->Adapter[i].Index); - printf("\tNum Adapters: %ld\n", pInfo->NumAdapters); - } - } - else - { - printf("GetInterfaceInfo failed.\n"); - DoFormatMessage(dwRetVal); - } -} +} + VOID Usage(VOID) @@ -426,6 +425,8 @@ BOOL DoShowclassid=FALSE; BOOL DoSetclassid=FALSE; + ProcessHeap = GetProcessHeap(); + /* Parse command line for options we have been given. */ if ( (argc > 1)&&(argv[1][0]=='/') ) { @@ -472,15 +473,15 @@ case 1: /* Default behaviour if no options are given*/ ShowInfo(FALSE); break; - case 2: /* Process all the options that take no paramiters */ + case 2: /* Process all the options that take no parameters */ if (DoUsage) Usage(); else if (DoAll) ShowInfo(TRUE); else if (DoRelease) - Release((TCHAR)NULL); + Release(NULL); else if (DoRenew) - Renew((TCHAR)NULL); + Renew(NULL); else if (DoFlushdns) _tprintf(_T("\nSorry /flushdns is not implemented yet\n")); else if (DoRegisterdns) @@ -490,7 +491,7 @@ else Usage(); break; - case 3: /* Process all the options that can have 1 paramiters */ + case 3: /* Process all the options that can have 1 parameter */ if (DoRelease) _tprintf(_T("\nSorry /release [adapter] is not implemented yet\n")); //Release(argv[2]); @@ -503,7 +504,7 @@ else Usage(); break; - case 4: /* Process all the options that can have 2 paramiters */ + case 4: /* Process all the options that can have 2 parameters */ if (DoSetclassid) _tprintf(_T("\nSorry /setclassid adapter [classid]is not implemented yet\n")); else @@ -515,3 +516,4 @@ return 0; } +

1 0

[hpoussin] 22860: Fix handling of dllname_ros.diff file
by hpoussin＠svn.reactos.org 05 Jul '06

05 Jul '06

Author: hpoussin Date: Wed Jul 5 13:14:28 2006 New Revision: 22860 URL: http://svn.reactos.org/svn/reactos?rev=22860&view=rev Log: Fix handling of dllname_ros.diff file Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=22860&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Wed Jul 5 13:14:28 2006 @@ -120,6 +120,7 @@ GOTO :eof :merge +SETLOCAL ENABLEDELAYEDEXPANSION IF "%3" == "" GOTO help IF NOT EXIST "%2\ReactOS.rbuild" ( ECHO %2\ReactOS.rbuild doesn't exit. @@ -139,7 +140,7 @@ DEL "%WINE_ROS_DIR%\dll\win32\%2\%%f" ) ELSE IF NOT EXIST "wine\dlls\%2\%%f" ( SET WINE_FILE=%%f - IF NOT "%WINE_FILE:~-9" == "_ros.diff" ( + IF NOT "!WINE_FILE:~-9!" == "_ros.diff" ( svn.exe delete "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL IF ERRORLEVEL 2 GOTO :helpsvn ) @@ -154,7 +155,9 @@ IF ERRORLEVEL 2 GOTO :helpsvn svn.exe propset svn:eol-style native "%WINE_ROS_DIR%\dll\win32\%2\%2_ros.diff" >NUL 2>NUL PUSHD "%WINE_ROS_DIR%" - patch.exe -p0 -N < "dll\win32\%2\%2_ros.diff" + PUSHD "dll\win32\%2" + patch.exe -p0 -N < "%2_ros.diff" + POPD POPD IF ERRORLEVEL 1 ( ECHO Error when executing patch.exe. Try to download the lastest version at

1 0

[ion] 22859: - Make IoCreateFile use deferred I/O completion. - Fixed a bug in TCP/IP that was making it complete IRP_MJ_CREATE with STATUS_SUCCESS yet with the IRP marked as pending.
by ion＠svn.reactos.org 05 Jul '06

05 Jul '06

Author: ion Date: Wed Jul 5 10:45:00 2006 New Revision: 22859 URL: http://svn.reactos.org/svn/reactos?rev=22859&view=rev Log: - Make IoCreateFile use deferred I/O completion. - Fixed a bug in TCP/IP that was making it complete IRP_MJ_CREATE with STATUS_SUCCESS yet with the IRP marked as pending. Modified: trunk/reactos/drivers/network/tcpip/tcpip/irp.c trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/irp.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/irp.c Wed Jul 5 10:45:00 2006 @@ -18,7 +18,7 @@ } NTSTATUS IRPFinish( PIRP Irp, NTSTATUS Status ) { - TI_DbgPrint(MID_TRACE,("Called: Irp %x, Status %x Event %x\n", Irp, Status, Irp->UserEvent)); + DbgPrint("Called: Irp %x, Status %x Event %x\n", Irp, Status, Irp->UserEvent); #ifdef MEMTRACK UntrackFL( __FILE__, __LINE__, Irp ); Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c Wed Jul 5 10:45:00 2006 @@ -385,11 +385,7 @@ RIRP(Irp); - TI_DbgPrint(DEBUG_IRP, ("Called. DeviceObject is at (0x%X), IRP is at (0x%X).\n", DeviceObject, Irp)); - - IoMarkIrpPending(Irp); - Irp->IoStatus.Status = STATUS_PENDING; - Irp->IoStatus.Information = 0; + DbgPrint("Called. DeviceObject is at (0x%X), IRP is at (0x%X).\n", DeviceObject, Irp); IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -417,7 +413,7 @@ Status = STATUS_INVALID_DEVICE_REQUEST; } - TI_DbgPrint(DEBUG_IRP, ("Leaving. Status is (0x%X)\n", Status)); + DbgPrint("Leaving. Status is (0x%X)\n", Status); return IRPFinish( Irp, Status ); } Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Wed Jul 5 10:45:00 2006 @@ -892,6 +892,9 @@ NTSTATUS Status = STATUS_SUCCESS; AUX_DATA AuxData; ACCESS_STATE AccessState; + KIRQL OldIrql; + PKNORMAL_ROUTINE NormalRoutine; + PVOID NormalContext; DPRINT("IoCreateFile(FileHandle 0x%p, DesiredAccess %x, " "ObjectAttributes 0x%p ObjectAttributes->ObjectName->Buffer %S)\n", @@ -1063,8 +1066,8 @@ Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = AccessMode; Irp->Flags = IRP_CREATE_OPERATION | - IRP_SYNCHRONOUS_API;// | - //IRP_DEFER_IO_COMPLETION; + IRP_SYNCHRONOUS_API | + IRP_DEFER_IO_COMPLETION; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->UserEvent = &FileObject->Event; Irp->UserIosb = IoStatusBlock; @@ -1130,21 +1133,18 @@ NULL); Status = IoStatusBlock->Status; } -#if 0 else { /* We'll have to complete it ourselves */ ASSERT(!Irp->PendingReturned); KeRaiseIrql(APC_LEVEL, &OldIrql); - FileObject->Event.Header.SignalState = 1; - if ((Irp->Flags & IRP_BUFFERED_IO) && (Irp->Flags & IRP_DEALLOCATE_BUFFER)) - { - ExFreePool(Irp->AssociatedIrp.SystemBuffer); - } - IoFreeIrp(Irp); + IopCompleteRequest(&Irp->Tail.Apc, + &NormalRoutine, + &NormalContext, + (PVOID*)&FileObject, + &NormalContext); KeLowerIrql(OldIrql); } -#endif if (!NT_SUCCESS(Status)) { DPRINT("Failing create request with status %x\n", Status);

1 0

[ion] 22858: [AUDIT] - Almost all the functions are stubs, except for some LSA functions which merely seem to be wrappers that build LPC messages for the actual LSA Server to implement (which isn't part of these files). - Add some stubs during my attempt to load Google Talk (forget about it!). However WINE implements all these functions entirely so maybe we should just sync with them?
by ion＠svn.reactos.org 05 Jul '06

05 Jul '06

Author: ion Date: Wed Jul 5 10:43:46 2006 New Revision: 22858 URL: http://svn.reactos.org/svn/reactos?rev=22858&view=rev Log: [AUDIT] - Almost all the functions are stubs, except for some LSA functions which merely seem to be wrappers that build LPC messages for the actual LSA Server to implement (which isn't part of these files). - Add some stubs during my attempt to load Google Talk (forget about it!). However WINE implements all these functions entirely so maybe we should just sync with them? Modified: trunk/reactos/dll/win32/secur32/dllmain.c (props changed) trunk/reactos/dll/win32/secur32/lsa.c (props changed) trunk/reactos/dll/win32/secur32/precomp.h (props changed) trunk/reactos/dll/win32/secur32/secext.c (props changed) trunk/reactos/dll/win32/secur32/secur32.def (contents, props changed) trunk/reactos/dll/win32/secur32/sspi.c (contents, props changed) Propchange: trunk/reactos/dll/win32/secur32/dllmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/secur32/lsa.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/secur32/precomp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/secur32/secext.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/win32/secur32/secur32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.def (original) +++ trunk/reactos/dll/win32/secur32/secur32.def Wed Jul 5 10:43:46 2006 @@ -9,26 +9,26 @@ LsaCallAuthenticationPackage@28 ;AcceptSecurityContext@36 AcquireCredentialsHandleA@36 -;AcquireCredentialsHandleW@36 +AcquireCredentialsHandleW@36 ;@AddCredentialsA ;@AddCredentialsW ;@AddSecurityPackageA ;@AddSecurityPackageW ;ApplyControlTokenA@8 -;ApplyControlTokenW@8 -;CompleteAuthToken@8 +ApplyControlToken@8=ApplyControlTokenW@8 +CompleteAuthToken@8 ;@CredMarshalTargetInfo ;@CredUnmarshalTargetInfo -;DecryptMessage@16 -;DeleteSecurityContext@4 +DecryptMessage@16 +DeleteSecurityContext@4 ;@DeleteSecurityPackageA ;@DeleteSecurityPackageW -;EncryptMessage@16 +EncryptMessage@16 EnumerateSecurityPackagesA@8 EnumerateSecurityPackagesW@8 ;@ExportSecurityContext FreeContextBuffer@4 -;FreeCredentialsHandle@4 +FreeCredentialsHandle@4 GetComputerObjectNameA@12 GetComputerObjectNameW@12 ;GetSecurityUserInfo @@ -38,7 +38,7 @@ ;@ImportSecurityContextA ;@ImportSecurityContextW ;@InitSecurityInterfaceA -;@InitSecurityInterfaceW +InitSecurityInterfaceW@0 InitializeSecurityContextA@48 ;InitializeSecurityContextW@48 LsaEnumerateLogonSessions@8 @@ -47,7 +47,7 @@ LsaUnregisterPolicyChangeNotification@8 ;MakeSignature@16 ;QueryContextAttributesA@12 -;QueryContextAttributesW@12 +QueryContextAttributesW@12 ;QueryCredentialsAttributesA@12 ;QueryCredentialsAttributesW@12 ;@QuerySecurityContextToken Propchange: trunk/reactos/dll/win32/secur32/secur32.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c (original) +++ trunk/reactos/dll/win32/secur32/sspi.c Wed Jul 5 10:43:46 2006 @@ -38,6 +38,80 @@ SECURITY_STATUS WINAPI +FreeCredentialsHandle(PCredHandle Handle) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +DeleteSecurityContext(PCtxtHandle Handle) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +PSecurityFunctionTableW +WINAPI +InitSecurityInterfaceW(VOID) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return NULL; +} + +SECURITY_STATUS +WINAPI +EncryptMessage(PCtxtHandle Handle, + ULONG Foo, + PSecBufferDesc Buffer, + ULONG Bar) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +DecryptMessage(PCtxtHandle Handle, + PSecBufferDesc Buffer, + ULONG Foo, + PULONG Bar) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +ApplyControlTokenW(PCtxtHandle Handle, + PSecBufferDesc Buffer) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +CompleteAuthToken(PCtxtHandle Handle, + PSecBufferDesc Buffer) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +QueryContextAttributesW(PCtxtHandle Handle, + ULONG Foo, + PVOID Bar) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI AcquireCredentialsHandleA ( SEC_CHAR* pszPrincipal, SEC_CHAR* pszPackage, @@ -53,6 +127,25 @@ DPRINT1("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } + +SECURITY_STATUS +WINAPI +AcquireCredentialsHandleW ( + SEC_WCHAR* pszPrincipal, + SEC_WCHAR* pszPackage, + ULONG fUsage, + PLUID pID, + PVOID pAuth, + SEC_GET_KEY_FN pGetKeyFn, + PVOID pvGetKeyArgument, + PCredHandle phCred, + PTimeStamp pExpires + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + SECURITY_STATUS WINAPI Propchange: trunk/reactos/dll/win32/secur32/sspi.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 22857: - Ongoing IoCreateFile fixes: - Start with empty object - Set the type/size in the object header - Don't rudely ignore the following flags: FILE_WRITE_THROUGH, FILE_SEQUENTIAL_ONLY, FILE_RANDOM_ACCESS, OBJ_CASE_INSENSITIVE; they are not merely decorative. - Set correct IRP flags for IRP_CREATE_OPERATION so that the I/O manager knows how to deal with the request (also set SYNCH_API flag). - Deferred mode not yet enabled. - Simplify the way we set the parameters for pipes/mailslots/fi
by ion＠svn.reactos.org 05 Jul '06

05 Jul '06

Author: ion Date: Wed Jul 5 08:16:37 2006 New Revision: 22857 URL: http://svn.reactos.org/svn/reactos?rev=22857&view=rev Log: - Ongoing IoCreateFile fixes: - Start with empty object - Set the type/size in the object header - Don't rudely ignore the following flags: FILE_WRITE_THROUGH, FILE_SEQUENTIAL_ONLY, FILE_RANDOM_ACCESS, OBJ_CASE_INSENSITIVE; they are not merely decorative. - Set correct IRP flags for IRP_CREATE_OPERATION so that the I/O manager knows how to deal with the request (also set SYNCH_API flag). - Deferred mode not yet enabled. - Simplify the way we set the parameters for pipes/mailslots/files. - Don't close the handle of an invalid FO. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Wed Jul 5 08:16:37 2006 @@ -71,6 +71,7 @@ (PVOID*)&FileObject); /* Set File Object Data */ ASSERT(DeviceObject); + RtlZeroMemory(FileObject, sizeof(FILE_OBJECT)); FileObject->DeviceObject = IoGetAttachedDevice(DeviceObject); DPRINT("DO. DRV Name: %p %wZ\n", DeviceObject, &DeviceObject->DriverObject->DriverName); @@ -89,7 +90,7 @@ 0, 0, (PVOID*)&FileObject); - + RtlZeroMemory(FileObject, sizeof(FILE_OBJECT)); if (!Context) { /* Parent is a device object */ @@ -992,22 +993,44 @@ NULL); if (!NT_SUCCESS(Status)) return Status; + FileObject->Type = IO_TYPE_FILE; + FileObject->Size = sizeof(FILE_OBJECT); + // // stop stuff that should be in IopParseDevice // - if (CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) - { - FileObject->Flags |= (FO_ALERTABLE_IO | FO_SYNCHRONOUS_IO); - } - if (CreateOptions & FILE_SYNCHRONOUS_IO_NONALERT) - { - FileObject->Flags |= FO_SYNCHRONOUS_IO; - } - - if (CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) - FileObject->Flags |= FO_NO_INTERMEDIATE_BUFFERING; - + if (CreateOptions & + (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) + { + FileObject->Flags |= FO_SYNCHRONOUS_IO; + if (CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) + { + FileObject->Flags |= FO_ALERTABLE_IO; + } + } + + if (CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) + { + FileObject->Flags |= FO_NO_INTERMEDIATE_BUFFERING; + } + if (CreateOptions & FILE_WRITE_THROUGH) + { + FileObject->Flags |= FO_WRITE_THROUGH; + } + if (CreateOptions & FILE_SEQUENTIAL_ONLY) + { + FileObject->Flags |= FO_SEQUENTIAL_ONLY; + } + if (CreateOptions & FILE_RANDOM_ACCESS) + { + FileObject->Flags |= FO_RANDOM_ACCESS; + } + + if (!(ObjectAttributes->Attributes & OBJ_CASE_INSENSITIVE)) + { + FileObject->Flags |= FO_OPENED_CASE_SENSITIVE; + } /* * FIXME: We should get the access state from Ob once this function becomes * a parse routine once the Ob is refactored. @@ -1017,7 +1040,7 @@ SecurityContext.SecurityQos = NULL; /* ?? */ SecurityContext.AccessState = &AccessState; SecurityContext.DesiredAccess = DesiredAccess; - SecurityContext.FullCreateOptions = 0; /* ?? */ + SecurityContext.FullCreateOptions = CreateOptions; KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); @@ -1036,58 +1059,58 @@ return STATUS_UNSUCCESSFUL; } - //trigger FileObject/Event dereferencing + /* Now set the IRP data */ Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = AccessMode; - Irp->UserIosb = IoStatusBlock; - Irp->AssociatedIrp.SystemBuffer = SystemEaBuffer; - Irp->Tail.Overlay.AuxiliaryBuffer = NULL; + Irp->Flags = IRP_CREATE_OPERATION | + IRP_SYNCHRONOUS_API;// | + //IRP_DEFER_IO_COMPLETION; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->UserEvent = &FileObject->Event; - Irp->Overlay.AllocationSize = SafeAllocationSize; + Irp->UserIosb = IoStatusBlock; + Irp->MdlAddress = NULL; + Irp->PendingReturned = FALSE; + Irp->UserEvent = NULL; + Irp->Cancel = FALSE; + Irp->CancelRoutine = NULL; + Irp->Tail.Overlay.AuxiliaryBuffer = NULL; /* * Get the stack location for the new * IRP and prepare it. */ StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); - StackLoc->MinorFunction = 0; - StackLoc->Flags = (UCHAR)Options; StackLoc->Control = 0; - StackLoc->DeviceObject = FileObject->DeviceObject; StackLoc->FileObject = FileObject; - switch (CreateFileType) + switch (CreateFileType) { default: case CreateFileTypeNone: StackLoc->MajorFunction = IRP_MJ_CREATE; - StackLoc->Parameters.Create.SecurityContext = &SecurityContext; - StackLoc->Parameters.Create.Options = (CreateOptions & FILE_VALID_OPTION_FLAGS); - StackLoc->Parameters.Create.Options |= (CreateDisposition << 24); - StackLoc->Parameters.Create.FileAttributes = (USHORT)FileAttributes; - StackLoc->Parameters.Create.ShareAccess = (USHORT)ShareAccess; + StackLoc->Flags = Options; StackLoc->Parameters.Create.EaLength = SystemEaBuffer != NULL ? EaLength : 0; + StackLoc->Flags |= !(ObjectAttributes->Attributes & OBJ_CASE_INSENSITIVE) ? SL_CASE_SENSITIVE: 0; break; case CreateFileTypeNamedPipe: StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; - StackLoc->Parameters.CreatePipe.SecurityContext = &SecurityContext; - StackLoc->Parameters.CreatePipe.Options = (CreateOptions & FILE_VALID_OPTION_FLAGS); - StackLoc->Parameters.CreatePipe.Options |= (CreateDisposition << 24); - StackLoc->Parameters.CreatePipe.ShareAccess = (USHORT)ShareAccess; StackLoc->Parameters.CreatePipe.Parameters = ExtraCreateParameters; break; case CreateFileTypeMailslot: StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; - StackLoc->Parameters.CreateMailslot.SecurityContext = &SecurityContext; - StackLoc->Parameters.CreateMailslot.Options = (CreateOptions & FILE_VALID_OPTION_FLAGS); - StackLoc->Parameters.CreateMailslot.Options |= (CreateDisposition << 24); - StackLoc->Parameters.CreateMailslot.ShareAccess = (USHORT)ShareAccess; StackLoc->Parameters.CreateMailslot.Parameters = ExtraCreateParameters; break; } + + /* Set the common data */ + Irp->Overlay.AllocationSize = SafeAllocationSize; + Irp->AssociatedIrp.SystemBuffer = SystemEaBuffer; + StackLoc->Parameters.Create.Options = (CreateDisposition << 24) | (CreateOptions & 0x00FFFFFF); + StackLoc->Parameters.Create.FileAttributes = FileAttributes; + StackLoc->Parameters.Create.ShareAccess = ShareAccess; + StackLoc->Parameters.Create.SecurityContext = &SecurityContext; /* * Now call the driver and @@ -1107,13 +1130,27 @@ NULL); Status = IoStatusBlock->Status; } +#if 0 + else + { + /* We'll have to complete it ourselves */ + ASSERT(!Irp->PendingReturned); + KeRaiseIrql(APC_LEVEL, &OldIrql); + FileObject->Event.Header.SignalState = 1; + if ((Irp->Flags & IRP_BUFFERED_IO) && (Irp->Flags & IRP_DEALLOCATE_BUFFER)) + { + ExFreePool(Irp->AssociatedIrp.SystemBuffer); + } + IoFreeIrp(Irp); + KeLowerIrql(OldIrql); + } +#endif if (!NT_SUCCESS(Status)) { DPRINT("Failing create request with status %x\n", Status); FileObject->DeviceObject = NULL; FileObject->Vpb = NULL; - - ZwClose(LocalHandle); + ObDereferenceObject(FileObject); } else {

1 0

[ion] 22856: - Fix IopcloseFile... I'm not sure it was working right after the Ob changes, so it's possible some devices weren't getting IRP_MJ_CLEANUP... also made it lock the FO and detect malformed FOs (more spam for you on the debug logs!) -- but this is one problem I'm planning on fixing.
by ion＠svn.reactos.org 05 Jul '06

05 Jul '06

Author: ion Date: Wed Jul 5 06:02:44 2006 New Revision: 22856 URL: http://svn.reactos.org/svn/reactos?rev=22856&view=rev Log: - Fix IopcloseFile... I'm not sure it was working right after the Ob changes, so it's possible some devices weren't getting IRP_MJ_CLEANUP... also made it lock the FO and detect malformed FOs (more spam for you on the debug logs!) -- but this is one problem I'm planning on fixing. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Wed Jul 5 06:02:44 2006 @@ -561,7 +561,7 @@ } VOID -STDCALL +NTAPI IopCloseFile(IN PEPROCESS Process OPTIONAL, IN PVOID ObjectBody, IN ACCESS_MASK GrantedAccess, @@ -575,19 +575,40 @@ NTSTATUS Status; PDEVICE_OBJECT DeviceObject; - DPRINT("IopCloseFile()\n"); - - if (HandleCount > 1 || FileObject->DeviceObject == NULL) return; + /* Check if the file is locked and has more then one handle opened */ + if ((FileObject->LockOperation) && (SystemHandleCount != 1)) + { + DPRINT1("We need to unlock this file!\n"); + KEBUGCHECK(0); + } + + /* Make sure this is the last handle */ + if (SystemHandleCount != 1) return; + + /* FIXME: ROS HACK */ + if (!FileObject->DeviceObject) + { + DPRINT1("FIXME: MALFORMED FILE OBJECT!\n"); + return; + } /* Check if this is a direct open or not */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { + /* Get the attached device */ DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); } else { + /* Get the FO's device */ DeviceObject = IoGetRelatedDeviceObject(FileObject); } + + /* Set the handle created flag */ + FileObject->Flags |= FO_HANDLE_CREATED; + + /* Check if this is a sync FO and lock it */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) IopLockFileObject(FileObject); /* Clear and set up Events */ KeClearEvent(&FileObject->Event); @@ -595,12 +616,14 @@ /* Allocate an IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return; /* Set it up */ Irp->UserEvent = &Event; Irp->UserIosb = &Irp->IoStatus; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; Irp->Flags = IRP_CLOSE_OPERATION | IRP_SYNCHRONOUS_API; /* Set up Stack Pointer Data */ @@ -608,15 +631,25 @@ StackPtr->MajorFunction = IRP_MJ_CLEANUP; StackPtr->FileObject = FileObject; + /* Queue the IRP */ + //IopQueueIrpToThread(Irp); + + /* Update operation counts */ + IopUpdateOperationCount(IopOtherTransfer); + /* Call the FS Driver */ Status = IoCallDriver(DeviceObject, Irp); - - /* Wait for completion */ if (Status == STATUS_PENDING) { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - } + /* Wait for completion */ + KeWaitForSingleObject(&Event, UserRequest, KernelMode, FALSE, NULL); + } + + /* Free the IRP */ IoFreeIrp(Irp); + + /* Release the lock if we were holding it */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) IopUnlockFileObject(FileObject); } NTSTATUS @@ -986,7 +1019,7 @@ SecurityContext.DesiredAccess = DesiredAccess; SecurityContext.FullCreateOptions = 0; /* ?? */ - KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, FALSE); + KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); DPRINT("FileObject 0x%p\n", FileObject);

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
67
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 July 2006