Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 35710: define _SSIZE_T_DEFINED when defining ssize_t
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Wed Aug 27 14:54:57 2008 New Revision: 35710 URL: http://svn.reactos.org/svn/reactos?rev=35710&view=rev Log: define _SSIZE_T_DEFINED when defining ssize_t Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/types.h Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/types.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/sys/types.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/sys/types.h [iso-8859-1] Wed Aug 27 14:54:57 2008 @@ -101,7 +101,10 @@ typedef long _ssize_t; #ifndef _NO_OLDNAMES +# ifndef _SSIZE_T_DEFINED +# define _SSIZE_T_DEFINED typedef _ssize_t ssize_t; +# endif #endif #endif /* Not _SSIZE_T_ */

1 0

[sginsberg] 35709: - Make cmlibhost compile warning free - Slight reordering of cmlib.h (by Colin Finck)
by sginsberg＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: sginsberg Date: Wed Aug 27 12:54:27 2008 New Revision: 35709 URL: http://svn.reactos.org/svn/reactos?rev=35709&view=rev Log: - Make cmlibhost compile warning free - Slight reordering of cmlib.h (by Colin Finck) Modified: trunk/reactos/lib/cmlib/cminit.c trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/cmlib.rbuild Modified: trunk/reactos/lib/cmlib/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cminit.c?rev=357… ============================================================================== --- trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] Wed Aug 27 12:54:27 2008 @@ -6,6 +6,8 @@ */ #include "cmlib.h" +#define NDEBUG +#include <debug.h> ULONG CmlibTraceLevel = 0; @@ -95,7 +97,7 @@ } else { - DbgPrint("IndexCell->Signature %x\n", IndexCell->Signature); + DPRINT1("IndexCell->Signature %x\n", IndexCell->Signature); ASSERT(FALSE); } } Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=3570… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Wed Aug 27 12:54:27 2008 @@ -7,6 +7,11 @@ #ifndef CMLIB_H #define CMLIB_H + +// +// Debug support switch +// +#define _CMLIB_DEBUG_ 1 #ifdef CMLIB_HOST #include <host/typedefs.h> @@ -23,81 +28,75 @@ #define STATUS_NOT_REGISTRY_FILE ((NTSTATUS)0xC000015C) #define STATUS_REGISTRY_RECOVERED ((NTSTATUS)0x40000009) + #define REG_OPTION_VOLATILE 1 + #define OBJ_CASE_INSENSITIVE 0x00000040L + #define USHORT_MAX USHRT_MAX + + VOID NTAPI + KeQuerySystemTime( + OUT PLARGE_INTEGER CurrentTime); + + VOID NTAPI + RtlInitializeBitMap( + IN PRTL_BITMAP BitMapHeader, + IN PULONG BitMapBuffer, + IN ULONG SizeOfBitMap); + + ULONG NTAPI + RtlFindSetBits( + IN PRTL_BITMAP BitMapHeader, + IN ULONG NumberToFind, + IN ULONG HintIndex); + + VOID NTAPI + RtlSetBits( + IN PRTL_BITMAP BitMapHeader, + IN ULONG StartingIndex, + IN ULONG NumberToSet); + + VOID NTAPI + RtlClearAllBits( + IN PRTL_BITMAP BitMapHeader); + + #define RtlCheckBit(BMH,BP) (((((PLONG)(BMH)->Buffer)[(BP) / 32]) >> ((BP) % 32)) & 0x1) + + #define PKTHREAD PVOID + #define PKGUARDED_MUTEX PVOID + #define PERESOURCE PVOID + #define PFILE_OBJECT PVOID + #define PKEVENT PVOID + #define PWORK_QUEUE_ITEM PVOID + #define EX_PUSH_LOCK PULONG_PTR + /* For <host/wcsfuncs.h> */ #define USE_HOST_WCSFUNCS + + #define CMLTRACE(x, ...) +#else + // + // Debug/Tracing support + // + #if _CMLIB_DEBUG_ + #ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented + #define CMLTRACE DbgPrintEx + #else + #define CMLTRACE(x, ...) \ + if (x & CmlibTraceLevel) DbgPrint(__VA_ARGS__) + #endif + #else + #define CMLTRACE(x, ...) DPRINT(__VA_ARGS__) + #endif + + + #include <ntddk.h> #endif #include <host/wcsfuncs.h> // -// Debug support switch -// -#define _CMLIB_DEBUG_ 1 - -// // These define the Debug Masks Supported // #define CMLIB_HCELL_DEBUG 0x01 - -// -// Debug/Tracing support -// -#if _CMLIB_DEBUG_ -#ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented -#define CMLTRACE DbgPrintEx -#else -#define CMLTRACE(x, ...) \ - if (x & CmlibTraceLevel) DbgPrint(__VA_ARGS__) -#endif -#else -#define CMLTRACE(x, ...) DPRINT(__VA_ARGS__) -#endif - -#ifndef _TYPEDEFS_HOST_H - #include <ntddk.h> - -#else - #define REG_OPTION_VOLATILE 1 - #define OBJ_CASE_INSENSITIVE 0x00000040L - #define USHORT_MAX USHRT_MAX - -VOID NTAPI -KeQuerySystemTime( - OUT PLARGE_INTEGER CurrentTime); - -VOID NTAPI -RtlInitializeBitMap( - IN PRTL_BITMAP BitMapHeader, - IN PULONG BitMapBuffer, - IN ULONG SizeOfBitMap); - -ULONG NTAPI -RtlFindSetBits( - IN PRTL_BITMAP BitMapHeader, - IN ULONG NumberToFind, - IN ULONG HintIndex); - -VOID NTAPI -RtlSetBits( - IN PRTL_BITMAP BitMapHeader, - IN ULONG StartingIndex, - IN ULONG NumberToSet); - -VOID NTAPI -RtlClearAllBits( - IN PRTL_BITMAP BitMapHeader); - -#define RtlCheckBit(BMH,BP) (((((PLONG)(BMH)->Buffer)[(BP) / 32]) >> ((BP) % 32)) & 0x1) - -#define PKTHREAD PVOID -#define PKGUARDED_MUTEX PVOID -#define PERESOURCE PVOID -#define PFILE_OBJECT PVOID -#define PKEVENT PVOID -#define PWORK_QUEUE_ITEM PVOID -#define EX_PUSH_LOCK PULONG_PTR - -#endif #ifndef ROUND_UP #define ROUND_UP(a,b) ((((a)+(b)-1)/(b))*(b)) Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] Wed Aug 27 12:54:27 2008 @@ -14,7 +14,7 @@ <file>hivesum.c</file> <file>hivewrt.c</file> </module> -<module name="cmlibhost" type="hoststaticlibrary" allowwarnings="true"> +<module name="cmlibhost" type="hoststaticlibrary"> <include base="cmlibhost">.</include> <include base="ReactOS">include/reactos</include> <include base="ReactOS">include</include>

1 0

[janderwald] 35708: - Fix build
by janderwald＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: janderwald Date: Wed Aug 27 12:27:25 2008 New Revision: 35708 URL: http://svn.reactos.org/svn/reactos?rev=35708&view=rev Log: - Fix build Added: trunk/reactos/dll/win32/netshell/lang/de-DE.rc (with props) trunk/reactos/dll/win32/netshell/lang/en-US.rc (with props) Added: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] Wed Aug 27 12:27:25 2008 @@ -1,0 +1,21 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Netzwerkverbindungen" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Typ" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Gerätename" + IDS_SHV_COLUMN_PHONE "Rufnummer oder Hostaddresse" + IDS_SHV_COLUMN_OWNER "Besitzer" + IDS_TYPE_ETHERNET "LAN oder Hochgeschwindigkeitsinternet" + IDS_STATUS_NON_OPERATIONAL "Deaktiviert" + IDS_STATUS_UNREACHABLE "Nicht verbunden" + IDS_STATUS_DISCONNECTED "Netzwerkkabel wurde entfernt" + IDS_STATUS_CONNECTING "Netzwerkaddresse beziehen" + IDS_STATUS_CONNECTED "Verbindung hergestellt" + IDS_STATUS_OPERATIONAL "Verbindung hergestellt" + +END Propchange: trunk/reactos/dll/win32/netshell/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/en… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] Wed Aug 27 12:27:25 2008 @@ -1,0 +1,20 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" +END + Propchange: trunk/reactos/dll/win32/netshell/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 35707: - Start Implementing Network Connections ShellFolder
by janderwald＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: janderwald Date: Wed Aug 27 12:18:25 2008 New Revision: 35707 URL: http://svn.reactos.org/svn/reactos?rev=35707&view=rev Log: - Start Implementing Network Connections ShellFolder Added: trunk/reactos/dll/win32/netshell/ (with props) trunk/reactos/dll/win32/netshell/classfactory.c (with props) trunk/reactos/dll/win32/netshell/enumlist.c (with props) trunk/reactos/dll/win32/netshell/lang/ (with props) trunk/reactos/dll/win32/netshell/netshell.c (with props) trunk/reactos/dll/win32/netshell/netshell.rbuild (with props) trunk/reactos/dll/win32/netshell/netshell.rc (with props) trunk/reactos/dll/win32/netshell/netshell.spec (with props) trunk/reactos/dll/win32/netshell/precomp.h (with props) trunk/reactos/dll/win32/netshell/res/ (with props) trunk/reactos/dll/win32/netshell/res/netshell.ico - copied unchanged from r35689, trunk/reactos/dll/win32/shell32/res/icons/172.ico trunk/reactos/dll/win32/netshell/resource.h (with props) trunk/reactos/dll/win32/netshell/shfldr_netconnect.c (with props) Modified: trunk/reactos/dll/win32/win32.rbuild Propchange: trunk/reactos/dll/win32/netshell/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 27 12:18:25 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/netshell/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/netshell/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/netshell/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Aug 27 12:18:25 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/netshell/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/netshell/classfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/classfa… ============================================================================== --- trunk/reactos/dll/win32/netshell/classfactory.c (added) +++ trunk/reactos/dll/win32/netshell/classfactory.c [iso-8859-1] Wed Aug 27 12:18:25 2008 @@ -1,0 +1,125 @@ +#include <precomp.h> + +typedef struct +{ + const IClassFactoryVtbl *lpVtbl; + LONG ref; + CLSID *rclsid; + LPFNCREATEINSTANCE lpfnCI; + const IID * riidInst; +} IClassFactoryImpl; + + +static +HRESULT +WINAPI +IClassFactory_fnQueryInterface( + LPCLASSFACTORY iface, + REFIID riid, + LPVOID *ppvObj) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + + *ppvObj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) + { + *ppvObj = This; + InterlockedIncrement(&This->ref); + return S_OK; + } + return E_NOINTERFACE; +} + +static +ULONG +WINAPI +IClassFactory_fnAddRef( + LPCLASSFACTORY iface) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +static +ULONG +WINAPI +IClassFactory_fnRelease( + LPCLASSFACTORY iface) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + HeapFree(GetProcessHeap(),0,This); + return 0; + } + return refCount; +} + +static +HRESULT +WINAPI +IClassFactory_fnCreateInstance( + LPCLASSFACTORY iface, + LPUNKNOWN pUnkOuter, + REFIID riid, + LPVOID *ppvObject) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + + *ppvObject = NULL; + + if ( This->riidInst==NULL || IsEqualCLSID(riid, This->riidInst) || IsEqualCLSID(riid, &IID_IUnknown) ) + { + return This->lpfnCI(pUnkOuter, riid, ppvObject); + } + + return E_NOINTERFACE; +} + +static +HRESULT +WINAPI IClassFactory_fnLockServer( + LPCLASSFACTORY iface, + BOOL fLock) +{ + //IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + return E_NOTIMPL; +} + + +static const IClassFactoryVtbl dclfvt = +{ + IClassFactory_fnQueryInterface, + IClassFactory_fnAddRef, + IClassFactory_fnRelease, + IClassFactory_fnCreateInstance, + IClassFactory_fnLockServer +}; + + +IClassFactory * +IClassFactory_fnConstructor( + LPFNCREATEINSTANCE lpfnCI, + PLONG pcRefDll, + REFIID riidInst) +{ + IClassFactoryImpl* lpclf; + + lpclf = HeapAlloc(GetProcessHeap(),0,sizeof(IClassFactoryImpl)); + lpclf->ref = 1; + lpclf->lpVtbl = &dclfvt; + lpclf->lpfnCI = lpfnCI; + + if (pcRefDll) + InterlockedIncrement(pcRefDll); + lpclf->riidInst = riidInst; + + return (LPCLASSFACTORY)lpclf; +} + + Propchange: trunk/reactos/dll/win32/netshell/classfactory.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/enumlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/enumlis… ============================================================================== --- trunk/reactos/dll/win32/netshell/enumlist.c (added) +++ trunk/reactos/dll/win32/netshell/enumlist.c [iso-8859-1] Wed Aug 27 12:18:25 2008 @@ -1,0 +1,364 @@ +#include <precomp.h> + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +typedef struct tagGUIDStruct +{ + BYTE dummy; /* offset 01 is unknown */ + GUID guid; /* offset 02 */ +} GUIDStruct; + +#define PT_GUID 0x1F + +typedef struct tagPIDLDATA +{ + BYTE type; /*00*/ + union + { + struct tagGUIDStruct guid; + struct tagVALUEStruct value; + }u; +} PIDLDATA, *LPPIDLDATA; + +typedef struct tagENUMLIST +{ + struct tagENUMLIST *pNext; + LPITEMIDLIST pidl; + +}ENUMLIST, *LPENUMLIST; + +typedef struct +{ + const IEnumIDListVtbl *lpVtbl; + LONG ref; + LPENUMLIST mpFirst; + LPENUMLIST mpLast; + LPENUMLIST mpCurrent; + +} IEnumIDListImpl; + +/************************************************************************** + * AddToEnumList() + */ +BOOL +AddToEnumList( + IEnumIDList * iface, + LPITEMIDLIST pidl) +{ + LPENUMLIST pNew; + IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + + + if (!iface || !pidl) + return FALSE; + + pNew = (LPENUMLIST)SHAlloc(sizeof(ENUMLIST)); + if(pNew) + { + pNew->pNext = NULL; + pNew->pidl = pidl; + + if(!This->mpFirst) + { + This->mpFirst = pNew; + This->mpCurrent = pNew; + } + + if(This->mpLast) + { + /*add the new item to the end of the list */ + This->mpLast->pNext = pNew; + } + + /*update the last item pointer */ + This->mpLast = pNew; + return TRUE; + } + return FALSE; +} + +static +HRESULT +WINAPI +IEnumIDList_fnQueryInterface( + IEnumIDList * iface, + REFIID riid, + LPVOID *ppvObj) +{ + IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + + *ppvObj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IEnumIDList)) + { + *ppvObj = This; + IEnumIDList_AddRef((IEnumIDList*)*ppvObj); + return S_OK; + } + + return E_NOINTERFACE; +} + +static +ULONG +WINAPI +IEnumIDList_fnAddRef( + IEnumIDList * iface) +{ + IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +static +ULONG +WINAPI IEnumIDList_fnRelease( + IEnumIDList * iface) +{ + LPENUMLIST pDelete; + IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + while(This->mpFirst) + { + pDelete = This->mpFirst; + This->mpFirst = pDelete->pNext; + SHFree(pDelete->pidl); + SHFree(pDelete); + } + HeapFree(GetProcessHeap(),0,This); + } + return refCount; +} + +static +HRESULT +WINAPI +IEnumIDList_fnNext( + IEnumIDList * iface, + ULONG celt, + LPITEMIDLIST * rgelt, + ULONG *pceltFetched) +{ + IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + + ULONG i; + HRESULT hr = S_OK; + LPITEMIDLIST temp; + + if(pceltFetched) + *pceltFetched = 0; + + *rgelt=0; + + if(celt > 1 && !pceltFetched) + { + return E_INVALIDARG; + } + + if(celt > 0 && !This->mpCurrent) + { + return S_FALSE; + } + + for(i = 0; i < celt; i++) + { + if(!(This->mpCurrent)) + break; + + temp = ILClone(This->mpCurrent->pidl); + rgelt[i] = temp; + This->mpCurrent = This->mpCurrent->pNext; + } + + if(pceltFetched) + { + *pceltFetched = i; + } + + return hr; +} + +static +HRESULT +WINAPI +IEnumIDList_fnSkip( + IEnumIDList * iface,ULONG celt) +{ + IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + + DWORD dwIndex; + HRESULT hr = S_OK; + + for(dwIndex = 0; dwIndex < celt; dwIndex++) + { + if(!This->mpCurrent) + { + hr = S_FALSE; + break; + } + This->mpCurrent = This->mpCurrent->pNext; + } + return hr; +} + +static +HRESULT +WINAPI +IEnumIDList_fnReset( + IEnumIDList * iface) +{ + IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + + This->mpCurrent = This->mpFirst; + return S_OK; +} + +static +HRESULT +WINAPI +IEnumIDList_fnClone( + IEnumIDList * iface, + LPENUMIDLIST * ppenum) +{ + //IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + + return E_NOTIMPL; +} + +static const IEnumIDListVtbl eidlvt = +{ + IEnumIDList_fnQueryInterface, + IEnumIDList_fnAddRef, + IEnumIDList_fnRelease, + IEnumIDList_fnNext, + IEnumIDList_fnSkip, + IEnumIDList_fnReset, + IEnumIDList_fnClone, +}; + +IEnumIDList * IEnumIDList_Constructor(void) +{ + IEnumIDListImpl *lpeidl = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, sizeof(IEnumIDListImpl)); + + if (lpeidl) + { + lpeidl->ref = 1; + lpeidl->lpVtbl = &eidlvt; + } + + return (IEnumIDList*)lpeidl; +} + +LPPIDLDATA _ILGetDataPointer(LPCITEMIDLIST pidl) +{ + if(pidl && pidl->mkid.cb != 0x00) + return (LPPIDLDATA) &(pidl->mkid.abID); + return NULL; +} + +LPITEMIDLIST _ILAlloc(BYTE type, unsigned int size) +{ + LPITEMIDLIST pidlOut = NULL; + + pidlOut = SHAlloc(size + 5); + if(pidlOut) + { + LPPIDLDATA pData; + + ZeroMemory(pidlOut, size + 5); + pidlOut->mkid.cb = size + 3; + pData = _ILGetDataPointer(pidlOut); + if (pData) + pData->type = type; + + } + + return pidlOut; +} + +LPITEMIDLIST _ILCreateNetConnect() +{ + LPITEMIDLIST pidlOut; + + pidlOut = _ILAlloc(PT_GUID, sizeof(GUIDStruct)); + if (pidlOut) + { + LPPIDLDATA pData = _ILGetDataPointer(pidlOut); + + memcpy(&(pData->u.guid.guid), &CLSID_NetworkConnections, sizeof(GUID)); + } + else + { + pidlOut = NULL; + } + return pidlOut; +} + +IID* _ILGetGUIDPointer(LPCITEMIDLIST pidl) +{ + LPPIDLDATA pdata =_ILGetDataPointer(pidl); + + if (!pdata) + return NULL; + + if (pdata->type != PT_GUID) + return NULL; + else + return &(pdata->u.guid.guid); + +} + +BOOL _ILIsNetConnect(LPCITEMIDLIST pidl) +{ + REFIID iid = _ILGetGUIDPointer(pidl); + + if (iid) + return IsEqualIID(iid, &CLSID_NetworkConnections); + return FALSE; +} + +LPITEMIDLIST ILCreateNetConnectItem(MIB_IFROW * pRow, LPWSTR szName, LPWSTR szAdapterName) +{ + PIDLDATA tmp; + LPITEMIDLIST pidl; + VALUEStruct * p; + int size = sizeof(struct tagVALUEStruct); + + tmp.type = 0x00; + tmp.u.value.dummy = 0xFF; + + tmp.u.value.dwOperStatus = pRow->dwOperStatus; + tmp.u.value.dwType = pRow->dwType; + tmp.u.value.dwNameLength = wcslen(szName) + 1; + + size += (tmp.u.value.dwNameLength + wcslen(szAdapterName)) * sizeof(WCHAR); + + pidl = (LPITEMIDLIST)SHAlloc(size + 4); + if (!pidl) + return pidl; + + pidl->mkid.cb = size+2; + memcpy(pidl->mkid.abID, &tmp, 2+sizeof(struct tagVALUEStruct)); + + p = &((PIDLDATA*)pidl->mkid.abID)->u.value; + wcscpy(&p->szName[0], szName); + wcscpy(p->szName + tmp.u.value.dwNameLength, szAdapterName); + + *(WORD*)((char*)pidl+(size+2)) = 0; + return pidl; +} + +VALUEStruct * _ILGetValueStruct(LPCITEMIDLIST pidl) +{ + LPPIDLDATA pdata = _ILGetDataPointer(pidl); + + if (pdata && pdata->type==0x00) + return (VALUEStruct*)&(pdata->u.value); + + return NULL; +} Propchange: trunk/reactos/dll/win32/netshell/enumlist.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/netshell/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 27 12:18:25 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/netshell/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/netshell/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/netshell/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/netshell/netshell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.c (added) +++ trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] Wed Aug 27 12:18:25 2008 @@ -1,0 +1,144 @@ +#include "precomp.h" + +HINSTANCE netshell_hInstance; +const GUID CLSID_NetworkConnections = {0x7007ACC7, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; +const GUID GUID_DEVCLASS_NET = {0x4d36e972, 0xe325, 0x11ce, {0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}}; +static const WCHAR szNetConnectClass[] = L"CLSID\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; +static const WCHAR szNamespaceKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; + +static INTERFACE_TABLE InterfaceTable[] = +{ + { + &CLSID_NetworkConnections, + ISF_NetConnect_Constructor + }, + { + NULL, + NULL + } +}; + + +BOOL +WINAPI +DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + netshell_hInstance = hinstDLL; + DisableThreadLibraryCalls(netshell_hInstance); + break; + default: + break; + } + + return TRUE; +} + +HRESULT +WINAPI +DllCanUnloadNow(void) +{ + return S_FALSE; +} + +STDAPI +DllRegisterServer(void) +{ + HKEY hKey, hSubKey; + WCHAR szName[MAX_PATH] = {0}; + WCHAR szNet[20]; + UINT Length, Offset; + + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szNetConnectClass, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + return SELFREG_E_CLASS; + + if (LoadStringW(netshell_hInstance, IDS_NETWORKCONNECTION, szName, MAX_PATH)) + { + szName[MAX_PATH-1] = L'\0'; + RegSetValueW(hKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR)); + } + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szNamespaceKey, 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + RegSetValueW(hSubKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR)); + RegCloseKey(hSubKey); + } + + Length = swprintf(szNet, L",-%u", IDS_NETWORKCONNECTION); + Offset = GetModuleFileNameW(netshell_hInstance, &szName[1], MAX_PATH); + if (Offset + Length + 2 < MAX_PATH) + { + /* set localized name */ + szName[0] = L'@'; + wcscpy(&szName[Offset+1], szNet); + RegSetValueExW(hKey, L"LocalizedString", 0, REG_SZ, (const LPBYTE)szName, (wcslen(szName)+1) * sizeof(WCHAR)); + } + + szName[Offset+1] = L'\0'; + + /* store default icon */ + if (RegCreateKeyExW(hKey, L"DefaultIcon", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); + RegCloseKey(hSubKey); + } + if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); + RegCloseKey(hSubKey); + } + + if (RegCreateKeyExW(hKey, L"ShellFolder", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + DWORD dwAttributes = SFGAO_FOLDER; + RegSetValueExW(hSubKey, L"Attributes",0, REG_BINARY, (const LPBYTE)&dwAttributes, sizeof(DWORD)); + } + + return S_OK; +} + +STDAPI +DllUnregisterServer(void) +{ + SHDeleteKeyW(HKEY_CLASSES_ROOT, szNetConnectClass); + SHDeleteKeyW(HKEY_LOCAL_MACHINE, szNamespaceKey); + return S_OK; +} + +STDAPI +DllGetClassObject( + REFCLSID rclsid, + REFIID riid, + LPVOID* ppv +) +{ + UINT i; + HRESULT hres = E_OUTOFMEMORY; + IClassFactory * pcf = NULL; + + if (!ppv) + return E_INVALIDARG; + + *ppv = NULL; + + for (i = 0; InterfaceTable[i].riid; i++) + { + if (IsEqualIID(InterfaceTable[i].riid, rclsid)) + { + pcf = IClassFactory_fnConstructor(InterfaceTable[i].lpfnCI, NULL, NULL); + break; + } + } + + if (!pcf) + { + return CLASS_E_CLASSNOTAVAILABLE; + } + + hres = IClassFactory_QueryInterface(pcf, riid, ppv); + IClassFactory_Release(pcf); + + return hres; +} Propchange: trunk/reactos/dll/win32/netshell/netshell.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/netshell.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rbuild (added) +++ trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] Wed Aug 27 12:18:25 2008 @@ -1,0 +1,27 @@ +<module name="netshell" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="netshell.dll"> + <autoregister infsection="OleControlDlls" type="Both" /> + <importlibrary definition="netshell.spec.def" /> + <include base="netshell">.</include> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <define name="WINVER">0x600</define> + <define name="_NETSHELL_" /> + <library>shlwapi</library> + <library>shell32</library> + <library>version</library> + <library>iphlpapi</library> + <library>kernel32</library> + <library>wine</library> + <library>ole32</library> + <library>user32</library> + <library>uuid</library> + <library>advapi32</library> + <library>setupapi</library> + <pch>precomp.h</pch> + <file>netshell.c</file> + <file>shfldr_netconnect.c</file> + <file>enumlist.c</file> + <file>netshell.rc</file> + <file>classfactory.c</file> + <file>netshell.spec</file> +</module> Propchange: trunk/reactos/dll/win32/netshell/netshell.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rc (added) +++ trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] Wed Aug 27 12:18:25 2008 @@ -1,0 +1,10 @@ +#include <windows.h> +#include "shlobj.h" +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_SHELL_NETWORK_FOLDER ICON "res/netshell.ico" + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" Propchange: trunk/reactos/dll/win32/netshell/netshell.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/netshell.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.spec (added) +++ trunk/reactos/dll/win32/netshell/netshell.spec [iso-8859-1] Wed Aug 27 12:18:25 2008 @@ -1,0 +1,34 @@ + +1 stub DoInitialCleanup +2 stdcall DllCanUnloadNow() +3 stdcall DllGetClassObject(ptr ptr ptr) +4 stdcall DllRegisterServer() +5 stdcall DllUnregisterServer() +6 stub HrCreateDesktopIcon +7 stub HrGetAnswerFileParametersForNetCard +8 stub HrGetExtendedStatusFromNCS +9 stub HrGetIconFromMediaType +10 stub HrGetInstanceGuidOfPreNT5NetCardInstance +11 stub HrGetNetConExtendedStatusFromGuid +12 stub HrGetNetConExtendedStatusFromINetConnection +13 stub HrGetStatusStringFromNetConExtendedStatus +14 stub HrIsIpStateCheckingEnabled +15 stub HrLaunchConnection +16 stub HrLaunchConnectionEx +17 stub HrLaunchNetworkOptionalComponents +18 stub HrOemUpgrade +19 stub HrRenameConnection +20 stub HrRunWizard +21 stub InvokeDunFile +22 stub NcFreeNetconProperties +23 stub NcIsValidConnectionName +24 stub NetSetupAddRasConnection +25 stub NetSetupFinishInstall +26 stub NetSetupInstallSoftware +27 stub NetSetupPrepareSysPrep +28 stub NetSetupRequestWizardPages +29 stub NetSetupSetProgressCallback +30 stub NormalizeExtendedStatus +31 stub RaiseSupportDialog +32 stub RepairConnection +33 stub StartNCW Propchange: trunk/reactos/dll/win32/netshell/netshell.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp… ============================================================================== --- trunk/reactos/dll/win32/netshell/precomp.h (added) +++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Wed Aug 27 12:18:25 2008 @@ -1,0 +1,82 @@ +#ifndef _PRECOMP_H__ +#define _PRECOMP_H__ + +#include "config.h" + +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <assert.h> +#include <ctype.h> +#include <malloc.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windows.h> + +#include <shlguid.h> +#include <shlwapi.h> +#include <shlobj.h> +#include <shldisp.h> +#include <cpl.h> +#include <objbase.h> +#include <ole2.h> +#include <ocidl.h> +#include <shobjidl.h> +#include <shellapi.h> +#include <olectl.h> +#include <iphlpapi.h> +#include <shtypes.h> +#include <setupapi.h> +#include <devguid.h> + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "resource.h" + +typedef struct { + int colnameid; + int pcsFlags; + int fmt; + int cxChar; +} shvheader; + +typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); +typedef struct { + REFIID riid; + LPFNCREATEINSTANCE lpfnCI; +} INTERFACE_TABLE; + +typedef struct tagVALUEStruct +{ + BYTE dummy; + DWORD dwType; + DWORD dwOperStatus; + DWORD dwNameLength; + WCHAR szName[1]; +}VALUEStruct; + +/* globals */ +extern HINSTANCE netshell_hInstance; +extern const GUID CLSID_NetworkConnections; +extern const GUID GUID_DEVCLASS_NET; + + +/* shfldr_netconnect.c */ +HRESULT WINAPI ISF_NetConnect_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); + +/* enumlist.c */ +IEnumIDList * IEnumIDList_Constructor(void); +LPITEMIDLIST _ILCreateNetConnect(); +LPITEMIDLIST ILCreateNetConnectItem(MIB_IFROW * pRow, LPWSTR szName, LPWSTR szAdapterName); +BOOL _ILIsNetConnect (LPCITEMIDLIST pidl); +BOOL AddToEnumList(IEnumIDList * iface, LPITEMIDLIST pidl); +VALUEStruct * _ILGetValueStruct(LPCITEMIDLIST pidl); + +/* classfactory.c */ +IClassFactory * IClassFactory_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst); + +#endif Propchange: trunk/reactos/dll/win32/netshell/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/netshell/res/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 27 12:18:25 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/netshell/res/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/netshell/res/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/netshell/res/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/netshell/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/resourc… ============================================================================== --- trunk/reactos/dll/win32/netshell/resource.h (added) +++ trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] Wed Aug 27 12:18:25 2008 @@ -1,0 +1,31 @@ + +/* icons */ + +#define IDI_SHELL_NETWORK_FOLDER 100 + + +/* dialogs */ + + + + + +/* dialog controls */ + + +/* resource constants */ + +#define IDS_NETWORKCONNECTION 10000 +#define IDS_SHV_COLUMN_NAME 10001 +#define IDS_SHV_COLUMN_TYPE 10002 +#define IDS_SHV_COLUMN_STATE 10003 +#define IDS_SHV_COLUMN_DEVNAME 10004 +#define IDS_SHV_COLUMN_PHONE 10005 +#define IDS_SHV_COLUMN_OWNER 10006 +#define IDS_TYPE_ETHERNET 10007 +#define IDS_STATUS_NON_OPERATIONAL 10008 +#define IDS_STATUS_UNREACHABLE 10009 +#define IDS_STATUS_DISCONNECTED 10010 +#define IDS_STATUS_CONNECTING 10011 +#define IDS_STATUS_CONNECTED 10012 +#define IDS_STATUS_OPERATIONAL 10013 Propchange: trunk/reactos/dll/win32/netshell/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.c (added) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Wed Aug 27 12:18:25 2008 @@ -1,0 +1,905 @@ +/* + * Network Connections Shell Folder + * + * Copyright 2008 Johannes Anderwald <janderwald(a)reactos.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <precomp.h> + +WINE_DEFAULT_DEBUG_CHANNEL (shell); + +/*********************************************************************** +* IShellFolder implementation +*/ + +typedef struct { + const IShellFolder2Vtbl *lpVtbl; + LONG ref; + const IContextMenu2Vtbl *lpVtblContextMenu; + const IPersistFolder2Vtbl *lpVtblPersistFolder2; + + /* both paths are parsible from the desktop */ + LPITEMIDLIST pidlRoot; /* absolute pidl */ + LPCITEMIDLIST apidl; /* currently focused font item */ +} IGenericSFImpl, *LPIGenericSFImpl; + + +static const shvheader NetConnectSFHeader[] = { + {IDS_SHV_COLUMN_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 20}, + {IDS_SHV_COLUMN_TYPE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 8}, + {IDS_SHV_COLUMN_STATE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, + {IDS_SHV_COLUMN_DEVNAME, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 12}, + {IDS_SHV_COLUMN_PHONE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, + {IDS_SHV_COLUMN_OWNER, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 5} +}; + +#define NETCONNECTSHELLVIEWCOLUMNS 6 + +#define COLUMN_NAME 0 +#define COLUMN_TYPE 1 +#define COLUMN_STATUS 2 +#define COLUMN_DEVNAME 3 +#define COLUMN_PHONE 4 +#define COLUMN_OWNER 5 + +static LPIGenericSFImpl __inline impl_from_IContextMenu2(IContextMenu2 *iface) +{ + return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblContextMenu)); +} + +static LPIGenericSFImpl __inline impl_from_IPersistFolder2(IPersistFolder2 *iface) +{ + return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblPersistFolder2)); +} + + + +/************************************************************************** + * ISF_NetConnect_fnQueryInterface + * + * NOTE + * supports not IPersist/IPersistFolder + */ +static HRESULT WINAPI ISF_NetConnect_fnQueryInterface (IShellFolder2 *iface, REFIID riid, LPVOID *ppvObj) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + *ppvObj = NULL; + + if (IsEqualIID (riid, &IID_IUnknown) || + IsEqualIID (riid, &IID_IShellFolder) || + IsEqualIID (riid, &IID_IShellFolder2)) + { + *ppvObj = This; + } + else if (IsEqualIID (riid, &IID_IPersistFolder) || + IsEqualIID (riid, &IID_IPersistFolder2)) + { + *ppvObj = (LPVOID *)&This->lpVtblPersistFolder2; + } + if (*ppvObj) + { + IUnknown_AddRef ((IUnknown *) (*ppvObj)); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI ISF_NetConnect_fnAddRef (IShellFolder2 * iface) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +static ULONG WINAPI ISF_NetConnect_fnRelease (IShellFolder2 * iface) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + + if (!refCount) + { + SHFree (This->pidlRoot); + HeapFree (GetProcessHeap(), 0, This); + } + return refCount; +} + +/************************************************************************** +* ISF_NetConnect_fnParseDisplayName +*/ +static HRESULT WINAPI ISF_NetConnect_fnParseDisplayName (IShellFolder2 * iface, + HWND hwndOwner, LPBC pbcReserved, LPOLESTR lpszDisplayName, + DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + HRESULT hr = E_UNEXPECTED; + + *ppidl = 0; + if (pchEaten) + *pchEaten = 0; /* strange but like the original */ + + return hr; +} + +/************************************************************************** + * CreateNetConnectEnumListss() + */ +static BOOL CreateNetConnectEnumList(IEnumIDList *list, DWORD dwFlags) +{ + DWORD dwSize, dwResult, dwIndex; + MIB_IFTABLE *pIfTable; + MIB_IFROW IfEntry; + IP_ADAPTER_INFO * pAdapterInfo, *pCurrentAdapter; + HDEVINFO hInfo; + SP_DEVINFO_DATA DevInfo; + HKEY hSubKey; + WCHAR szNetCfg[50]; + WCHAR szAdapterNetCfg[50]; + LPITEMIDLIST pidl; + WCHAR szDetail[200] = L"SYSTEM\\CurrentControlSet\\Control\\Class\\"; + WCHAR szName[130] = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\"; + + /* get the IfTable */ + dwSize = 0; + if (GetIfTable(NULL, &dwSize, TRUE) != ERROR_INSUFFICIENT_BUFFER) + return FALSE; + + pIfTable = (PMIB_IFTABLE)HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!pIfTable) + return FALSE; + + dwResult = GetIfTable(pIfTable, &dwSize, TRUE); + if (dwResult != NO_ERROR) + { + HeapFree(GetProcessHeap(), 0, pIfTable); + return FALSE; + } + + dwSize = 0; + dwResult = GetAdaptersInfo(NULL, &dwSize); + if (dwResult!= ERROR_BUFFER_OVERFLOW) + { + HeapFree(GetProcessHeap(), 0, pIfTable); + return FALSE; + } + + pAdapterInfo = (PIP_ADAPTER_INFO)HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!pAdapterInfo) + { + HeapFree(GetProcessHeap(), 0, pIfTable); + return FALSE; + } + + if (GetAdaptersInfo(pAdapterInfo, &dwSize) != NO_ERROR) + { + HeapFree(GetProcessHeap(), 0, pIfTable); + HeapFree(GetProcessHeap(), 0, pAdapterInfo); + return FALSE; + } + + + hInfo = SetupDiGetClassDevs(&GUID_DEVCLASS_NET, NULL, NULL, DIGCF_PRESENT ); + if (!hInfo) + { + HeapFree(GetProcessHeap(), 0, pIfTable); + HeapFree(GetProcessHeap(), 0, pAdapterInfo); + return FALSE; + } + + dwIndex = 0; + do + { + ZeroMemory(&DevInfo, sizeof(SP_DEVINFO_DATA)); + DevInfo.cbSize = sizeof(DevInfo); + if (SetupDiEnumDeviceInfo(hInfo, dwIndex++, &DevInfo)) + { + if (SetupDiGetDeviceRegistryPropertyW(hInfo, &DevInfo, SPDRP_DRIVER, NULL, (LPBYTE)&szDetail[39], sizeof(szDetail)/sizeof(WCHAR) - 40, &dwSize)) + { + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szDetail, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szNetCfg); + dwResult = RegQueryValueExW(hSubKey, L"NetCfgInstanceId", NULL, NULL, (LPBYTE)szNetCfg, &dwSize); + if (dwResult == ERROR_SUCCESS) + { + pCurrentAdapter = pAdapterInfo; + while(pCurrentAdapter) + { + szAdapterNetCfg[0] = L'\0'; + if (MultiByteToWideChar(CP_ACP, 0, pCurrentAdapter->AdapterName, -1, szAdapterNetCfg, sizeof(szAdapterNetCfg)/sizeof(szAdapterNetCfg[0]))) + { + szAdapterNetCfg[(sizeof(szAdapterNetCfg)/sizeof(WCHAR))-1] = L'\0'; + } + if (!wcsicmp(szAdapterNetCfg, szNetCfg)) + { + ZeroMemory(&IfEntry, sizeof(IfEntry)); + IfEntry.dwIndex = pCurrentAdapter->Index; + dwResult = GetIfEntry(&IfEntry); + if (dwResult == NO_ERROR) + { + if (IfEntry.dwType == IF_TYPE_ETHERNET_CSMACD || IfEntry.dwType == IF_TYPE_IEEE80211) + { + wcscpy(&szName[80], szNetCfg); + wcscpy(&szName[118], L"\\Connection"); + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szName, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szAdapterNetCfg); + if (RegQueryValueExW(hSubKey, L"Name", NULL, NULL, (LPBYTE)szAdapterNetCfg, &dwSize) != ERROR_SUCCESS) + { + if (!SetupDiGetDeviceRegistryPropertyW(hInfo, &DevInfo, SPDRP_FRIENDLYNAME, NULL, (PBYTE)szAdapterNetCfg, sizeof(szAdapterNetCfg)/sizeof(WCHAR), &dwSize)) + { + szDetail[0] = 0; + } + } + RegCloseKey(hSubKey); + } + szNetCfg[0] = 0; + SetupDiGetDeviceRegistryPropertyW(hInfo, &DevInfo, SPDRP_DEVICEDESC, NULL, (PBYTE)szNetCfg, sizeof(szNetCfg)/sizeof(WCHAR), &dwSize); + pidl = ILCreateNetConnectItem(&IfEntry, szAdapterNetCfg, szNetCfg); + if (pidl) + { + AddToEnumList(list, pidl); + } + } + } + break; + } + pCurrentAdapter = pCurrentAdapter->Next; + } + } + } + } + }else if (GetLastError() == ERROR_NO_MORE_ITEMS) + { + break; + } + }while(TRUE); + + HeapFree(GetProcessHeap(), 0, pAdapterInfo); + HeapFree(GetProcessHeap(), 0, pIfTable); + SetupDiDestroyDeviceInfoList(hInfo); + + return FALSE; + +} + +/************************************************************************** +* ISF_NetConnect_fnEnumObjects +*/ +static HRESULT WINAPI ISF_NetConnect_fnEnumObjects (IShellFolder2 * iface, + HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + *ppEnumIDList = IEnumIDList_Constructor(); + if(*ppEnumIDList) + CreateNetConnectEnumList(*ppEnumIDList, dwFlags); + + + return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; +} + +/************************************************************************** +* ISF_NetConnect_fnBindToObject +*/ +static HRESULT WINAPI ISF_NetConnect_fnBindToObject (IShellFolder2 * iface, + LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + return E_NOTIMPL; +} + +/************************************************************************** +* ISF_NetConnect_fnBindToStorage +*/ +static HRESULT WINAPI ISF_NetConnect_fnBindToStorage (IShellFolder2 * iface, + LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + + *ppvOut = NULL; + return E_NOTIMPL; +} + +/************************************************************************** +* ISF_NetConnect_fnCompareIDs +*/ + +static HRESULT WINAPI ISF_NetConnect_fnCompareIDs (IShellFolder2 * iface, + LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + + + return E_NOTIMPL; +} + +/************************************************************************** +* ISF_NetConnect_fnCreateViewObject +*/ +static HRESULT WINAPI ISF_NetConnect_fnCreateViewObject (IShellFolder2 * iface, + HWND hwndOwner, REFIID riid, LPVOID * ppvOut) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + IShellView* pShellView; + CSFV cvf; + HRESULT hr = E_NOINTERFACE; + + if (!ppvOut) + return hr; + + *ppvOut = NULL; + + if (IsEqualIID (riid, &IID_IShellView)) + { + ZeroMemory(&cvf, sizeof(cvf)); + cvf.cbSize = sizeof(cvf); + cvf.pshf = (IShellFolder*)iface; + + hr = SHCreateShellFolderViewEx(&cvf, &pShellView); + if (SUCCEEDED(hr)) + { + hr = IShellView_QueryInterface (pShellView, riid, ppvOut); + IShellView_Release (pShellView); + } + } + + return hr; +} + +/************************************************************************** +* ISF_NetConnect_fnGetAttributesOf +*/ +static HRESULT WINAPI ISF_NetConnect_fnGetAttributesOf (IShellFolder2 * iface, + UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + HRESULT hr = S_OK; + static const DWORD dwNetConnectAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | + SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER | SFGAO_CANRENAME | SFGAO_CANDELETE; + + + if (!rgfInOut) + return E_INVALIDARG; + + if (cidl && !apidl) + return E_INVALIDARG; + + if (*rgfInOut == 0) + *rgfInOut = ~0; + + if(cidl == 0) + *rgfInOut = dwNetConnectAttributes; + + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ + *rgfInOut &= ~SFGAO_VALIDATE; + + return hr; +} + +/************************************************************************** +* ISF_NetConnect_fnGetUIObjectOf +* +* PARAMETERS +* hwndOwner [in] Parent window for any output +* cidl [in] array size +* apidl [in] simple pidl array +* riid [in] Requested Interface +* prgfInOut [ ] reserved +* ppvObject [out] Resulting Interface +* +*/ +static HRESULT WINAPI ISF_NetConnect_fnGetUIObjectOf (IShellFolder2 * iface, + HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, + UINT * prgfInOut, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + IUnknown *pObj = NULL; + HRESULT hr = E_INVALIDARG; + + if (!ppvOut) + return hr; + + *ppvOut = NULL; + + if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) + { + pObj = (IUnknown*)(&This->lpVtblContextMenu); + This->apidl = apidl[0]; + IUnknown_AddRef(pObj); + hr = S_OK; + } + else + hr = E_NOINTERFACE; + + if (SUCCEEDED(hr) && !pObj) + hr = E_OUTOFMEMORY; + + *ppvOut = pObj; + return hr; +} + +/************************************************************************** +* ISF_NetConnect_fnGetDisplayNameOf +* +*/ +static HRESULT WINAPI ISF_NetConnect_fnGetDisplayNameOf (IShellFolder2 * iface, + LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +{ + LPWSTR pszName; + HRESULT hr = E_FAIL; + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + if (!strRet) + return E_INVALIDARG; + + pszName = CoTaskMemAlloc(MAX_PATH * sizeof(WCHAR)); + if (!pszName) + return E_OUTOFMEMORY; + + if (_ILIsNetConnect (pidl)) + { + if (LoadStringW(netshell_hInstance, IDS_NETWORKCONNECTION, pszName, MAX_PATH)) + { + pszName[MAX_PATH-1] = L'\0'; + hr = S_OK; + } + } + else + { + VALUEStruct * val = _ILGetValueStruct(pidl); + if (val) + { + wcscpy(pszName, val->szName); + hr = S_OK; + } + + } + + if (SUCCEEDED(hr)) + { + strRet->uType = STRRET_WSTR; + strRet->u.pOleStr = pszName; + } + else + { + CoTaskMemFree(pszName); + } + + return hr; +} + +/************************************************************************** +* ISF_NetConnect_fnSetNameOf +* Changes the name of a file object or subfolder, possibly changing its item +* identifier in the process. +* +* PARAMETERS +* hwndOwner [in] Owner window for output +* pidl [in] simple pidl of item to change +* lpszName [in] the items new display name +* dwFlags [in] SHGNO formatting flags +* ppidlOut [out] simple pidl returned +*/ +static HRESULT WINAPI ISF_NetConnect_fnSetNameOf (IShellFolder2 * iface, + HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_NetConnect_fnGetDefaultSearchGUID ( + IShellFolder2 * iface, GUID * pguid) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_NetConnect_fnEnumSearches (IShellFolder2 * iface, + IEnumExtraSearch ** ppenum) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_NetConnect_fnGetDefaultColumn (IShellFolder2 * iface, + DWORD dwRes, ULONG * pSort, ULONG * pDisplay) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + if (pSort) + *pSort = 0; + if (pDisplay) + *pDisplay = 0; + + return S_OK; +} + +static HRESULT WINAPI ISF_NetConnect_fnGetDefaultColumnState ( + IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + if (!pcsFlags || iColumn >= NETCONNECTSHELLVIEWCOLUMNS) + return E_INVALIDARG; + *pcsFlags = NetConnectSFHeader[iColumn].pcsFlags; + return S_OK; +} + +static HRESULT WINAPI ISF_NetConnect_fnGetDetailsEx (IShellFolder2 * iface, + LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_NetConnect_fnGetDetailsOf (IShellFolder2 * iface, + LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + WCHAR buffer[MAX_PATH] = {0}; + HRESULT hr = E_FAIL; + VALUEStruct * val; + + if (iColumn >= NETCONNECTSHELLVIEWCOLUMNS) + return E_FAIL; + + psd->fmt = NetConnectSFHeader[iColumn].fmt; + psd->cxChar = NetConnectSFHeader[iColumn].cxChar; + if (pidl == NULL) + { + psd->str.uType = STRRET_WSTR; + if (LoadStringW(netshell_hInstance, NetConnectSFHeader[iColumn].colnameid, buffer, MAX_PATH)) + hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + + return hr; + } + + if (iColumn == COLUMN_NAME) + { + psd->str.uType = STRRET_WSTR; + return IShellFolder2_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &psd->str); + } + + val = _ILGetValueStruct(pidl); + if (!val) + return E_FAIL; + + switch(iColumn) + { + case COLUMN_TYPE: + if (val->dwType == IF_TYPE_ETHERNET_CSMACD || val->dwType == IF_TYPE_IEEE80211) + { + if (LoadStringW(netshell_hInstance, IDS_TYPE_ETHERNET, buffer, MAX_PATH)) + { + psd->str.uType = STRRET_WSTR; + hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + } + } + break; + case COLUMN_STATUS: + buffer[0] = L'\0'; + if (val->dwOperStatus == MIB_IF_OPER_STATUS_NON_OPERATIONAL) + LoadStringW(netshell_hInstance, IDS_STATUS_NON_OPERATIONAL, buffer, MAX_PATH); + else if (val->dwOperStatus == MIB_IF_OPER_STATUS_UNREACHABLE) + LoadStringW(netshell_hInstance, IDS_STATUS_UNREACHABLE, buffer, MAX_PATH); + else if (val->dwOperStatus == MIB_IF_OPER_STATUS_DISCONNECTED) + LoadStringW(netshell_hInstance, IDS_STATUS_DISCONNECTED, buffer, MAX_PATH); + else if (val->dwOperStatus == MIB_IF_OPER_STATUS_CONNECTING) + LoadStringW(netshell_hInstance, IDS_STATUS_CONNECTING, buffer, MAX_PATH); + else if (val->dwOperStatus == MIB_IF_OPER_STATUS_CONNECTED) + LoadStringW(netshell_hInstance, IDS_STATUS_CONNECTED, buffer, MAX_PATH); + else if (val->dwOperStatus == MIB_IF_OPER_STATUS_OPERATIONAL) + LoadStringW(netshell_hInstance, IDS_STATUS_OPERATIONAL, buffer, MAX_PATH); + + if (buffer[0]) + { + buffer[MAX_PATH-1] = L'\0'; + psd->str.uType = STRRET_WSTR; + hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + } + break; + case COLUMN_DEVNAME: + wcscpy(buffer, val->szName + val->dwNameLength); + buffer[MAX_PATH-1] = L'\0'; + psd->str.uType = STRRET_WSTR; + hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + break; + case COLUMN_PHONE: + case COLUMN_OWNER: + psd->str.u.cStr[0] = '\0'; + psd->str.uType = STRRET_CSTR; + break; + } + + return hr; +} + +static HRESULT WINAPI ISF_NetConnect_fnMapColumnToSCID (IShellFolder2 * iface, + UINT column, SHCOLUMNID * pscid) +{ + //IGenericSFImpl *This = (IGenericSFImpl *)iface; + + return E_NOTIMPL; +} + +static const IShellFolder2Vtbl vt_ShellFolder2 = { + ISF_NetConnect_fnQueryInterface, + ISF_NetConnect_fnAddRef, + ISF_NetConnect_fnRelease, + ISF_NetConnect_fnParseDisplayName, + ISF_NetConnect_fnEnumObjects, + ISF_NetConnect_fnBindToObject, + ISF_NetConnect_fnBindToStorage, + ISF_NetConnect_fnCompareIDs, + ISF_NetConnect_fnCreateViewObject, + ISF_NetConnect_fnGetAttributesOf, + ISF_NetConnect_fnGetUIObjectOf, + ISF_NetConnect_fnGetDisplayNameOf, + ISF_NetConnect_fnSetNameOf, + /* ShellFolder2 */ + ISF_NetConnect_fnGetDefaultSearchGUID, + ISF_NetConnect_fnEnumSearches, + ISF_NetConnect_fnGetDefaultColumn, + ISF_NetConnect_fnGetDefaultColumnState, + ISF_NetConnect_fnGetDetailsEx, + ISF_NetConnect_fnGetDetailsOf, + ISF_NetConnect_fnMapColumnToSCID +}; + +/************************************************************************** +* IContextMenu2 Implementation +*/ + +/************************************************************************ + * ISF_NetConnect_IContextMenu_QueryInterface + */ +static HRESULT WINAPI ISF_NetConnect_IContextMenu2_QueryInterface(IContextMenu2 * iface, REFIID iid, LPVOID * ppvObject) +{ + IGenericSFImpl * This = impl_from_IContextMenu2(iface); + + return IShellFolder2_QueryInterface((IShellFolder2*)This, iid, ppvObject); +} + +/************************************************************************ + * ISF_NetConnect_IContextMenu_AddRef + */ +static ULONG WINAPI ISF_NetConnect_IContextMenu2_AddRef(IContextMenu2 * iface) +{ + IGenericSFImpl * This = impl_from_IContextMenu2(iface); + + return IShellFolder2_AddRef((IShellFolder2*)This); +} + +/************************************************************************ + * ISF_NetConnect_IContextMenu_Release + */ +static ULONG WINAPI ISF_NetConnect_IContextMenu2_Release(IContextMenu2 * iface) +{ + IGenericSFImpl * This = impl_from_IContextMenu2(iface); + + return IShellFolder2_Release((IShellFolder2*)This); +} + +/************************************************************************** +* ISF_NetConnect_IContextMenu_QueryContextMenu() +*/ +static HRESULT WINAPI ISF_NetConnect_IContextMenu2_QueryContextMenu( + IContextMenu2 *iface, + HMENU hMenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) +{ + int Count = 1; + //IGenericSFImpl * This = impl_from_IContextMenu2(iface); + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); +} + + +/************************************************************************** +* ISF_NetConnect_IContextMenu_InvokeCommand() +*/ +static HRESULT WINAPI ISF_NetConnect_IContextMenu2_InvokeCommand( + IContextMenu2 *iface, + LPCMINVOKECOMMANDINFO lpcmi) +{ + //IGenericSFImpl * This = impl_from_IContextMenu2(iface); + + return S_OK; +} + +/************************************************************************** + * ISF_NetConnect_IContextMenu_GetCommandString() + * + */ +static HRESULT WINAPI ISF_NetConnect_IContextMenu2_GetCommandString( + IContextMenu2 *iface, + UINT_PTR idCommand, + UINT uFlags, + UINT* lpReserved, + LPSTR lpszName, + UINT uMaxNameLen) +{ + //IGenericSFImpl * This = impl_from_IContextMenu2(iface); + + return E_FAIL; +} + + + +/************************************************************************** +* ISF_NetConnect_IContextMenu_HandleMenuMsg() +*/ +static HRESULT WINAPI ISF_NetConnect_IContextMenu2_HandleMenuMsg( + IContextMenu2 *iface, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + //IGenericSFImpl * This = impl_from_IContextMenu2(iface); + + + return E_NOTIMPL; +} + +static const IContextMenu2Vtbl vt_ContextMenu2 = +{ + ISF_NetConnect_IContextMenu2_QueryInterface, + ISF_NetConnect_IContextMenu2_AddRef, + ISF_NetConnect_IContextMenu2_Release, + ISF_NetConnect_IContextMenu2_QueryContextMenu, + ISF_NetConnect_IContextMenu2_InvokeCommand, + ISF_NetConnect_IContextMenu2_GetCommandString, + ISF_NetConnect_IContextMenu2_HandleMenuMsg +}; + +/************************************************************************ + * ISF_NetConnect_PersistFolder2_QueryInterface + */ +static HRESULT WINAPI ISF_NetConnect_PersistFolder2_QueryInterface (IPersistFolder2 * iface, + REFIID iid, LPVOID * ppvObj) +{ + IGenericSFImpl * This = impl_from_IPersistFolder2(iface); + + return IShellFolder2_QueryInterface ((IShellFolder2*)This, iid, ppvObj); +} + +/************************************************************************ + * ISF_NetConnect_PersistFolder2_AddRef + */ +static ULONG WINAPI ISF_NetConnect_PersistFolder2_AddRef (IPersistFolder2 * iface) +{ + IGenericSFImpl * This = impl_from_IPersistFolder2(iface); + + return IShellFolder2_AddRef((IShellFolder2*)This); +} + +/************************************************************************ + * ISF_NetConnect_PersistFolder2_Release + */ +static ULONG WINAPI ISF_NetConnect_PersistFolder2_Release (IPersistFolder2 * iface) +{ + IGenericSFImpl * This = impl_from_IPersistFolder2(iface); + + return IShellFolder2_Release((IShellFolder2*)This); +} + +/************************************************************************ + * ISF_NetConnect_PersistFolder2_GetClassID + */ +static HRESULT WINAPI ISF_NetConnect_PersistFolder2_GetClassID ( + IPersistFolder2 * iface, CLSID * lpClassId) +{ + //IGenericSFImpl * This = impl_from_IPersistFolder2(iface); + + if (!lpClassId) + return E_POINTER; + + *lpClassId = CLSID_NetworkConnections; + + return S_OK; +} + +/************************************************************************ + * ISF_NetConnect_PersistFolder2_Initialize + * + * NOTES: it makes no sense to change the pidl + */ +static HRESULT WINAPI ISF_NetConnect_PersistFolder2_Initialize ( + IPersistFolder2 * iface, LPCITEMIDLIST pidl) +{ + IGenericSFImpl * This = impl_from_IPersistFolder2(iface); + + SHFree(This->pidlRoot); + This->pidlRoot = ILClone(pidl); + + return S_OK; +} + +/************************************************************************** + * ISF_NetConnect_PersistFolder2_GetCurFolder + */ +static HRESULT WINAPI ISF_NetConnect_PersistFolder2_GetCurFolder ( + IPersistFolder2 * iface, LPITEMIDLIST * pidl) +{ + IGenericSFImpl * This = impl_from_IPersistFolder2(iface); + + + if (!pidl) + return E_POINTER; + + *pidl = ILClone (This->pidlRoot); + + return S_OK; +} + +static const IPersistFolder2Vtbl vt_PersistFolder2 = +{ + ISF_NetConnect_PersistFolder2_QueryInterface, + ISF_NetConnect_PersistFolder2_AddRef, + ISF_NetConnect_PersistFolder2_Release, + ISF_NetConnect_PersistFolder2_GetClassID, + ISF_NetConnect_PersistFolder2_Initialize, + ISF_NetConnect_PersistFolder2_GetCurFolder +}; + +/************************************************************************** +* ISF_NetConnect_Constructor +*/ +HRESULT WINAPI ISF_NetConnect_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + IGenericSFImpl *sf; + + if (!ppv) + return E_POINTER; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + sf = (IGenericSFImpl *) HeapAlloc ( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof (IGenericSFImpl)); + if (!sf) + return E_OUTOFMEMORY; + + sf->ref = 1; + sf->lpVtbl = &vt_ShellFolder2; + sf->lpVtblPersistFolder2 = &vt_PersistFolder2; + sf->lpVtblContextMenu = &vt_ContextMenu2; + sf->pidlRoot = _ILCreateNetConnect(); /* my qualified pidl */ + + if (!SUCCEEDED (IShellFolder2_QueryInterface ((IShellFolder2*)sf, riid, ppv))) + { + IShellFolder2_Release((IShellFolder2*)sf); + return E_NOINTERFACE; + } + + return S_OK; +} Propchange: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Wed Aug 27 12:18:25 2008 @@ -196,6 +196,9 @@ <directory name="netid"> <xi:include href="netid/netid.rbuild" /> </directory> +<directory name="netshell"> + <xi:include href="netshell/netshell.rbuild" /> +</directory> <directory name="newdev"> <xi:include href="newdev/newdev.rbuild" /> </directory>

1 0

[arty] 35706: CcPurgeCacheSection now exists. Add an ASSERT for wierd section sizes.
by arty＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: arty Date: Wed Aug 27 11:12:03 2008 New Revision: 35706 URL: http://svn.reactos.org/svn/reactos?rev=35706&view=rev Log: CcPurgeCacheSection now exists. Add an ASSERT for wierd section sizes. Modified: branches/arty-newcc/drivers/filesystems/fastfat/cleanup.c branches/arty-newcc/ntoskrnl/cache/pinsup.c Modified: branches/arty-newcc/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Wed Aug 27 11:12:03 2008 @@ -82,12 +82,7 @@ ObDereferenceObject(tmpFileObject); } -#if 0 - /* FIXME: - * CcPurgeCacheSection is unimplemented. - */ CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); -#endif } /* Uninitialize file cache if. */ if (FileObject->SectionObjectPointer->SharedCacheMap) Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Wed Aug 27 11:12:03 2008 @@ -455,7 +455,8 @@ if (!SectionObject) { PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; - ULONG SectionSize = min(CACHE_STRIPE, Map->FileSizes.ValidDataLength.QuadPart - Target.QuadPart); + LONG SectionSize = min(CACHE_STRIPE, Map->FileSizes.ValidDataLength.QuadPart - Target.QuadPart); + ASSERT(SectionSize > 0 && SectionSize <= CACHE_STRIPE); DPRINT("Allocating a cache stripe at %x:%d\n", Target.LowPart, SectionSize); Status = CcpAllocateSection

1 0

[fireball] 35705: - Implement CmpQueryKeyName as a wrapper around CmpConstructName helper function (which is stubbed now).
by fireball＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: fireball Date: Wed Aug 27 10:55:32 2008 New Revision: 35705 URL: http://svn.reactos.org/svn/reactos?rev=35705&view=rev Log: - Implement CmpQueryKeyName as a wrapper around CmpConstructName helper function (which is stubbed now). Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Wed Aug 27 10:55:32 2008 @@ -886,6 +886,14 @@ return Kcb; } +PUNICODE_STRING +NTAPI +CmpConstructName(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + UNIMPLEMENTED; + return NULL; +} + VOID NTAPI EnlistKeyBodyWithKCB(IN PCM_KEY_BODY KeyBody, Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Wed Aug 27 10:55:32 2008 @@ -119,9 +119,74 @@ OUT PULONG ReturnLength, IN KPROCESSOR_MODE PreviousMode) { - DPRINT1("CmpQueryKeyName() called\n"); - ASSERT(FALSE); - return STATUS_SUCCESS; + PUNICODE_STRING KeyName; + NTSTATUS Status = STATUS_SUCCESS; + PCM_KEY_BODY KeyBody = (PCM_KEY_BODY)ObjectBody; + PCM_KEY_CONTROL_BLOCK Kcb = KeyBody->KeyControlBlock; + + /* Acquire hive lock */ + CmpLockRegistry(); + + /* Lock KCB shared */ + CmpAcquireKcbLockShared(Kcb); + + /* Check if it's a deleted block */ + if (Kcb->Delete) + { + /* Release the locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + + /* Let the caller know it's deleted */ + return STATUS_KEY_DELETED; + } + + /* Get the name */ + KeyName = CmpConstructName(Kcb); + + /* Release the locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + + /* Check if we got the name */ + if (!KeyName) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set the returned length */ + *ReturnLength = KeyName->Length + sizeof(OBJECT_NAME_INFORMATION) + sizeof(WCHAR); + + /* Check if it fits into the provided buffer */ + if ((Length < sizeof(OBJECT_NAME_INFORMATION)) || + (Length < (*ReturnLength - sizeof(OBJECT_NAME_INFORMATION)))) + { + /* Free the buffer allocated by CmpConstructName */ + ExFreePool(KeyName->Buffer); + + /* Return buffer length failure */ + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Fill in the result */ + _SEH_TRY + { + /* Return data to user */ + ObjectNameInfo->Name.Buffer = (PWCHAR)(ObjectNameInfo + 1); + ObjectNameInfo->Name.MaximumLength = KeyName->Length; + ObjectNameInfo->Name.Length = KeyName->Length; + + /* Copy string content*/ + RtlCopyMemory(ObjectNameInfo->Name.Buffer, KeyName->Buffer, *ReturnLength); + } + _SEH_HANDLE + { + /* Get the status */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Free the buffer allocated by CmpConstructName */ + ExFreePool(KeyName->Buffer); + + return Status; } NTSTATUS Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Wed Aug 27 10:55:32 2008 @@ -896,6 +896,12 @@ VOID NTAPI CmpCleanUpSubKeyInfo( + IN PCM_KEY_CONTROL_BLOCK Kcb +); + +PUNICODE_STRING +NTAPI +CmpConstructName( IN PCM_KEY_CONTROL_BLOCK Kcb );

1 0

[tkreuzer] 35704: - implement stub EnableA20 - define MachInit to PcMachInit - use i386 versions of machine dependend code for amd64 -> 13 files / 160 kb less
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Wed Aug 27 10:41:38 2008 New Revision: 35704 URL: http://svn.reactos.org/svn/reactos?rev=35704&view=rev Log: - implement stub EnableA20 - define MachInit to PcMachInit - use i386 versions of machine dependend code for amd64 -> 13 files / 160 kb less Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hardware.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hwacpi.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hwapm.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hwpci.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386disk.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386rtl.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386vid.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mach.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pccons.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcdisk.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcmem.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcvideo.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hwacpi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hwapm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/hwpci.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386disk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386rtl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386vid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mach.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pccons.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcdisk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/pcvideo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/…

1 0

[tkreuzer] 35703: - Convert PortAddress from ULONG to PUCHAR - Fix some int <-> pointer casts - remove useless #if __i386__ - use %p for pointer sized prints
by tkreuzer＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: tkreuzer Date: Wed Aug 27 10:37:36 2008 New Revision: 35703 URL: http://svn.reactos.org/svn/reactos?rev=35703&view=rev Log: - Convert PortAddress from ULONG to PUCHAR - Fix some int <-> pointer casts - remove useless #if __i386__ - use %p for pointer sized prints Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hardware.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -779,21 +779,21 @@ } static VOID -InitializeSerialPort(ULONG Port, +InitializeSerialPort(PUCHAR Port, ULONG LineControl) { - WRITE_PORT_UCHAR((PUCHAR)Port + 3, 0x80); /* set DLAB on */ - WRITE_PORT_UCHAR((PUCHAR)Port, 0x60); /* speed LO byte */ - WRITE_PORT_UCHAR((PUCHAR)Port + 1, 0); /* speed HI byte */ - WRITE_PORT_UCHAR((PUCHAR)Port + 3, LineControl); - WRITE_PORT_UCHAR((PUCHAR)Port + 1, 0); /* set comm and DLAB to 0 */ - WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x09); /* DR int enable */ - READ_PORT_UCHAR((PUCHAR)Port + 5); /* clear error bits */ + WRITE_PORT_UCHAR(Port + 3, 0x80); /* set DLAB on */ + WRITE_PORT_UCHAR(Port, 0x60); /* speed LO byte */ + WRITE_PORT_UCHAR(Port + 1, 0); /* speed HI byte */ + WRITE_PORT_UCHAR(Port + 3, LineControl); + WRITE_PORT_UCHAR(Port + 1, 0); /* set comm and DLAB to 0 */ + WRITE_PORT_UCHAR(Port + 4, 0x09); /* DR int enable */ + READ_PORT_UCHAR(Port + 5); /* clear error bits */ } static ULONG -DetectSerialMouse(ULONG Port) +DetectSerialMouse(PUCHAR Port) { CHAR Buffer[4]; ULONG i; @@ -801,8 +801,8 @@ UCHAR LineControl; /* Shutdown mouse or something like that */ - LineControl = READ_PORT_UCHAR((PUCHAR)Port + 4); - WRITE_PORT_UCHAR((PUCHAR)Port + 4, (LineControl & ~0x02) | 0x01); + LineControl = READ_PORT_UCHAR(Port + 4); + WRITE_PORT_UCHAR(Port + 4, (LineControl & ~0x02) | 0x01); StallExecutionProcessor(100000); /* @@ -812,18 +812,18 @@ * therefore we must give up after some time. */ TimeOut = 200; - while (READ_PORT_UCHAR((PUCHAR)Port + 5) & 0x01) + while (READ_PORT_UCHAR(Port + 5) & 0x01) { if (--TimeOut == 0) return MOUSE_TYPE_NONE; - READ_PORT_UCHAR((PUCHAR)Port); + READ_PORT_UCHAR(Port); } /* * Send modem control with 'Data Terminal Ready', 'Request To Send' and * 'Output Line 2' message. This enables mouse to identify. */ - WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x0b); + WRITE_PORT_UCHAR(Port + 4, 0x0b); /* Wait 10 milliseconds for the mouse getting ready */ StallExecutionProcessor(10000); @@ -832,14 +832,14 @@ TimeOut = 200; for (i = 0; i < 4; i++) { - while (((READ_PORT_UCHAR((PUCHAR)Port + 5) & 1) == 0) && (TimeOut > 0)) + while (((READ_PORT_UCHAR(Port + 5) & 1) == 0) && (TimeOut > 0)) { StallExecutionProcessor(1000); --TimeOut; if (TimeOut == 0) return MOUSE_TYPE_NONE; } - Buffer[i] = READ_PORT_UCHAR((PUCHAR)Port); + Buffer[i] = READ_PORT_UCHAR(Port); } DbgPrint((DPRINT_HWDETECT, @@ -891,26 +891,26 @@ static ULONG -GetSerialMousePnpId(ULONG Port, char *Buffer) +GetSerialMousePnpId(PUCHAR Port, char *Buffer) { ULONG TimeOut; ULONG i = 0; char c; char x; - WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x09); + WRITE_PORT_UCHAR(Port + 4, 0x09); /* Wait 10 milliseconds for the mouse getting ready */ StallExecutionProcessor(10000); - WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x0b); + WRITE_PORT_UCHAR(Port + 4, 0x0b); StallExecutionProcessor(10000); for (;;) { TimeOut = 200; - while (((READ_PORT_UCHAR((PUCHAR)Port + 5) & 1) == 0) && (TimeOut > 0)) + while (((READ_PORT_UCHAR(Port + 5) & 1) == 0) && (TimeOut > 0)) { StallExecutionProcessor(1000); --TimeOut; @@ -920,7 +920,7 @@ } } - c = READ_PORT_UCHAR((PUCHAR)Port); + c = READ_PORT_UCHAR(Port); if (c == 0x08 || c == 0x28) break; } @@ -931,14 +931,14 @@ for (;;) { TimeOut = 200; - while (((READ_PORT_UCHAR((PUCHAR)Port + 5) & 1) == 0) && (TimeOut > 0)) + while (((READ_PORT_UCHAR(Port + 5) & 1) == 0) && (TimeOut > 0)) { StallExecutionProcessor(1000); --TimeOut; if (TimeOut == 0) return 0; } - c = READ_PORT_UCHAR((PUCHAR)Port); + c = READ_PORT_UCHAR(Port); Buffer[i++] = c; if (c == x) break; @@ -952,7 +952,7 @@ static VOID DetectSerialPointerPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey, - ULONG Base) + PUCHAR Base) { CM_PARTIAL_RESOURCE_LIST PartialResourceList; char Buffer[256]; @@ -1227,7 +1227,7 @@ if (!Rs232PortInUse(Base)) { /* Detect serial mouse */ - DetectSerialPointerPeripheral(ControllerKey, Base); + DetectSerialPointerPeripheral(ControllerKey, UlongToPtr(Base)); } ControllerNumber++; Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -30,7 +30,7 @@ /* Find the 'Root System Descriptor Table Pointer' */ Ptr = (PUCHAR)0xE0000; - while ((ULONG)Ptr < 0x100000) + while ((ULONG_PTR)Ptr < 0x100000) { if (!memcmp(Ptr, "RSD PTR ", 8)) { @@ -39,7 +39,7 @@ return (PRSDP_DESCRIPTOR)Ptr; } - Ptr = (PUCHAR)((ULONG)Ptr + 0x10); + Ptr = (PUCHAR)((ULONG_PTR)Ptr + 0x10); } DbgPrint((DPRINT_HWDETECT, "ACPI not supported\n")); Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -71,7 +71,7 @@ ULONG i; Table = (PPCI_IRQ_ROUTING_TABLE)0xF0000; - while ((ULONG)Table < 0x100000) + while ((ULONG_PTR)Table < 0x100000) { if (Table->Signature == 0x52495024) { @@ -98,7 +98,7 @@ return Table; } - Table = (PPCI_IRQ_ROUTING_TABLE)((ULONG)Table + 0x10); + Table = (PPCI_IRQ_ROUTING_TABLE)((ULONG_PTR)Table + 0x10); } return NULL; Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -25,8 +25,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////// // FUNCTIONS ///////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __i386__ BOOLEAN DiskResetController(ULONG DriveNumber) { @@ -177,7 +175,7 @@ DbgPrint((DPRINT_DISK, "EED configuration parameters: %x:%x\n", Ptr[13], Ptr[14])); if (Ptr[13] != 0xffff && Ptr[14] != 0xffff) { - PUCHAR SpecPtr = (PUCHAR)((Ptr[13] << 4) + Ptr[14]); + PUCHAR SpecPtr = (PUCHAR)(ULONG_PTR)((Ptr[13] << 4) + Ptr[14]); DbgPrint((DPRINT_DISK, "SpecPtr: %x\n", SpecPtr)); DbgPrint((DPRINT_DISK, "physical I/O port base address: %x\n", *(PUSHORT)&SpecPtr[0])); DbgPrint((DPRINT_DISK, "disk-drive control port address: %x\n", *(PUSHORT)&SpecPtr[2])); @@ -198,6 +196,4 @@ return TRUE; } -#endif /* defined __i386__ */ - /* EOF */ Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -83,8 +83,8 @@ Packet->PacketSize = sizeof(I386_DISK_ADDRESS_PACKET); Packet->Reserved = 0; Packet->LBABlockCount = SectorCount; - Packet->TransferBufferOffset = ((ULONG)Buffer) & 0x0F; - Packet->TransferBufferSegment = ((ULONG)Buffer) >> 4; + Packet->TransferBufferOffset = ((ULONG_PTR)Buffer) & 0x0F; + Packet->TransferBufferSegment = ((ULONG_PTR)Buffer) >> 4; Packet->LBAStartBlock = SectorNumber; // BIOS int 0x13, function 42h - IBM/MS INT 13 Extensions - EXTENDED READ @@ -211,8 +211,8 @@ RegsIn.b.cl = (PhysicalSector + ((PhysicalTrack & 0x300) >> 2)); RegsIn.b.dh = PhysicalHead; RegsIn.b.dl = DriveNumber; - RegsIn.w.es = ((ULONG)Buffer) >> 4; - RegsIn.w.bx = ((ULONG)Buffer) & 0x0F; + RegsIn.w.es = ((ULONG_PTR)Buffer) >> 4; + RegsIn.w.bx = ((ULONG_PTR)Buffer) & 0x0F; // // Perform the read Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -194,8 +194,8 @@ /* Copy data to caller's buffer */ RtlCopyMemory(&BiosMemoryMap[MapCount], (PVOID)BIOSCALLBUFFER, Regs.x.ecx); - DbgPrint((DPRINT_MEMORY, "BaseAddress: 0x%x%x\n", BiosMemoryMap[MapCount].BaseAddress)); - DbgPrint((DPRINT_MEMORY, "Length: 0x%x%x\n", BiosMemoryMap[MapCount].Length)); + DbgPrint((DPRINT_MEMORY, "BaseAddress: 0x%p\n", (PVOID)BiosMemoryMap[MapCount].BaseAddress)); + DbgPrint((DPRINT_MEMORY, "Length: 0x%p\n", (PVOID)BiosMemoryMap[MapCount].Length)); DbgPrint((DPRINT_MEMORY, "Type: 0x%x\n", BiosMemoryMap[MapCount].Type)); DbgPrint((DPRINT_MEMORY, "Reserved: 0x%x\n", BiosMemoryMap[MapCount].Reserved)); DbgPrint((DPRINT_MEMORY, "\n")); Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Wed Aug 27 10:37:36 2008 @@ -361,7 +361,7 @@ static VOID PcVideoSet480ScanLines(VOID) { - int CRTC; + INT_PTR CRTC; /* Read CRTC port */ CRTC = READ_PORT_UCHAR((PUCHAR)0x03CC); @@ -418,7 +418,7 @@ static VOID PcVideoSetDisplayEnd(VOID) { - int CRTC; + INT_PTR CRTC; /* Read CRTC port */ CRTC = READ_PORT_UCHAR((PUCHAR)0x03CC); @@ -1054,7 +1054,7 @@ { USHORT *BufPtr; - BufPtr = (USHORT *) (VIDEOTEXT_MEM_ADDRESS + Y * BytesPerScanLine + X * 2); + BufPtr = (USHORT *) (ULONG_PTR)(VIDEOTEXT_MEM_ADDRESS + Y * BytesPerScanLine + X * 2); *BufPtr = ((USHORT) Attr << 8) | (Ch & 0xff); }

1 0

[arty] 35702: We don't need MmIsCOWAddress any longer.
by arty＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: arty Date: Wed Aug 27 10:22:10 2008 New Revision: 35702 URL: http://svn.reactos.org/svn/reactos?rev=35702&view=rev Log: We don't need MmIsCOWAddress any longer. Modified: branches/arty-newcc/ntoskrnl/mm/section.c Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Wed Aug 27 10:22:10 2008 @@ -374,21 +374,6 @@ */ RtlCreateUnicodeString(ModuleName, L"C:\\ReactOS\\system32\\ntdll.dll"); return STATUS_SUCCESS; -} - -BOOLEAN -NTAPI -MmIsCOWAddress(IN PEPROCESS Process, IN PVOID Address) -{ - BOOLEAN IsCow = TRUE; /* Don't write unless we're sure */ - PMEMORY_AREA MemoryArea; - - MmLockAddressSpace(&Process->VadRoot); - MemoryArea = MmLocateMemoryAreaByAddress(&Process->VadRoot, Address); - ASSERT(MemoryArea); - IsCow = MemoryArea->Data.SectionData.WriteCopyView; - MmUnlockAddressSpace(&Process->VadRoot); - return IsCow; } /* Note: Mmsp prefix denotes "Memory Manager Section Private". */

1 0

[arty] 35701: Convert to using a fast mutex.
by arty＠svn.reactos.org 27 Aug '08

27 Aug '08

Author: arty Date: Wed Aug 27 10:21:39 2008 New Revision: 35701 URL: http://svn.reactos.org/svn/reactos?rev=35701&view=rev Log: Convert to using a fast mutex. Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/pinsup.c branches/arty-newcc/ntoskrnl/include/internal/cc.h Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Wed Aug 27 10:21:39 2008 @@ -21,10 +21,6 @@ NTAPI MmGetDeviceObjectForFile(IN PFILE_OBJECT FileObject); -BOOLEAN -NTAPI -MmIsCOWAddress(PEPROCESS Process, PVOID Address); - NTSTATUS NTAPI CcpSimpleWrite @@ -43,8 +39,7 @@ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - if (MmIsDirtyPage(PsInitialSystemProcess, Buffer) && - !MmIsCOWAddress(PsInitialSystemProcess, Buffer)) + if (MmIsDirtyPage(PsInitialSystemProcess, Buffer)) { DPRINT1 ("PAGING WRITE (FLUSH) Offset %x Length %d\n", @@ -100,7 +95,6 @@ } ObDereferenceObject(FileObject); - MmDeleteHyperspaceMapping(Buffer); DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); } Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Wed Aug 27 10:21:39 2008 @@ -44,7 +44,7 @@ CcCacheBitmap->Buffer = ((PULONG)&CcCacheBitmap[1]); CcCacheBitmap->SizeOfBitMap = ROUND_UP(CACHE_NUM_SECTIONS, 32); DPRINT("Cache has %d entries\n", CcCacheBitmap->SizeOfBitMap); - KeInitializeGuardedMutex(&CcMutex); + ExInitializeFastMutex(&CcMutex); Status = PsCreateSystemThread (&CcUnmapThreadHandle, THREAD_ALL_ACCESS, Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Wed Aug 27 10:21:39 2008 @@ -22,7 +22,7 @@ NOCC_BCB CcCacheSections[CACHE_NUM_SECTIONS]; CHAR CcpBitmapBuffer[sizeof(RTL_BITMAP) + ROUND_UP((CACHE_NUM_SECTIONS), 32) / 8]; PRTL_BITMAP CcCacheBitmap = (PRTL_BITMAP)&CcpBitmapBuffer; -KGUARDED_MUTEX CcMutex; +FAST_MUTEX CcMutex; KEVENT CcDeleteEvent; ULONG CcCacheClockHand; LONG CcOutstandingDeletes; @@ -55,7 +55,7 @@ VOID CcpLock() { - KeAcquireGuardedMutex(&CcMutex); + ExAcquireFastMutex(&CcMutex); //DPRINT("<<<---<<< CC In Mutex!\n"); } @@ -75,14 +75,14 @@ PCHAR BufStart, BufPage; LARGE_INTEGER ToWrite; - KeAcquireGuardedMutex(&CcMutex); + ExAcquireFastMutex(&CcMutex); while (CcOutstandingDeletes > 0) { NumElements = InterlockedDecrement(&CcOutstandingDeletes); DPRINT1("Unmapping %d ...\n", NumElements); WorkingOn = CcUnmapChain[0]; RtlMoveMemory(&CcUnmapChain[0], &CcUnmapChain[1], NumElements * sizeof(NOCC_UNMAP_CHAIN)); - KeReleaseGuardedMutex(&CcMutex); + ExReleaseFastMutex(&CcMutex); BufStart = (PCHAR)WorkingOn.Buffer; ToWrite = WorkingOn.FileOffset; @@ -98,15 +98,15 @@ MmUnmapViewInSystemSpace(WorkingOn.Buffer); ObDereferenceObject(WorkingOn.SectionObject); DPRINT1("Done unmapping\n"); - KeAcquireGuardedMutex(&CcMutex); - } - KeReleaseGuardedMutex(&CcMutex); + ExAcquireFastMutex(&CcMutex); + } + ExReleaseFastMutex(&CcMutex); } VOID CcpUnlock() { //DPRINT(">>>--->>> CC Exit Mutex!\n"); - KeReleaseGuardedMutex(&CcMutex); + ExReleaseFastMutex(&CcMutex); } VOID STDCALL Modified: branches/arty-newcc/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] Wed Aug 27 10:21:39 2008 @@ -202,7 +202,7 @@ extern NOCC_BCB CcCacheSections[CACHE_NUM_SECTIONS]; extern PRTL_BITMAP CcCacheBitmap; -extern KGUARDED_MUTEX CcMutex; +extern FAST_MUTEX CcMutex; extern KEVENT CcDeleteEvent; extern ULONG CcCacheClockHand; extern LIST_ENTRY CcPendingUnmap;

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