Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[janderwald] 36084: - Implement INetCfgComponent_RaisePropertyUi

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Sep 9 09:29:25 2008 New Revision: 36084 URL: http://svn.reactos.org/svn/reactos?rev=36084&view=rev Log: - Implement INetCfgComponent_RaisePropertyUi Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c trunk/reactos/dll/win32/netcfgx/netcfg_iface.c trunk/reactos/dll/win32/netcfgx/precomp.h Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/inetcfgc… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] Tue Sep 9 09:29:25 2008 @@ -6,6 +6,8 @@ const INetCfgComponent * lpVtbl; LONG ref; NetCfgComponentItem * pItem; + INetCfgComponentPropertyUi * pProperty; + INetCfg * pNCfg; }INetCfgComponentImpl; typedef struct @@ -14,6 +16,7 @@ LONG ref; NetCfgComponentItem * pCurrent; NetCfgComponentItem * pHead; + INetCfg * pNCfg; }IEnumNetCfgComponentImpl; @@ -312,6 +315,103 @@ return E_FAIL; } + +HRESULT +CreateNotificationObject( + INetCfgComponentImpl * This, + INetCfgComponent * iface, + IUnknown *pUnk, + INetCfgComponentPropertyUi ** pOut) +{ + WCHAR szName[150]; + HKEY hKey; + DWORD dwSize, dwType; + GUID CLSID_NotifyObject; + LPOLESTR pStr; + INetCfgComponentPropertyUi * pNCCPU; + INetCfgComponentControl * pNCCC; + HRESULT hr; + LONG lRet; + CLSID ClassGUID, InstanceGUID; + + wcscpy(szName,L"SYSTEM\\CurrentControlSet\\Control\\Network\\"); + + /* get the Class GUID */ + hr = INetCfgComponent_GetClassGuid(iface, &ClassGUID); + if (FAILED(hr)) + return hr; + + hr = StringFromCLSID(&ClassGUID, &pStr); + if (FAILED(hr)) + return hr; + + wcscat(szName, pStr); + CoTaskMemFree(pStr); + wcscat(szName, L"\\"); + + /* get the Class GUID */ + hr = INetCfgComponent_GetInstanceGuid(iface, &InstanceGUID); + if (FAILED(hr)) + return hr; + + hr = StringFromCLSID(&InstanceGUID, &pStr); + if (FAILED(hr)) + return hr; + + wcscat(szName, pStr); + CoTaskMemFree(pStr); + wcscat(szName, L"\\NDI"); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szName, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + return E_FAIL; + + dwSize = sizeof(szName); + lRet = RegQueryValueExW(hKey, L"ClsID", NULL, &dwType, (LPBYTE)szName, &dwSize); + RegCloseKey(hKey); + + if (lRet != ERROR_SUCCESS && dwType != REG_SZ) + return E_FAIL; + + hr = CLSIDFromString(szName, &CLSID_NotifyObject); + if (FAILED(hr)) + return E_FAIL; + + hr = CoCreateInstance(&CLSID_NotifyObject, NULL, CLSCTX_INPROC_SERVER, &IID_INetCfgComponentPropertyUi, (LPVOID*)&pNCCPU); + if (FAILED(hr)) + return E_FAIL; + + hr = INetCfgComponentPropertyUi_QueryInterface(pNCCPU, &IID_INetCfgComponentControl, (LPVOID*)&pNCCC); + if (FAILED(hr)) + { + INetCfgComponentPropertyUi_Release(pNCCPU); + return hr; + } + + hr = INetCfgComponentPropertyUi_QueryPropertyUi(pNCCPU, pUnk); + if (FAILED(hr)) + { + INetCfgComponentPropertyUi_Release(pNCCPU); + return hr; + } + + hr = INetCfgComponentControl_Initialize(pNCCC, iface, This->pNCfg, FALSE); + if (FAILED(hr)) + { + INetCfgComponentControl_Release(pNCCC); + INetCfgComponentPropertyUi_Release(pNCCPU); + return hr; + } + + hr = INetCfgComponentPropertyUi_SetContext(pNCCPU, pUnk); + if (FAILED(hr)) + { + INetCfgComponentPropertyUi_Release(pNCCPU); + return hr; + } + *pOut = pNCCPU; + return S_OK; +} + HRESULT STDCALL INetCfgComponent_fnRaisePropertyUi( @@ -320,8 +420,46 @@ IN DWORD dwFlags, IN IUnknown *pUnk) { - - return E_NOTIMPL; + HRESULT hr; + DWORD dwDefPages; + UINT Pages; + PROPSHEETHEADERW pinfo; + HPROPSHEETPAGE * hppages; + INT_PTR iResult; + INetCfgComponentImpl * This = (INetCfgComponentImpl*)iface; + + if (!This->pProperty) + { + hr = CreateNotificationObject(This,iface, pUnk, &This->pProperty); + if (FAILED(hr)) + return hr; + } + + dwDefPages = 1; + hr = INetCfgComponentPropertyUi_MergePropPages(This->pProperty, &dwDefPages, (BYTE**)&hppages, &Pages, hwndParent, NULL); + if (FAILED(hr)) + { + return hr; + } + ZeroMemory(&pinfo, sizeof(PROPSHEETHEADERW)); + pinfo.dwSize = sizeof(PROPSHEETHEADERW); + pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW; + pinfo.u3.phpage = hppages; + pinfo.hwndParent = hwndParent; + pinfo.pszCaption = This->pItem->szDisplayName; + + iResult = PropertySheetW(&pinfo); + CoTaskMemFree(hppages); + if (iResult < 0) + { + INetCfgComponentPropertyUi_CancelProperties(This->pProperty); + return E_ABORT; + } + else + { + INetCfgComponentPropertyUi_ApplyProperties(This->pProperty); + return S_OK; + } } static const INetCfgComponentVtbl vt_NetCfgComponent = { @@ -344,7 +482,7 @@ HRESULT STDCALL -INetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem) +INetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem, INetCfg * pNCfg) { INetCfgComponentImpl *This; @@ -357,7 +495,9 @@ This->ref = 1; This->lpVtbl = (const INetCfgComponent*)&vt_NetCfgComponent; + This->pProperty = NULL; This->pItem = pItem; + This->pNCfg = pNCfg; if (!SUCCEEDED (INetCfgComponent_QueryInterface ((INetCfgComponent*)This, riid, ppv))) { @@ -441,7 +581,7 @@ if (!This->pCurrent) return S_FALSE; - hr = INetCfgComponent_Constructor (NULL, &IID_INetCfgComponent, (LPVOID*)rgelt, This->pCurrent); + hr = INetCfgComponent_Constructor (NULL, &IID_INetCfgComponent, (LPVOID*)rgelt, This->pCurrent, This->pNCfg); if (SUCCEEDED(hr)) { This->pCurrent = This->pCurrent->pNext; @@ -504,7 +644,7 @@ HRESULT STDCALL -IEnumNetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem) +IEnumNetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem, INetCfg * pNCfg) { IEnumNetCfgComponentImpl *This; @@ -519,6 +659,7 @@ This->lpVtbl = (const IEnumNetCfgComponent*)&vt_EnumNetCfgComponent; This->pCurrent = pItem; This->pHead = pItem; + This->pNCfg = pNCfg; if (!SUCCEEDED (IEnumNetCfgComponent_QueryInterface ((INetCfgComponent*)This, riid, ppv))) { Modified: trunk/reactos/dll/win32/netcfgx/netcfg_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfg_i… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] Tue Sep 9 09:29:25 2008 @@ -425,13 +425,14 @@ FindNetworkComponent( NetCfgComponentItem * pHead, LPCWSTR pszwComponentId, - INetCfgComponent **pComponent) + INetCfgComponent **pComponent, + INetCfg * iface) { while(pHead) { if (!wcsicmp(pHead->szId, pszwComponentId)) { - return INetCfgComponent_Constructor(NULL, &IID_INetCfgComponent, (LPVOID*)pComponent, pHead); + return INetCfgComponent_Constructor(NULL, &IID_INetCfgComponent, (LPVOID*)pComponent, pHead, iface); } pHead = pHead->pNext; } @@ -586,13 +587,13 @@ return NETCFG_E_NOT_INITIALIZED; if (IsEqualGUID(&GUID_DEVCLASS_NET, pguidClass)) - return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pNet); + return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pNet, iface); else if (IsEqualGUID(&GUID_DEVCLASS_NETCLIENT, pguidClass)) - return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pClient); + return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pClient, iface); else if (IsEqualGUID(&GUID_DEVCLASS_NETSERVICE, pguidClass)) - return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pService); + return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pService, iface); else if (IsEqualGUID(&GUID_DEVCLASS_NETTRANS, pguidClass)) - return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pProtocol); + return IEnumNetCfgComponent_Constructor (NULL, &IID_IEnumNetCfgComponent, (LPVOID*)ppenumComponent, This->pProtocol, iface); else return E_NOINTERFACE; } @@ -611,15 +612,15 @@ if (!This->bInitialized) return NETCFG_E_NOT_INITIALIZED; - hr = FindNetworkComponent(This->pClient, pszwComponentId, pComponent); + hr = FindNetworkComponent(This->pClient, pszwComponentId, pComponent, iface); if (hr == S_OK) return hr; - hr = FindNetworkComponent(This->pService, pszwComponentId, pComponent); + hr = FindNetworkComponent(This->pService, pszwComponentId, pComponent, iface); if (hr == S_OK) return hr; - hr = FindNetworkComponent(This->pProtocol, pszwComponentId, pComponent); + hr = FindNetworkComponent(This->pProtocol, pszwComponentId, pComponent, iface); if (hr == S_OK) return hr; Modified: trunk/reactos/dll/win32/netcfgx/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/precomp.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] Tue Sep 9 09:29:25 2008 @@ -11,6 +11,7 @@ #include <stdio.h> #include <iphlpapi.h> #include <olectl.h> +#include <netcfgn.h> typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); typedef struct { @@ -43,7 +44,7 @@ extern HINSTANCE netcfgx_hInstance; /* inetcfgcomp_iface.c */ -HRESULT STDCALL INetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem); -HRESULT STDCALL IEnumNetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem); +HRESULT STDCALL INetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem,INetCfg * iface); +HRESULT STDCALL IEnumNetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem, INetCfg * iface); #endif

17 years, 1 month

[janderwald] 36083: - Add INetCfgPnpReconfigCallback, INetCfgComponentControl, INetCfgComponentPropertyUi IIDS

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Sep 9 08:28:55 2008 New Revision: 36083 URL: http://svn.reactos.org/svn/reactos?rev=36083&view=rev Log: - Add INetCfgPnpReconfigCallback, INetCfgComponentControl, INetCfgComponentPropertyUi IIDS Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=36… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Tue Sep 9 08:28:55 2008 @@ -107,7 +107,9 @@ DEFINE_GUID(IID_INetCfgComponentBindings, 0xC0E8AE9E,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetCfgLock, 0xC0E8AE9F,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetConnectionPropertyUi2, 0xC08956B9,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); - +DEFINE_GUID(IID_INetCfgPnpReconfigCallback,0x8D84BD35,0xE227,0x11D2,0xB7,0x00,0x00,0xA0,0xC9,0x8A,0x6A,0x85); +DEFINE_GUID(IID_INetCfgComponentPropertyUi,0x932238E0,0xBEA1,0x11D0,0x92,0x98,0x00,0xC0,0x4f,0xC9,0x9D,0xCF); +DEFINE_GUID(IID_INetCfgComponentControl, 0x932238DF,0xBEA1,0x11D0,0x92,0x98,0x00,0xC0,0x4f,0xC9,0x9D,0xCF); DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9); DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE);

17 years, 1 month

[janderwald] 36082: - Add INetCfgPnpReconfigCallback, INetCfgComponentControl, INetCfgComponentPropertyUi IIDS

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Sep 9 08:27:28 2008 New Revision: 36082 URL: http://svn.reactos.org/svn/reactos?rev=36082&view=rev Log: - Add INetCfgPnpReconfigCallback, INetCfgComponentControl, INetCfgComponentPropertyUi IIDS Modified: trunk/reactos/include/psdk/netcfgn.h Modified: trunk/reactos/include/psdk/netcfgn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcfgn.h?rev… ============================================================================== --- trunk/reactos/include/psdk/netcfgn.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/netcfgn.h [iso-8859-1] Tue Sep 9 08:27:28 2008 @@ -1,5 +1,91 @@ #ifndef _NETCFGN_H__ #define _NETCFGN_H__ + +typedef enum +{ + NCRL_NDIS = 1, + NCRL_TDI = 2 +}NCPNP_RECONFIG_LAYER; + +#undef INTERFACE +#define INTERFACE INetCfgPnpReconfigCallback +DECLARE_INTERFACE_(INetCfgPnpReconfigCallback, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,SendPnpReconfig)(THIS_ NCPNP_RECONFIG_LAYER Layer, LPCWSTR pszwUpper, LPCWSTR pszwLower, PVOID pvData, DWORD dwSizeOfData) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetCfgPnpReconfigCallback_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetCfgPnpReconfigCallback_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetCfgPnpReconfigCallback_Release(p) (p)->lpVtbl->Release(p) +#define INetCfgPnpReconfigCallback_SendPnpReconfig(p,a,b,c,d,e) (p)->lpVtbl->SendPnpReconfig(p,a,b,c,d,e) +#endif + +EXTERN_C const IID IID_INetCfgPnpReconfigCallback; + + +#undef INTERFACE +#define INTERFACE INetCfgComponentControl +DECLARE_INTERFACE_(INetCfgComponentControl, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,Initialize) (THIS_ INetCfgComponent *pIComp, INetCfg *pINetCfg, BOOL fInstalling) PURE; + STDMETHOD_(HRESULT,ApplyRegistryChanges) (THIS) PURE; + STDMETHOD_(HRESULT,ApplyPnpChanges) (THIS_ INetCfgPnpReconfigCallback *pICallback) PURE; + STDMETHOD_(HRESULT,CancelChanges) (THIS) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetCfgComponentControl_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetCfgComponentControl_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetCfgComponentControl_Release(p) (p)->lpVtbl->Release(p) +#define INetCfgComponentControl_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c) +#define INetCfgComponentControl_ApplyRegistryChanges(p) (p)->lpVtbl->ApplyRegistryChanges(p) +#define INetCfgComponentControl_ApplyPnpChanges(p,a) (p)->lpVtbl->ApplyRegistryChanges(p,a) +#define INetCfgComponentControl_CancelChanges(p) (p)->lpVtbl->CancelChanges(p) +#endif + +EXTERN_C const IID IID_INetCfgComponentControl; + +#undef INTERFACE +#define INTERFACE INetCfgComponentPropertyUi +DECLARE_INTERFACE_(INetCfgComponentPropertyUi, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,QueryPropertyUi)(THIS_ IUnknown *pUnkReserved) PURE; + STDMETHOD_(HRESULT,SetContext)(THIS_ IUnknown *pUnkReserved) PURE; + STDMETHOD_(HRESULT,MergePropPages)(THIS_ DWORD *pdwDefPages, BYTE **pahpspPrivate, UINT *pcPages, HWND hwndParent, LPCWSTR *pszStartPage) PURE; + STDMETHOD_(HRESULT,ValidateProperties)(THIS_ HWND hwndSheet) PURE; + STDMETHOD_(HRESULT,ApplyProperties)(THIS) PURE; + STDMETHOD_(HRESULT,CancelProperties)(THIS) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetCfgComponentPropertyUi_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetCfgComponentPropertyUi_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetCfgComponentPropertyUi_Release(p) (p)->lpVtbl->Release(p) +#define INetCfgComponentPropertyUi_QueryPropertyUi(p,a) (p)->lpVtbl->QueryPropertyUi(p,a) +#define INetCfgComponentPropertyUi_SetContext(p,a) (p)->lpVtbl->SetContext(p,a) +#define INetCfgComponentPropertyUi_MergePropPages(p,a,b,c,d,e) (p)->lpVtbl->MergePropPages(p,a,b,c,d,e) +#define INetCfgComponentPropertyUi_ValidateProperties(p,a) (p)->lpVtbl->ValidateProperties(p,a) +#define INetCfgComponentPropertyUi_ApplyProperties(p) (p)->lpVtbl->ApplyProperties(p) +#define INetCfgComponentPropertyUi_CancelProperties(p) (p)->lpVtbl->CancelProperties(p) +#endif + +EXTERN_C const IID IID_INetCfgComponentPropertyUi; #undef INTERFACE #define INTERFACE INetLanConnectionUiInfo

17 years, 1 month

[tkreuzer] 36081: - Add more parameter checks to NtGdiExtCreateRegion. Fixes a crash in gdi32_winetest clipping (12 failures left) and FF 3.1 - Do not copy more data than allocated for the region - Add coordinate transformation See issue #3724 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Sep 9 08:19:10 2008 New Revision: 36081 URL: http://svn.reactos.org/svn/reactos?rev=36081&view=rev Log: - Add more parameter checks to NtGdiExtCreateRegion. Fixes a crash in gdi32_winetest clipping (12 failures left) and FF 3.1 - Do not copy more data than allocated for the region - Add coordinate transformation See issue #3724 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Tue Sep 9 08:19:10 2008 @@ -2499,18 +2499,16 @@ PROSRGNDATA Region; DWORD nCount = 0; NTSTATUS Status = STATUS_SUCCESS; - - if (Count < FIELD_OFFSET(RGNDATA, Buffer)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return NULL; - } + MATRIX matrix; _SEH_TRY { ProbeForRead(RgnData, Count, 1); nCount = RgnData->rdh.nCount; - if ((Count - FIELD_OFFSET(RGNDATA, Buffer)) / sizeof(RECT) < nCount) + if (Count < sizeof(RGNDATAHEADER) + nCount * sizeof(RECT) || + nCount == 0 || + RgnData->rdh.iType != RDH_RECTANGLES || + RgnData->rdh.dwSize != sizeof(RGNDATAHEADER)) { Status = STATUS_INVALID_PARAMETER; _SEH_LEAVE; @@ -2538,12 +2536,38 @@ _SEH_TRY { - RtlCopyMemory(&Region->rdh, - RgnData, - FIELD_OFFSET(RGNDATA, Buffer)); - RtlCopyMemory(Region->Buffer, - RgnData->Buffer, - Count - FIELD_OFFSET(RGNDATA, Buffer)); + /* Copy header */ + Region->rdh = RgnData->rdh; + + if (Xform) + { + ULONG ret; + + /* Init the XFORMOBJ from the Xform struct */ + Status = STATUS_INVALID_PARAMETER; + ret = XFORMOBJ_iSetXform((XFORMOBJ*)&matrix, (XFORML*)Xform); + + /* Check for error, also no scale and shear allowed */ + if (ret != DDI_ERROR && ret != GX_GENERAL) + { + /* Apply the coordinate transformation on the rects */ + if (XFORMOBJ_bApplyXform((XFORMOBJ*)&matrix, + XF_LTOL, + nCount * 2, + RgnData->Buffer, + Region->Buffer)) + { + Status = STATUS_SUCCESS; + } + } + } + else + { + /* Copy rect coordinates */ + RtlCopyMemory(Region->Buffer, + RgnData->Buffer, + nCount * sizeof(RECT)); + } } _SEH_HANDLE {

17 years, 1 month

[janderwald] 36080: - Handle NULL pointer in INetCfgComponent::GetDisplayName and INetCfgComponent_GetHelpText - Initialize to zero NetCfgComponentItem - Dont fail if subkey is not a guid (required because ReactOS TCP/IP guid is not yet generated) - Fix enumeration of network components - Register CNetCfg class

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Sep 9 06:26:54 2008 New Revision: 36080 URL: http://svn.reactos.org/svn/reactos?rev=36080&view=rev Log: - Handle NULL pointer in INetCfgComponent::GetDisplayName and INetCfgComponent_GetHelpText - Initialize to zero NetCfgComponentItem - Dont fail if subkey is not a guid (required because ReactOS TCP/IP guid is not yet generated) - Fix enumeration of network components - Register CNetCfg class Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c trunk/reactos/dll/win32/netcfgx/netcfg_iface.c trunk/reactos/dll/win32/netcfgx/netcfgx.c trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild trunk/reactos/dll/win32/netcfgx/precomp.h trunk/reactos/dll/win32/netshell/lanconnectui.c Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/inetcfgc… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] Tue Sep 9 06:26:54 2008 @@ -69,16 +69,26 @@ LPWSTR * ppszwDisplayName) { LPWSTR szName; + UINT Length; INetCfgComponentImpl * This = (INetCfgComponentImpl*)iface; if (This == NULL || ppszwDisplayName == NULL) return E_POINTER; - szName = CoTaskMemAlloc((wcslen(This->pItem->szDisplayName)+1) * sizeof(WCHAR)); + if (This->pItem->szDisplayName) + Length = wcslen(This->pItem->szDisplayName)+1; + else + Length = 1; + + szName = CoTaskMemAlloc(Length * sizeof(WCHAR)); if (!szName) return E_OUTOFMEMORY; - wcscpy(szName, This->pItem->szDisplayName); + if (Length > 1) + wcscpy(szName, This->pItem->szDisplayName); + else + szName[0] = L'\0'; + *ppszwDisplayName = szName; return S_OK; @@ -123,16 +133,26 @@ LPWSTR * ppszwHelpText) { LPWSTR szHelp; + UINT Length; INetCfgComponentImpl * This = (INetCfgComponentImpl*)iface; if (This == NULL || ppszwHelpText == NULL) return E_POINTER; - szHelp = CoTaskMemAlloc((wcslen(This->pItem->szHelpText)+1) * sizeof(WCHAR)); + if (This->pItem->szHelpText) + Length = wcslen(This->pItem->szHelpText)+1; + else + Length = 1; + + szHelp = CoTaskMemAlloc(Length * sizeof(WCHAR)); if (!szHelp) return E_OUTOFMEMORY; - wcscpy(szHelp, This->pItem->szHelpText); + if (Length > 1) + wcscpy(szHelp, This->pItem->szHelpText); + else + szHelp[0] = L'\0'; + *ppszwHelpText = szHelp; return S_OK; Modified: trunk/reactos/dll/win32/netcfgx/netcfg_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfg_i… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] Tue Sep 9 06:26:54 2008 @@ -178,7 +178,6 @@ NetCfgComponentItem * pLast = NULL, *pCurrent; *pHead = NULL; - do { dwCharacteristics = 0; @@ -191,29 +190,25 @@ if (!pCurrent) return E_OUTOFMEMORY; - pCurrent->bChanged = FALSE; - pCurrent->pNext = NULL; - pCurrent->Status = 0; /* unused */ - pCurrent->szNodeId = 0; /* unused */ + ZeroMemory(pCurrent, sizeof(NetCfgComponentItem)); CopyMemory(&pCurrent->ClassGUID, pGuid, sizeof(GUID)); if (FAILED(CLSIDFromString(szName, &pCurrent->InstanceId))) { - CoTaskMemFree(pCurrent); - return E_FAIL; + /// ReactOS tcpip guid is not yet generated + //CoTaskMemFree(pCurrent); + //return E_FAIL; } - if (RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) { /* retrieve Characteristics */ dwSize = sizeof(DWORD); - pCurrent->dwCharacteristics = 0; + RegQueryValueExW(hSubKey, L"Characteristics", NULL, &dwType, (LPBYTE)&pCurrent->dwCharacteristics, &dwSize); if (dwType != REG_DWORD) pCurrent->dwCharacteristics = 0; /* retrieve ComponentId */ - pCurrent->szId = NULL; dwSize = sizeof(szText); if (RegQueryValueExW(hSubKey, L"ComponentId", NULL, &dwType, (LPBYTE)szText, &dwSize) == ERROR_SUCCESS) { @@ -227,7 +222,6 @@ } /* retrieve Description */ - pCurrent->szDisplayName = NULL; dwSize = sizeof(szText); if (RegQueryValueExW(hSubKey, L"Description", NULL, &dwType, (LPBYTE)szText, &dwSize) == ERROR_SUCCESS) { @@ -243,7 +237,6 @@ if (RegOpenKeyExW(hKey, L"NDI", 0, KEY_READ, &hNDIKey) == ERROR_SUCCESS) { /* retrieve HelpText */ - pCurrent->szHelpText = NULL; dwSize = sizeof(szText); if (RegQueryValueExW(hNDIKey, L"HelpText", NULL, &dwType, (LPBYTE)szText, &dwSize) == ERROR_SUCCESS) { @@ -256,8 +249,7 @@ } } - /* retrieve HelpText */ - pCurrent->szBindName = NULL; + /* retrieve Service */ dwSize = sizeof(szText); if (RegQueryValueExW(hNDIKey, L"Service", NULL, &dwType, (LPBYTE)szText, &dwSize) == ERROR_SUCCESS) { @@ -303,7 +295,7 @@ if (SUCCEEDED(hr)) { swprintf(szName, L"SYSTEM\\CurrentControlSet\\Control\\Network\\%s", pszGuid); - if (RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { hr = EnumClientServiceProtocol(hKey, pGuid, pHead); RegCloseKey(hKey); Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.c [iso-8859-1] Tue Sep 9 06:26:54 2008 @@ -55,9 +55,34 @@ STDAPI DllRegisterServer(void) { - //FIXME - // implement registering services - // + HKEY hKey, hSubKey; + LPOLESTR pStr; + WCHAR szName[MAX_PATH] = L"CLSID\\"; + + if (FAILED(StringFromCLSID(&CLSID_CNetCfg, &pStr))) + return SELFREG_E_CLASS; + + wcscpy(&szName[6], pStr); + CoTaskMemFree(pStr); + + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szName, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + return SELFREG_E_CLASS; + + if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + if (!GetModuleFileNameW(netcfgx_hInstance, szName, sizeof(szName)/sizeof(WCHAR))) + { + RegCloseKey(hSubKey); + RegCloseKey(hKey); + return SELFREG_E_CLASS; + } + szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; + RegSetValueW(hSubKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR)); + RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); + RegCloseKey(hSubKey); + } + + RegCloseKey(hKey); return S_OK; } Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild [iso-8859-1] Tue Sep 9 06:26:54 2008 @@ -1,5 +1,6 @@ <module name="netcfgx" type="win32dll" baseaddress="${BASEADDRESS_NETCFGX}" installbase="system32" installname="netcfgx.dll"> <importlibrary definition="netcfgx.spec.def" /> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <library>ntdll</library> <library>rpcrt4</library> <library>setupapi</library> Modified: trunk/reactos/dll/win32/netcfgx/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/precomp.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] Tue Sep 9 06:26:54 2008 @@ -10,6 +10,7 @@ #include <setupapi.h> #include <stdio.h> #include <iphlpapi.h> +#include <olectl.h> typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); typedef struct { Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] Tue Sep 9 06:26:54 2008 @@ -135,17 +135,20 @@ pHelpText = NULL; hr = INetCfgComponent_GetDisplayName(pNCfgComp, &pDisplayName); hr = INetCfgComponent_GetHelpText(pNCfgComp, &pHelpText); + bChecked = TRUE; //ReactOS hack hr = INetCfgComponent_QueryInterface(pNCfgComp, &IID_INetCfgComponentBindings, (LPVOID*)&pCompBind); - - bChecked = FALSE; - if (GetINetCfgComponent(pNCfg, This, &pAdapterCfgComp)) + if (SUCCEEDED(hr)) { - hr = INetCfgComponentBindings_IsBoundTo(pCompBind, pAdapterCfgComp); - if (hr == S_OK) - bChecked = TRUE; - else - bChecked = FALSE; - INetCfgComponent_Release(pAdapterCfgComp); + if (GetINetCfgComponent(pNCfg, This, &pAdapterCfgComp)) + { + hr = INetCfgComponentBindings_IsBoundTo(pCompBind, pAdapterCfgComp); + if (hr == S_OK) + bChecked = TRUE; + else + bChecked = FALSE; + INetCfgComponent_Release(pAdapterCfgComp); + INetCfgComponentBindings_Release(pCompBind); + } } pItem = CoTaskMemAlloc(sizeof(NET_ITEM)); if (!pItem)

17 years, 1 month

[janderwald] 36079: - Check for NULL before releasing INetCfg and INetCfgLock interface - ONLY destroy property sheet page on success !!! - Fix registration of LANStatusUI LANPropertyUI interfaces - Fix creating LanPropertyUI interface - Release LANPropertyUI interface when finished

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Sep 9 05:20:12 2008 New Revision: 36079 URL: http://svn.reactos.org/svn/reactos?rev=36079&view=rev Log: - Check for NULL before releasing INetCfg and INetCfgLock interface - ONLY destroy property sheet page on success !!! - Fix registration of LANStatusUI LANPropertyUI interfaces - Fix creating LanPropertyUI interface - Release LANPropertyUI interface when finished Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c trunk/reactos/dll/win32/netshell/netshell.c trunk/reactos/dll/win32/netshell/precomp.h trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] Tue Sep 9 05:20:12 2008 @@ -433,9 +433,19 @@ if (!refCount) { - INetCfg_Release(This->pNCfg); - INetCfgLock_Release(This->NCfgLock); - NcFreeNetconProperties(This->pProperties); + if (This->pNCfg) + { + INetCfg_Uninitialize(This->pNCfg); + INetCfg_Release(This->pNCfg); + } + if (This->NCfgLock) + { + INetCfgLock_Release(This->NCfgLock); + } + if (This->pProperties) + { + NcFreeNetconProperties(This->pProperties); + } CoTaskMemFree (This); } return refCount; @@ -486,7 +496,7 @@ if (FAILED(hr)) return hr; - hProp = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_NETPROPERTIES), LANPropertiesUIDlg, (LPARAM)This, This->pProperties->pszwName); + hProp = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_NETPROPERTIES), LANPropertiesUIDlg, (LPARAM)This, This->pProperties->pszwName); if (hProp) { ret = (*pfnAddPage)(hProp, lParam); @@ -494,7 +504,10 @@ { hr = NOERROR; } - DestroyPropertySheetPage(hProp); + else + { + DestroyPropertySheetPage(hProp); + } } return hr; } Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] Tue Sep 9 05:20:12 2008 @@ -8,8 +8,8 @@ const GUID CLSID_LanConnectStatusUI = {0x7007ACCF, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; static const WCHAR szNetConnectClass[] = L"CLSID\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; -static const WCHAR szLanConnectUI[] = L"CLSID\\{7007ACC5-3202-11D1-AA-D200805FC1270E}"; -static const WCHAR szLanConnectStatusUI[] = L"CLSID\\{7007ACCF-3202-11D1-AA-D200805FC1270E}"; +static const WCHAR szLanConnectUI[] = L"CLSID\\{7007ACC5-3202-11D1-AAD2-00805FC1270E}"; +static const WCHAR szLanConnectStatusUI[] = L"CLSID\\{7007ACCF-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[] = Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Tue Sep 9 05:20:12 2008 @@ -36,6 +36,7 @@ #include <docobj.h> #include <netcfgx.h> #include <netcfgn.h> +#include <prsht.h> #include "wine/debug.h" Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Tue Sep 9 05:20:12 2008 @@ -745,7 +745,7 @@ pinfo->u3.phpage[pinfo->nPages++] = hPage; return TRUE; } - return FALSE; + return FALSE; } /************************************************************************** @@ -788,7 +788,7 @@ if (SUCCEEDED(hr)) { /* FIXME perform version checks */ - hr = CoCreateInstance(&ClassID, NULL, 0, &IID_INetConnectionPropertyUi, (LPVOID)&pNCP); + hr = CoCreateInstance(&ClassID, NULL, CLSCTX_INPROC_SERVER, &IID_INetConnectionPropertyUi, (LPVOID)&pNCP); if (SUCCEEDED(hr)) { hr = INetConnectionPropertyUi_SetConnection(pNCP, val->pItem); @@ -799,8 +799,9 @@ pinfo.dwSize = sizeof(PROPSHEETHEADERW); pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW; pinfo.u3.phpage = hppages; + pinfo.hwndParent = lpcmi->hwnd; + pinfo.pszCaption = pProperties->pszwName; - hr = INetConnectionPropertyUi_AddPages(pNCP, lpcmi->hwnd, PropSheetExCallback, (LPARAM)&pinfo); if (SUCCEEDED(hr)) { @@ -808,7 +809,9 @@ hr = E_FAIL; } } + INetConnectionPropertyUi_Release(pNCP); } + } NcFreeNetconProperties(pProperties); return hr;

17 years, 1 month

[hpoussin] 36078: Remove MingwKernelModeDriverModuleHandler, it is the same as MingwKernelModeDLLModuleHandler

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Sep 9 02:30:52 2008 New Revision: 36078 URL: http://svn.reactos.org/svn/reactos?rev=36078&view=rev Log: Remove MingwKernelModeDriverModuleHandler, it is the same as MingwKernelModeDLLModuleHandler Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue Sep 9 02:30:52 2008 @@ -195,6 +195,7 @@ break; case KeyboardLayout: case KernelModeDLL: + case KernelModeDriver: handler = new MingwKernelModeDLLModuleHandler ( module ); break; case NativeDLL: @@ -205,9 +206,6 @@ break; case Win32OCX: handler = new MingwWin32OCXModuleHandler ( module ); - break; - case KernelModeDriver: - handler = new MingwKernelModeDriverModuleHandler ( module ); break; case BootLoader: handler = new MingwBootLoaderModuleHandler ( module ); @@ -2428,7 +2426,7 @@ MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget () { string targetMacro ( GetTargetMacro ( module ) ); - string workingDirectory = GetWorkingDirectory ( ); + string workingDirectory = GetWorkingDirectory (); string linkDepsMacro = GetLinkingDependenciesMacro (); GenerateImportLibraryTargetIfNeeded (); @@ -2453,55 +2451,6 @@ } -MingwKernelModeDriverModuleHandler::MingwKernelModeDriverModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwKernelModeDriverModuleHandler::AddImplicitLibraries ( Module& module ) -{ - MingwAddDebugSupportLibraries ( module, DebugKernelMode ); -} - -void -MingwKernelModeDriverModuleHandler::Process () -{ - GenerateKernelModeDriverModuleTarget (); -} - - -void -MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget () -{ - string targetMacro ( GetTargetMacro (module) ); - string workingDirectory = GetWorkingDirectory (); - string linkDepsMacro = GetLinkingDependenciesMacro (); - - GenerateImportLibraryTargetIfNeeded (); - - if ( module.non_if_data.compilationUnits.size () > 0 ) - { - GenerateRules (); - - string dependencies = linkDepsMacro + " " + objectsMacro; - - string linkerParameters = ssprintf ( "-subsystem=native -entry=%s -image-base=%s -file-alignment=0x1000 -section-alignment=0x1000 -shared", - module.GetEntryPoint(!(Environment::GetArch() == "arm")).c_str (), - module.baseaddress.c_str () ); - GenerateLinkerCommand ( dependencies, - linkerParameters, - " -sections" ); - } - else - { - GeneratePhonyTarget(); - } -} - - MingwNativeDLLModuleHandler::MingwNativeDLLModuleHandler ( const Module& module_ ) @@ -2656,6 +2605,8 @@ links_to_crt = true; } } + pLibrary = new Library ( module, "debugsup_ntdll" ); + module.non_if_data.libraries.push_back(pLibrary); return; } @@ -2679,13 +2630,15 @@ pLibrary = new Library ( module, "msvcrt" ); module.non_if_data.libraries.push_back ( pLibrary ); } + + pLibrary = new Library ( module, "debugsup_ntdll" ); + module.non_if_data.libraries.push_back(pLibrary); } void MingwWin32DLLModuleHandler::AddImplicitLibraries ( Module& module ) { MingwAddImplicitLibraries ( module ); - MingwAddDebugSupportLibraries ( module, DebugUserMode ); } void @@ -2727,7 +2680,6 @@ MingwWin32OCXModuleHandler::AddImplicitLibraries ( Module& module ) { MingwAddImplicitLibraries ( module ); - MingwAddDebugSupportLibraries ( module, DebugUserMode ); } void @@ -2776,7 +2728,6 @@ MingwWin32CUIModuleHandler::AddImplicitLibraries ( Module& module ) { MingwAddImplicitLibraries ( module ); - MingwAddDebugSupportLibraries ( module, DebugUserMode ); } void @@ -2825,7 +2776,6 @@ MingwWin32GUIModuleHandler::AddImplicitLibraries ( Module& module ) { MingwAddImplicitLibraries ( module ); - MingwAddDebugSupportLibraries ( module, DebugUserMode ); } void Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Tue Sep 9 02:30:52 2008 @@ -212,17 +212,6 @@ }; -class MingwKernelModeDriverModuleHandler : public MingwModuleHandler -{ -public: - MingwKernelModeDriverModuleHandler ( const Module& module ); - virtual void Process (); - void AddImplicitLibraries ( Module& module ); -private: - void GenerateKernelModeDriverModuleTarget (); -}; - - class MingwNativeDLLModuleHandler : public MingwModuleHandler { public:

17 years, 1 month

[hpoussin] 36077: Remove GetExtraDependencies() function. It was only called when the file extension was .c/.cc/.cpp/.cxx, and the function was returning empty string in those cases.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Sep 9 02:21:37 2008 New Revision: 36077 URL: http://svn.reactos.org/svn/reactos?rev=36077&view=rev Log: Remove GetExtraDependencies() function. It was only called when the file extension was .c/.cc/.cpp/.cxx, and the function was returning empty string in those cases. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue Sep 9 02:21:37 2008 @@ -261,33 +261,6 @@ if ( index != string::npos ) return filename.substr ( 0, index ); return ""; -} - -string -MingwModuleHandler::GetExtraDependencies ( - const FileLocation *file ) const -{ - string extension = GetExtension ( *file ); - if ( extension == ".idl" || extension == ".IDL" ) - { - const FileLocation *header; - switch ( module.type ) - { - case RpcServer: header = GetRpcServerHeaderFilename ( file ); break; - case RpcClient: header = GetRpcClientHeaderFilename ( file ); break; - case RpcProxy: header = GetRpcProxyHeaderFilename ( file ); break; - case IdlHeader: header = GetIdlHeaderFilename ( file ); break; - default: header = NULL; break; - } - if ( !header ) - return ""; - - string dependencies = backend->GetFullName ( *header ); - delete header; - return " " + dependencies; - } - else - return ""; } string @@ -1327,7 +1300,7 @@ { GenerateGccCommand ( &sourceFile, customRule, - GetCompilationUnitDependencies ( compilationUnit ) + GetExtraDependencies ( &sourceFile ) + extraDependencies ); + GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies ); } else if ( customRule ) customRule->Execute ( fMakefile, backend, module, &sourceFile, clean_files ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Tue Sep 9 02:21:37 2008 @@ -80,7 +80,6 @@ virtual void GetModuleSpecificCompilationUnits ( std::vector<CompilationUnit*>& compilationUnits ); std::string GetWorkingDirectory () const; std::string GetBasename ( const std::string& filename ) const; - std::string GetExtraDependencies ( const FileLocation *file ) const; std::string GetCompilationUnitDependencies ( const CompilationUnit& compilationUnit ) const; const FileLocation* GetModuleArchiveFilename () const; std::string GetImportLibraryDependency ( const Module& importedModule );

17 years, 1 month

[hpoussin] 36076: Remove host attribute of module element. It wasn't used and can be deduced from module type Remove MingwBootSectorModuleHandler class Move module specific cflags, nasmflags and linkerflags to an array. One day, we won't be forced to create a new MingwModuleHandler each time we add a module type

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Sep 9 02:12:30 2008 New Revision: 36076 URL: http://svn.reactos.org/svn/reactos?rev=36076&view=rev Log: Remove host attribute of module element. It wasn't used and can be deduced from module type Remove MingwBootSectorModuleHandler class Move module specific cflags, nasmflags and linkerflags to an array. One day, we won't be forced to create a new MingwModuleHandler each time we add a module type Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Tue Sep 9 02:12:30 2008 @@ -34,42 +34,39 @@ typedef set<string> set_string; -static const struct -{ - HostType DefaultHost; -} ModuleHandlerInformations[] = { - { HostTrue }, // BuildTool - { HostFalse }, // StaticLibrary - { HostFalse }, // ObjectLibrary - { HostFalse }, // Kernel - { HostFalse }, // KernelModeDLL - { HostFalse }, // KernelModeDriver - { HostFalse }, // NativeDLL - { HostFalse }, // NativeCUI - { HostFalse }, // Win32DLL - { HostFalse }, // Win32OCX - { HostFalse }, // Win32CUI - { HostFalse }, // Win32GUI - { HostFalse }, // BootLoader - { HostFalse }, // BootSector - { HostFalse }, // Iso - { HostFalse }, // LiveIso - { HostFalse }, // Test - { HostFalse }, // RpcServer - { HostFalse }, // RpcClient - { HostFalse }, // Alias - { HostFalse }, // BootProgram - { HostFalse }, // Win32SCR - { HostFalse }, // IdlHeader - { HostFalse }, // IsoRegTest - { HostFalse }, // LiveIsoRegTest - { HostFalse }, // EmbeddedTypeLib - { HostFalse }, // ElfExecutable - { HostFalse }, // RpcProxy - { HostTrue }, // HostStaticLibrary - { HostFalse }, // Cabinet - { HostFalse }, // KeyboardLayout - { HostFalse }, // MessageHeader +const struct ModuleHandlerInformations ModuleHandlerInformations[] = { + { HostTrue, "", "", "" }, // BuildTool + { HostFalse, "", "", "" }, // StaticLibrary + { HostFalse, "", "", "" }, // ObjectLibrary + { HostFalse, "", "", "" }, // Kernel + { HostFalse, "", "", "" }, // KernelModeDLL + { HostFalse, "-D__NTDRIVER__", "", "" }, // KernelModeDriver + { HostFalse, "", "", "" }, // NativeDLL + { HostFalse, "-D__NTAPP__", "", "" }, // NativeCUI + { HostFalse, "", "", "" }, // Win32DLL + { HostFalse, "", "", "" }, // Win32OCX + { HostFalse, "", "", "" }, // Win32CUI + { HostFalse, "", "", "" }, // Win32GUI + { HostFalse, "", "", "-nostartfiles -nostdlib" }, // BootLoader + { HostFalse, "", "-f bin", "" }, // BootSector + { HostFalse, "", "", "" }, // Iso + { HostFalse, "", "", "" }, // LiveIso + { HostFalse, "", "", "" }, // Test + { HostFalse, "", "", "" }, // RpcServer + { HostFalse, "", "", "" }, // RpcClient + { HostFalse, "", "", "" }, // Alias + { HostFalse, "", "", "-nostartfiles -nostdlib" }, // BootProgram + { HostFalse, "", "", "" }, // Win32SCR + { HostFalse, "", "", "" }, // IdlHeader + { HostFalse, "", "", "" }, // IsoRegTest + { HostFalse, "", "", "" }, // LiveIsoRegTest + { HostFalse, "", "", "" }, // EmbeddedTypeLib + { HostFalse, "", "", "" }, // ElfExecutable + { HostFalse, "", "", "" }, // RpcProxy + { HostTrue, "", "", "" }, // HostStaticLibrary + { HostFalse, "", "", "" }, // Cabinet + { HostFalse, "", "", "" }, // KeyboardLayout + { HostFalse, "", "", "" }, // MessageHeader }; string @@ -269,11 +266,6 @@ h->AddImplicitLibraries ( module ); if ( use_pch && CanEnablePreCompiledHeaderSupportForModule ( module ) ) h->EnablePreCompiledHeaderSupport (); - if ( module.host == HostDefault ) - { - module.host = ModuleHandlerInformations[h->module.type].DefaultHost; - assert ( module.host != HostDefault ); - } v.push_back ( h ); } @@ -343,7 +335,7 @@ void MingwBackend::ProcessNormal () { - assert(sizeof(ModuleHandlerInformations)/sizeof(ModuleHandlerInformations[0]) == TypeDontCare); + assert(sizeof(ModuleHandlerInformations)/sizeof(ModuleHandlerInformations[0]) == TypeDontCare); DetectCompiler (); DetectBinutils (); Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] Tue Sep 9 02:12:30 2008 @@ -142,4 +142,14 @@ const Project& project; }; +typedef struct ModuleHandlerInformations +{ + HostType DefaultHost; + const char* cflags; + const char* nasmflags; + const char* linkerflags; +}; + +extern const struct ModuleHandlerInformations ModuleHandlerInformations[]; + #endif /* MINGW_H */ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue Sep 9 02:12:30 2008 @@ -174,6 +174,7 @@ case MessageHeader: case IdlHeader: case EmbeddedTypeLib: + case BootSector: handler = new MingwModuleHandler( module ); break; case BuildTool: @@ -210,9 +211,6 @@ break; case BootLoader: handler = new MingwBootLoaderModuleHandler ( module ); - break; - case BootSector: - handler = new MingwBootSectorModuleHandler ( module ); break; case BootProgram: handler = new MingwBootProgramModuleHandler ( module ); @@ -1315,7 +1313,7 @@ for ( i = 0; i < sizeof ( rules ) / sizeof ( rules[0] ); i++ ) { - if ( rules[i].host != HostDontCare && rules[i].host != module.host ) + if ( rules[i].host != HostDontCare && rules[i].host != ModuleHandlerInformations[module.type].DefaultHost ) continue; if ( rules[i].type != TypeDontCare && rules[i].type != module.type ) continue; @@ -1638,8 +1636,8 @@ if ( pchFilename ) { - string cc = ( module.host == HostTrue ? "${host_gcc}" : "${gcc}" ); - string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" ); + string cc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gcc}" : "${gcc}" ); + string cppc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gpp}" : "${gpp}" ); const FileLocation& baseHeaderFile = *module.pch->file; CLEAN_FILE ( *pchFilename ); @@ -1849,7 +1847,7 @@ &module.linkerFlags, used_defs ); - if ( module.host == HostFalse ) + if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { GenerateMacros ( "+=", @@ -1885,7 +1883,7 @@ } string globalCflags = ""; - if ( module.host == HostFalse ) + if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) globalCflags += " $(PROJECT_CFLAGS)"; else globalCflags += " -Wall -Wpointer-arith -D__REACTOS__"; @@ -1894,7 +1892,7 @@ globalCflags += " -pipe"; if ( !module.allowWarnings ) globalCflags += " -Werror"; - if ( module.host == HostTrue ) + if ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ) { if ( module.cplusplus ) globalCflags += " $(HOST_CPPFLAGS)"; @@ -1922,7 +1920,7 @@ cflagsMacro.c_str (), globalCflags.c_str () ); - if ( module.host == HostFalse ) + if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { fprintf ( fMakefile, @@ -1955,31 +1953,31 @@ linkDepsMacro.c_str (), libsMacro.c_str () ); - string cflags = TypeSpecificCFlags(); - if ( cflags.size() > 0 ) + const char *cflags = ModuleHandlerInformations[module.type].cflags; + if ( strlen( cflags ) > 0 ) { fprintf ( fMakefile, "%s += %s\n\n", cflagsMacro.c_str (), - cflags.c_str () ); - } - - string nasmflags = TypeSpecificNasmFlags(); - if ( nasmflags.size () > 0 ) + cflags ); + } + + const char* nasmflags = ModuleHandlerInformations[module.type].nasmflags; + if ( strlen( nasmflags ) > 0 ) { fprintf ( fMakefile, "%s += %s\n\n", nasmflagsMacro.c_str (), - nasmflags.c_str () ); - } - - string linkerflags = TypeSpecificLinkerFlags(); - if ( linkerflags.size() > 0 ) + nasmflags ); + } + + const char *linkerflags = ModuleHandlerInformations[module.type].linkerflags; + if ( strlen( linkerflags ) > 0 ) { fprintf ( fMakefile, "%s += %s\n\n", linkerflagsMacro.c_str (), - linkerflags.c_str () ); + linkerflags ); } if ( IsStaticLibrary ( module ) && module.isStartupLib ) @@ -2106,7 +2104,7 @@ string_list& dependencies ) const { /* Avoid circular dependency */ - if ( module.host == HostTrue ) + if ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ) return; if (module.name != "psdk" && @@ -2957,35 +2955,6 @@ backend->GetFullName ( junk_tmp ).c_str () ); delete target_file; -} - - -MingwBootSectorModuleHandler::MingwBootSectorModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwBootSectorModuleHandler::Process () -{ - GenerateBootSectorModuleTarget (); -} - -void -MingwBootSectorModuleHandler::GenerateBootSectorModuleTarget () -{ - string objectsMacro = GetObjectsMacro ( module ); - - GenerateRules (); - - fprintf ( fMakefile, ".PHONY: %s\n\n", - module.name.c_str ()); - fprintf ( fMakefile, - "%s: %s\n", - module.name.c_str (), - objectsMacro.c_str () ); } Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Tue Sep 9 02:12:30 2008 @@ -67,9 +67,6 @@ MingwBackend* backend_ ); void GeneratePreconditionDependencies (); virtual void Process () { GenerateRules (); } - virtual std::string TypeSpecificCFlags() { return ""; } - virtual std::string TypeSpecificNasmFlags() { return ""; } - virtual std::string TypeSpecificLinkerFlags() { return ""; } void GenerateInvocations () const; void GenerateCleanTarget () const; void GenerateInstallTarget () const; @@ -221,7 +218,6 @@ public: MingwKernelModeDriverModuleHandler ( const Module& module ); virtual void Process (); - std::string TypeSpecificCFlags() { return "-D__NTDRIVER__"; } void AddImplicitLibraries ( Module& module ); private: void GenerateKernelModeDriverModuleTarget (); @@ -244,7 +240,6 @@ public: MingwNativeCUIModuleHandler ( const Module& module ); virtual void Process (); - std::string TypeSpecificCFlags() { return "-D__NTAPP__"; } void AddImplicitLibraries ( Module& module ); private: void GenerateNativeCUIModuleTarget (); @@ -300,30 +295,17 @@ public: MingwBootLoaderModuleHandler ( const Module& module ); virtual void Process (); - std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } private: void GenerateBootLoaderModuleTarget (); }; -class MingwBootSectorModuleHandler : public MingwModuleHandler -{ -public: - MingwBootSectorModuleHandler ( const Module& module ); - virtual void Process (); - std::string TypeSpecificNasmFlags() { return "-f bin"; } -private: - void GenerateBootSectorModuleTarget (); -}; - - class MingwBootProgramModuleHandler : public MingwModuleHandler { public: MingwBootProgramModuleHandler ( const Module& module ); virtual void Process (); std::string GetProgTextAddrMacro (); - std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } private: void GenerateBootProgramModuleTarget (); }; Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Tue Sep 9 02:12:30 2008 @@ -245,7 +245,6 @@ linkerScript (NULL), pch (NULL), cplusplus (false), - host (HostDefault), output (NULL), install (NULL) { @@ -363,23 +362,6 @@ else underscoreSymbols = false; - att = moduleNode.GetAttribute ( "host", false ); - if ( att != NULL ) - { - const char* p = att->value.c_str(); - if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) - host = HostTrue; - else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) - host = HostFalse; - else - { - throw InvalidAttributeValueException ( - moduleNode.location, - "host", - att->value ); - } - } - att = moduleNode.GetAttribute ( "isstartuplib", false ); if ( att != NULL ) { @@ -392,7 +374,7 @@ { throw InvalidAttributeValueException ( moduleNode.location, - "host", + "isstartuplib", att->value ); } } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Tue Sep 9 02:12:30 2008 @@ -369,7 +369,6 @@ PchFile* pch; bool cplusplus; std::string prefix; - HostType host; std::string aliasedModuleName; bool allowWarnings; bool enabled;

17 years, 1 month

[cgutman] 36075: - Release the spin lock before returning

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Sep 8 19:58:44 2008 New Revision: 36075 URL: http://svn.reactos.org/svn/reactos?rev=36075&view=rev Log: - Release the spin lock before returning Modified: branches/aicom-network-fixes/drivers/network/lan/lan/lan.c Modified: branches/aicom-network-fixes/drivers/network/lan/lan/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/lan/lan/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/lan/lan/lan.c [iso-8859-1] Mon Sep 8 19:58:44 2008 @@ -349,7 +349,10 @@ /* Get a transfer data packet */ KeAcquireSpinLockAtDpcLevel(&Adapter->Lock); NdisStatus = AllocatePacketWithBuffer( &NdisPacket, NULL, Adapter->MTU ); - if( NdisStatus != NDIS_STATUS_SUCCESS ) return NDIS_STATUS_NOT_ACCEPTED; + if( NdisStatus != NDIS_STATUS_SUCCESS ) { + KeReleaseSpinLockFromDpcLevel(&Adapter->Lock); + return NDIS_STATUS_NOT_ACCEPTED; + } LA_DbgPrint(DEBUG_DATALINK, ("pretransfer LookaheadBufferSize %d packsize %d\n",LookaheadBufferSize,PacketSize)); { UINT temp;

17 years, 1 month

← Newer
1
...
49
50
51
52
53
54
55
...
75
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 September 2008