Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[cwittich] 36065: forgot to add these files
by cwittich＠svn.reactos.org 08 Sep '08

08 Sep '08

Author: cwittich Date: Mon Sep 8 11:58:34 2008 New Revision: 36065 URL: http://svn.reactos.org/svn/reactos?rev=36065&view=rev Log: forgot to add these files Added: trunk/reactos/dll/win32/msxml3/bsc.c (with props) trunk/reactos/dll/win32/msxml3/cdata.c (with props) trunk/reactos/dll/win32/msxml3/dispex.c (with props) trunk/reactos/dll/win32/msxml3/docfrag.c (with props) trunk/reactos/dll/win32/msxml3/domimpl.c (with props) trunk/reactos/dll/win32/msxml3/entityref.c (with props) trunk/reactos/dll/win32/msxml3/msxml3_v1.idl (with props) trunk/reactos/dll/win32/msxml3/saxreader.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/msxml3/bsc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/bsc.c?rev… Added: trunk/reactos/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/cdata.c?r… Added: trunk/reactos/dll/win32/msxml3/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/dispex.c?… Added: trunk/reactos/dll/win32/msxml3/docfrag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/docfrag.c… Added: trunk/reactos/dll/win32/msxml3/domimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domimpl.c… Added: trunk/reactos/dll/win32/msxml3/entityref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/entityref… Added: trunk/reactos/dll/win32/msxml3/msxml3_v1.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3_v1… Added: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader…

1 0

[cwittich] 36064: sync msxml3 to wine 1.1.3
by cwittich＠svn.reactos.org 08 Sep '08

08 Sep '08

Author: cwittich Date: Mon Sep 8 11:51:03 2008 New Revision: 36064 URL: http://svn.reactos.org/svn/reactos?rev=36064&view=rev Log: sync msxml3 to wine 1.1.3 Modified: trunk/reactos/dll/win32/msxml3/attribute.c trunk/reactos/dll/win32/msxml3/comment.c trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/element.c trunk/reactos/dll/win32/msxml3/factory.c trunk/reactos/dll/win32/msxml3/main.c trunk/reactos/dll/win32/msxml3/msxml3.rbuild trunk/reactos/dll/win32/msxml3/msxml_private.h trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/nodelist.c trunk/reactos/dll/win32/msxml3/nodemap.c trunk/reactos/dll/win32/msxml3/parseerror.c trunk/reactos/dll/win32/msxml3/pi.c trunk/reactos/dll/win32/msxml3/queryresult.c trunk/reactos/dll/win32/msxml3/regsvr.c trunk/reactos/dll/win32/msxml3/schema.c trunk/reactos/dll/win32/msxml3/text.c trunk/reactos/dll/win32/msxml3/xmldoc.c trunk/reactos/dll/win32/msxml3/xmlelem.c trunk/reactos/include/psdk/msxml2.idl trunk/reactos/include/psdk/msxml2did.h trunk/reactos/include/psdk/xmldom.idl trunk/reactos/include/psdk/xmldomdid.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msxml3/attribute.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/attribute… Modified: trunk/reactos/dll/win32/msxml3/comment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c… Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… Modified: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c… Modified: trunk/reactos/dll/win32/msxml3/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/factory.c… Modified: trunk/reactos/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/main.c?re… Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… Modified: trunk/reactos/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml_pri… Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… Modified: trunk/reactos/dll/win32/msxml3/nodelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodelist.… Modified: trunk/reactos/dll/win32/msxml3/nodemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodemap.c… Modified: trunk/reactos/dll/win32/msxml3/parseerror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/parseerro… Modified: trunk/reactos/dll/win32/msxml3/pi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/pi.c?rev=… Modified: trunk/reactos/dll/win32/msxml3/queryresult.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/queryresu… Modified: trunk/reactos/dll/win32/msxml3/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/regsvr.c?… Modified: trunk/reactos/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/schema.c?… Modified: trunk/reactos/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?re… Modified: trunk/reactos/dll/win32/msxml3/xmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmldoc.c?… Modified: trunk/reactos/dll/win32/msxml3/xmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlelem.c… Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… Modified: trunk/reactos/include/psdk/msxml2did.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2did.h?r… Modified: trunk/reactos/include/psdk/xmldom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xmldom.idl?re… Modified: trunk/reactos/include/psdk/xmldomdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xmldomdid.h?r…

1 0

[sginsberg] 36063: - Fix a missed set of the Parameter entry in ConvertThreadToFiberEx
by sginsberg＠svn.reactos.org 08 Sep '08

08 Sep '08

Author: sginsberg Date: Mon Sep 8 11:44:13 2008 New Revision: 36063 URL: http://svn.reactos.org/svn/reactos?rev=36063&view=rev Log: - Fix a missed set of the Parameter entry in ConvertThreadToFiberEx Modified: trunk/reactos/dll/win32/kernel32/thread/fiber.c Modified: trunk/reactos/dll/win32/kernel32/thread/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/fiber.c [iso-8859-1] Mon Sep 8 11:44:13 2008 @@ -84,6 +84,7 @@ } /* copy some contextual data from the thread to the fiber */ + pfCurFiber->Parameter = lpParameter; pfCurFiber->ExceptionList = pTeb->Tib.ExceptionList; pfCurFiber->StackBase = pTeb->Tib.StackBase; pfCurFiber->StackLimit = pTeb->Tib.StackLimit;

1 0

[sginsberg] 36062: - Move global variable declaration to .c file instead of a header. Hinted by Timo.
by sginsberg＠svn.reactos.org 08 Sep '08

08 Sep '08

Author: sginsberg Date: Mon Sep 8 11:28:38 2008 New Revision: 36062 URL: http://svn.reactos.org/svn/reactos?rev=36062&view=rev Log: - Move global variable declaration to .c file instead of a header. Hinted by Timo. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Mon Sep 8 11:28:38 2008 @@ -388,8 +388,6 @@ BOOLEAN Dirty ); -PMM_AVL_TABLE MmKernelAddressSpace; - /* marea.c *******************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=36062… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Mon Sep 8 11:28:38 2008 @@ -21,6 +21,8 @@ ULONG MmReadClusterSize; MM_STATS MmStats; + +PMM_AVL_TABLE MmKernelAddressSpace; /* FUNCTIONS ****************************************************************/

1 0

[jmorlan] 36061: - Batch: In a line generated by a 'for', add the \n that the parser expects. (Bug 3717) - cmd_for: Don't leave raw_params uninitialized; could cause a crash in ExitBatch.
by jmorlan＠svn.reactos.org 08 Sep '08

08 Sep '08

Author: jmorlan Date: Mon Sep 8 11:23:33 2008 New Revision: 36061 URL: http://svn.reactos.org/svn/reactos?rev=36061&view=rev Log: - Batch: In a line generated by a 'for', add the \n that the parser expects. (Bug 3717) - cmd_for: Don't leave raw_params uninitialized; could cause a crash in ExitBatch. Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/for.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Mon Sep 8 11:23:33 2008 @@ -421,6 +421,7 @@ } } + *dp++ = _T('\n'); *dp = _T('\0'); return textline; Modified: trunk/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/for.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/for.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/for.c [iso-8859-1] Mon Sep 8 11:23:33 2008 @@ -130,6 +130,7 @@ bc->hBatchFile = INVALID_HANDLE_VALUE; bc->ffind = NULL; + bc->raw_params = NULL; bc->params = BatchParams (_T(""), param); /* Split out list */ bc->shiftlevel = 0; bc->forvar = var;

1 0

[fireball] 36060: - Fix a typo.
by fireball＠svn.reactos.org 08 Sep '08

08 Sep '08

Author: fireball Date: Mon Sep 8 11:01:19 2008 New Revision: 36060 URL: http://svn.reactos.org/svn/reactos?rev=36060&view=rev Log: - Fix a typo. Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Mon Sep 8 11:01:19 2008 @@ -692,7 +692,7 @@ ULONG TrimHard:1; ULONG MaximumWorkingSetHard:1; ULONG ForceTrim:1; - ULONG MinimumworkingSetHard:1; + ULONG MinimumWorkingSetHard:1; ULONG Available0:1; ULONG MemoryPriority:8; ULONG GrowWsleHash:1;

1 0

[sginsberg] 36059: - [FORMATTING] Fix broken indentation
by sginsberg＠svn.reactos.org 08 Sep '08

08 Sep '08

Author: sginsberg Date: Mon Sep 8 09:46:28 2008 New Revision: 36059 URL: http://svn.reactos.org/svn/reactos?rev=36059&view=rev Log: - [FORMATTING] Fix broken indentation Modified: trunk/reactos/ntoskrnl/config/cmsysini.c 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] Mon Sep 8 09:46:28 2008 @@ -1341,11 +1341,11 @@ } /* Check if we had to allocate a new hive */ - if (CmpMachineHiveList[i].Allocate) + if (CmpMachineHiveList[i].Allocate) { /* Sync the new hive */ - //HvSyncHive((PHHIVE)(CmpMachineHiveList[i].CmHive2)); - } + //HvSyncHive((PHHIVE)(CmpMachineHiveList[i].CmHive2)); + } } /* Check if we created a new hive */

1 0

[janderwald] 36058: - Implement INetLanConnectionUiInfo interface - Remove hack from ShowNetworkComponentProperties - Apply changes when OK / Cancel is pressed
by janderwald＠svn.reactos.org 08 Sep '08

08 Sep '08

Author: janderwald Date: Mon Sep 8 09:19:33 2008 New Revision: 36058 URL: http://svn.reactos.org/svn/reactos?rev=36058&view=rev Log: - Implement INetLanConnectionUiInfo interface - Remove hack from ShowNetworkComponentProperties - Apply changes when OK / Cancel is pressed Modified: trunk/reactos/dll/win32/netshell/lanconnectui.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] Mon Sep 8 09:19:33 2008 @@ -22,12 +22,19 @@ typedef struct { - INetConnectionPropertyUi *lpVtbl; + INetConnectionPropertyUi2 *lpVtbl; + INetLanConnectionUiInfo * lpLanConUiInfoVtbl; INetConnection * pCon; INetCfgLock *NCfgLock; INetCfg * pNCfg; + NETCON_PROPERTIES * pProperties; LONG ref; }INetConnectionPropertyUiImpl, *LPINetConnectionPropertyUiImpl; + +static LPINetConnectionPropertyUiImpl __inline impl_from_NetLanConnectionUiInfo(INetLanConnectionUiInfo *iface) +{ + return (LPINetConnectionPropertyUiImpl)((char *)iface - FIELD_OFFSET(INetConnectionPropertyUiImpl, lpLanConUiInfoVtbl)); +} HPROPSHEETPAGE InitializePropertySheetPage(LPWSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle) @@ -41,10 +48,10 @@ ppage.pfnDlgProc = dlgproc; ppage.lParam = lParam; ppage.hInstance = netshell_hInstance; - ppage.pszTitle = szTitle; if (szTitle) { ppage.dwFlags |= PSP_USETITLE; + ppage.pszTitle = szTitle; } return CreatePropertySheetPageW(&ppage); } @@ -64,23 +71,17 @@ } BOOL -GetINetCfgComponent(INetCfg * pNCfg, INetConnection * pNetCon, INetCfgComponent ** pOut) +GetINetCfgComponent(INetCfg * pNCfg, INetConnectionPropertyUiImpl * This, INetCfgComponent ** pOut) { LPWSTR pName; HRESULT hr; - NETCON_PROPERTIES* pProps; INetCfgComponent * pNCg; ULONG Fetched; IEnumNetCfgComponent * pEnumCfg; - hr = INetConnection_GetProperties(pNetCon, &pProps); - if (FAILED(hr)) - return FALSE; - hr = INetCfg_EnumComponents(pNCfg, &GUID_DEVCLASS_NET, &pEnumCfg); if (FAILED(hr)) { - NcFreeNetconProperties(pProps); return FALSE; } @@ -89,11 +90,10 @@ hr = INetCfgComponent_GetDisplayName(pNCg, &pName); if (SUCCEEDED(hr)) { - if (!wcsicmp(pName, pProps->pszwDeviceName)) + if (!wcsicmp(pName, This->pProperties->pszwDeviceName)) { *pOut = pNCg; IEnumNetCfgComponent_Release(pEnumCfg); - NcFreeNetconProperties(pProps); return TRUE; } CoTaskMemFree(pName); @@ -101,7 +101,6 @@ INetCfgComponent_Release(pNCg); } IEnumNetCfgComponent_Release(pEnumCfg); - NcFreeNetconProperties(pProps); return FALSE; } @@ -139,7 +138,7 @@ hr = INetCfgComponent_QueryInterface(pNCfgComp, &IID_INetCfgComponentBindings, (LPVOID*)&pCompBind); bChecked = FALSE; - if (GetINetCfgComponent(pNCfg, This->pCon, &pAdapterCfgComp)) + if (GetINetCfgComponent(pNCfg, This, &pAdapterCfgComp)) { hr = INetCfgComponentBindings_IsBoundTo(pCompBind, pAdapterCfgComp); if (hr == S_OK) @@ -175,21 +174,16 @@ LVCOLUMNW lc; RECT rc; DWORD dwStyle; - NETCON_PROPERTIES * pProperties; LPWSTR pDisplayName; LVITEMW li; - hr = INetConnection_GetProperties(This->pCon, &pProperties); - if (FAILED(hr)) - return; - - SendDlgItemMessageW(hwndDlg, IDC_NETCARDNAME, WM_SETTEXT, 0, (LPARAM)pProperties->pszwDeviceName); - if (pProperties->dwCharacter & NCCF_SHOW_ICON) + SendDlgItemMessageW(hwndDlg, IDC_NETCARDNAME, WM_SETTEXT, 0, (LPARAM)This->pProperties->pszwDeviceName); + if (This->pProperties->dwCharacter & NCCF_SHOW_ICON) { /* check show item on taskbar*/ SendDlgItemMessageW(hwndDlg, IDC_SHOWTASKBAR, BM_SETCHECK, BST_CHECKED, 0); } - if (pProperties->dwCharacter & NCCF_NOTIFY_DISCONNECTED) + if (This->pProperties->dwCharacter & NCCF_NOTIFY_DISCONNECTED) { /* check notify item */ SendDlgItemMessageW(hwndDlg, IDC_NOTIFYNOCONNECTION, BM_SETCHECK, BST_CHECKED, 0); @@ -252,33 +246,13 @@ HWND hDlgCtrl; UINT Index, Count; HRESULT hr; - INetConnectionPropertyUi * pConUI = NULL; INetCfgComponent * pNCfgComp; PNET_ITEM pItem; - WCHAR szBuffer[200]; hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMPONENTSLIST); Count = ListView_GetItemCount(hDlgCtrl); if (!Count) return; - - - hr = CoCreateInstance(&CLSID_LANConnectUI, - NULL, - CLSCTX_INPROC_SERVER | CLSCTX_NO_CODE_DOWNLOAD, - &IID_INetConnectionPropertyUi, - (LPVOID)&pConUI); - - if (FAILED(hr)) - { - return; - } - hr = INetConnectionPropertyUi_SetConnection(pConUI, This->pCon); - if (FAILED(hr)) - { - INetConnectionPropertyUi_Release(pConUI); - return; - } ZeroMemory(&lvItem, sizeof(LVITEMW)); lvItem.mask = LVIF_PARAM | LVIF_STATE; @@ -295,24 +269,17 @@ if (!(lvItem.state & LVIS_SELECTED)) { - INetConnectionPropertyUi_Release(pConUI); return; } pItem = (PNET_ITEM)lvItem.lParam; pNCfgComp = (INetCfgComponent*) pItem->pNCfgComp; - hr = INetCfgComponent_RaisePropertyUi(pNCfgComp, GetParent(hwndDlg), NCRP_QUERY_PROPERTY_UI, (IUnknown*)pConUI); + hr = INetCfgComponent_RaisePropertyUi(pNCfgComp, GetParent(hwndDlg), NCRP_QUERY_PROPERTY_UI, (IUnknown*)This); if (SUCCEEDED(hr)) { - hr = INetCfgComponent_RaisePropertyUi(pNCfgComp, GetParent(hwndDlg), NCRP_SHOW_PROPERTY_UI, (IUnknown*)pConUI); - } - - swprintf(szBuffer, L"result %08x", hr); - MessageBoxW(NULL, szBuffer, NULL, MB_OK); - - INetConnectionPropertyUi_Release(pConUI); - + hr = INetCfgComponent_RaisePropertyUi(pNCfgComp, GetParent(hwndDlg), NCRP_SHOW_PROPERTY_UI, (IUnknown*)This); + } } @@ -330,6 +297,8 @@ LVITEMW li; PNET_ITEM pItem; INetConnectionPropertyUiImpl * This; + LPPSHNOTIFY lppsn; + HRESULT hr; switch(uMsg) { @@ -341,6 +310,33 @@ return TRUE; case WM_NOTIFY: lppl = (LPNMLISTVIEW) lParam; + lppsn = (LPPSHNOTIFY) lParam; + if (lppsn->hdr.code == PSN_APPLY) + { + This = (INetConnectionPropertyUiImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER); + if (This->pNCfg) + { + hr = INetCfg_Apply(This->pNCfg); + if (SUCCEEDED(hr)) + return PSNRET_NOERROR; + else + return PSNRET_INVALID; + } + return PSNRET_NOERROR; + } + else if (lppsn->hdr.code == PSN_APPLY) + { + This = (INetConnectionPropertyUiImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER); + if (This->pNCfg) + { + hr = INetCfg_Cancel(This->pNCfg); + if (SUCCEEDED(hr)) + return PSNRET_NOERROR; + else + return PSNRET_INVALID; + } + return PSNRET_NOERROR; + } if (lppl->hdr.code == LVN_ITEMCHANGING) { ZeroMemory(&li, sizeof(li)); @@ -385,30 +381,40 @@ static HRESULT WINAPI -INetConnectionPropertyUi_fnQueryInterface( - INetConnectionPropertyUi * iface, +INetConnectionPropertyUi2_fnQueryInterface( + INetConnectionPropertyUi2 * iface, REFIID iid, LPVOID * ppvObj) { + //LPOLESTR pStr; INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; *ppvObj = NULL; if (IsEqualIID (iid, &IID_IUnknown) || - IsEqualIID (iid, &IID_INetConnectionPropertyUi)) + IsEqualIID (iid, &IID_INetConnectionPropertyUi) || + IsEqualIID (iid, &IID_INetConnectionPropertyUi2)) { *ppvObj = This; IUnknown_AddRef(iface); return S_OK; } - + else if (IsEqualIID(iid, &IID_INetLanConnectionUiInfo)) + { + *ppvObj = &This->lpLanConUiInfoVtbl; + IUnknown_AddRef(iface); + return S_OK; + } + //StringFromCLSID(iid, &pStr); + //MessageBoxW(NULL, pStr, L"INetConnectionPropertyUi_fnQueryInterface", MB_OK); + //CoTaskMemFree(pStr); return E_NOINTERFACE; } static ULONG WINAPI -INetConnectionPropertyUi_fnAddRef( - INetConnectionPropertyUi * iface) +INetConnectionPropertyUi2_fnAddRef( + INetConnectionPropertyUi2 * iface) { INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; ULONG refCount = InterlockedIncrement(&This->ref); @@ -419,14 +425,17 @@ static ULONG WINAPI -INetConnectionPropertyUi_fnRelease( - INetConnectionPropertyUi * iface) +INetConnectionPropertyUi2_fnRelease( + INetConnectionPropertyUi2 * iface) { INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; ULONG refCount = InterlockedDecrement(&This->ref); if (!refCount) { + INetCfg_Release(This->pNCfg); + INetCfgLock_Release(This->NCfgLock); + NcFreeNetconProperties(This->pProperties); CoTaskMemFree (This); } return refCount; @@ -435,8 +444,8 @@ static HRESULT WINAPI -INetConnectionPropertyUi_fnSetConnection( - INetConnectionPropertyUi * iface, +INetConnectionPropertyUi2_fnSetConnection( + INetConnectionPropertyUi2 * iface, INetConnection *pCon) { INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; @@ -455,8 +464,8 @@ static HRESULT WINAPI -INetConnectionPropertyUi_fnAddPages( - INetConnectionPropertyUi * iface, +INetConnectionPropertyUi2_fnAddPages( + INetConnectionPropertyUi2 * iface, HWND hwndParent, LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) @@ -465,7 +474,6 @@ BOOL ret; HRESULT hr = E_FAIL; INITCOMMONCONTROLSEX initEx; - NETCON_PROPERTIES * pProperties; INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; @@ -474,11 +482,11 @@ if(!InitCommonControlsEx(&initEx)) return E_FAIL; - hr = INetConnection_GetProperties(This->pCon, &pProperties); + hr = INetConnection_GetProperties(This->pCon, &This->pProperties); if (FAILED(hr)) return hr; - hProp = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_NETPROPERTIES), LANPropertiesUIDlg, (LPARAM)This, pProperties->pszwName); + hProp = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_NETPROPERTIES), LANPropertiesUIDlg, (LPARAM)This, This->pProperties->pszwName); if (hProp) { ret = (*pfnAddPage)(hProp, lParam); @@ -488,19 +496,81 @@ } DestroyPropertySheetPage(hProp); } - //NcFreeNetconProperties(pProperties); return hr; } -static const INetConnectionPropertyUiVtbl vt_NetConnectionPropertyUi = -{ - INetConnectionPropertyUi_fnQueryInterface, - INetConnectionPropertyUi_fnAddRef, - INetConnectionPropertyUi_fnRelease, - INetConnectionPropertyUi_fnSetConnection, - INetConnectionPropertyUi_fnAddPages, +static +HRESULT +WINAPI +INetConnectionPropertyUi2_fnGetIcon( + INetConnectionPropertyUi2 * iface, + DWORD dwSize, + HICON *phIcon) +{ + return E_NOTIMPL; +} + +static const INetConnectionPropertyUi2Vtbl vt_NetConnectionPropertyUi = +{ + INetConnectionPropertyUi2_fnQueryInterface, + INetConnectionPropertyUi2_fnAddRef, + INetConnectionPropertyUi2_fnRelease, + INetConnectionPropertyUi2_fnSetConnection, + INetConnectionPropertyUi2_fnAddPages, + INetConnectionPropertyUi2_fnGetIcon, }; +static +HRESULT +STDCALL +INetLanConnectionUiInfo_fnQueryInterface( + INetLanConnectionUiInfo * iface, + REFIID iid, + LPVOID * ppvObj) +{ + INetConnectionPropertyUiImpl * This = impl_from_NetLanConnectionUiInfo(iface); + return INetConnectionPropertyUi_QueryInterface((INetConnectionPropertyUi*)This, iid, ppvObj); +} + +static +ULONG +STDCALL +INetLanConnectionUiInfo_fnAddRef( + INetLanConnectionUiInfo * iface) +{ + INetConnectionPropertyUiImpl * This = impl_from_NetLanConnectionUiInfo(iface); + return INetConnectionPropertyUi_AddRef((INetConnectionPropertyUi*)This); +} + +static +ULONG +STDCALL +INetLanConnectionUiInfo_fnRelease( + INetLanConnectionUiInfo * iface) +{ + INetConnectionPropertyUiImpl * This = impl_from_NetLanConnectionUiInfo(iface); + return INetConnectionPropertyUi_Release((INetConnectionPropertyUi*)This); +} + +static +HRESULT +STDCALL +INetLanConnectionUiInfo_fnGetDeviceGuid( + INetLanConnectionUiInfo * iface, + GUID * pGuid) +{ + INetConnectionPropertyUiImpl * This = impl_from_NetLanConnectionUiInfo(iface); + CopyMemory(pGuid, &This->pProperties->guidId, sizeof(GUID)); + return S_OK; +} + +static const INetLanConnectionUiInfoVtbl vt_NetLanConnectionUiInfo = +{ + INetLanConnectionUiInfo_fnQueryInterface, + INetLanConnectionUiInfo_fnAddRef, + INetLanConnectionUiInfo_fnRelease, + INetLanConnectionUiInfo_fnGetDeviceGuid, +}; HRESULT WINAPI LanConnectUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) { INetConnectionPropertyUiImpl * This; @@ -518,9 +588,12 @@ This->ref = 1; This->pCon = NULL; This->pNCfg = NULL; - This->lpVtbl = (INetConnectionPropertyUi*)&vt_NetConnectionPropertyUi; - - if (!SUCCEEDED (INetConnectionPropertyUi_fnQueryInterface ((INetConnectionPropertyUi*)This, riid, ppv))) + This->NCfgLock = NULL; + This->pProperties = NULL; + This->lpVtbl = (INetConnectionPropertyUi2*)&vt_NetConnectionPropertyUi; + This->lpLanConUiInfoVtbl = (INetLanConnectionUiInfo*)&vt_NetLanConnectionUiInfo; + + if (!SUCCEEDED (INetConnectionPropertyUi2_fnQueryInterface ((INetConnectionPropertyUi2*)This, riid, ppv))) { IUnknown_Release((IUnknown*)This); return E_NOINTERFACE; 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] Mon Sep 8 09:19:33 2008 @@ -35,6 +35,7 @@ #include <netcon.h> #include <docobj.h> #include <netcfgx.h> +#include <netcfgn.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] Mon Sep 8 09:19:33 2008 @@ -794,9 +794,10 @@ hr = INetConnectionPropertyUi_SetConnection(pNCP, val->pItem); if (SUCCEEDED(hr)) { - memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW)); + ZeroMemory(&pinfo, sizeof(PROPSHEETHEADERW)); + ZeroMemory(hppages, sizeof(hppages)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); - pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE; + pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW; pinfo.u3.phpage = hppages; pinfo.pszCaption = pProperties->pszwName;

1 0

[janderwald] 36057: - Add IIDs of INetLanConnectionUiInfo, INetConnectionPropertyUi2 interface
by janderwald＠svn.reactos.org 08 Sep '08

08 Sep '08

Author: janderwald Date: Mon Sep 8 09:14:04 2008 New Revision: 36057 URL: http://svn.reactos.org/svn/reactos?rev=36057&view=rev Log: - Add IIDs of INetLanConnectionUiInfo, INetConnectionPropertyUi2 interface 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] Mon Sep 8 09:14:04 2008 @@ -89,7 +89,7 @@ #if 0 /* FIXME */ #include "control.h" #endif - + /* GUIDs not declared in an exported header file */ DEFINE_GUID(IID_IDirectPlaySP, 0x0c9f6360,0xcc61,0x11cf,0xac,0xec,0x00,0xaa,0x00,0x68,0x86,0xe3); DEFINE_GUID(IID_ISFHelper, 0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00); @@ -100,11 +100,13 @@ DEFINE_GUID(IID_INetConnection, 0xC08956A1,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetConnectionManager, 0xC08956A2,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetConnectionPropertyUi, 0xC08956A4,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetLanConnectionUiInfo, 0xC08956A6,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_IEnumNetCfgComponent, 0xC0E8AE92,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetCfg, 0xC0E8AE93,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetCfgComponent, 0xC0E8AE99,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); 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(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9);

1 0

[janderwald] 36056: - Add INetLanConnectionUiInfo, INetConnectionPropertyUi2 interface
by janderwald＠svn.reactos.org 08 Sep '08

08 Sep '08

Author: janderwald Date: Mon Sep 8 09:13:23 2008 New Revision: 36056 URL: http://svn.reactos.org/svn/reactos?rev=36056&view=rev Log: - Add INetLanConnectionUiInfo, INetConnectionPropertyUi2 interface Added: trunk/reactos/include/psdk/netcfgn.h (with props) Modified: trunk/reactos/include/psdk/netcon.h Added: 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 (added) +++ trunk/reactos/include/psdk/netcfgn.h [iso-8859-1] Mon Sep 8 09:13:23 2008 @@ -1,0 +1,25 @@ +#ifndef _NETCFGN_H__ +#define _NETCFGN_H__ + +#undef INTERFACE +#define INTERFACE INetLanConnectionUiInfo +DECLARE_INTERFACE_(INetLanConnectionUiInfo, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,GetDeviceGuid)(THIS_ GUID *pguid) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetLanConnectionUiInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetLanConnectionUiInfo_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetLanConnectionUiInfo_Release(p) (p)->lpVtbl->Release(p) +#define INetLanConnectionUiInfo_GetDeviceGuid(p,a) (p)->lpVtbl->GetDeviceGuid(p,a) +#endif + +EXTERN_C const IID IID_INetLanConnectionUiInfo; + +#endif Propchange: trunk/reactos/include/psdk/netcfgn.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/netcon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/netcon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/netcon.h [iso-8859-1] Mon Sep 8 09:13:23 2008 @@ -192,6 +192,32 @@ EXTERN_C const IID IID_INetConnectionPropertyUi; +#undef INTERFACE +#define INTERFACE INetConnectionPropertyUi2 +DECLARE_INTERFACE_(INetConnectionPropertyUi2, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT, SetConnection) (THIS_ INetConnection *pCon) PURE; + STDMETHOD_(HRESULT, AddPages) (THIS_ HWND hwndParent, LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) PURE; + STDMETHOD_(HRESULT, GetIcon) (THIS_ DWORD dwSize, HICON *phIcon) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define INetConnectionPropertyUi2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetConnectionPropertyUi2_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetConnectionPropertyUi2_Release(p) (p)->lpVtbl->Release(p) +#define INetConnectionPropertyUi2_SetConnection(p,a) (p)->lpVtbl->SetConnection(p,a) +#define INetConnectionPropertyUi2_AddPages(p,a,b,c) (p)->lpVtbl->AddPages(p,a,b,c) +#define INetConnectionPropertyUi2_GetIcon(p,a,b) (p)->lpVtbl->GetIcon(p,a,b) +#endif + + +EXTERN_C const IID IID_INetConnectionPropertyUi2; + + VOID STDCALL NcFreeNetconProperties (NETCON_PROPERTIES* pProps); #endif

1 0

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