Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[janderwald] 35839: - Remove old unused enumeration code - Implement displaying network component properties
by janderwald＠svn.reactos.org 02 Sep '08

02 Sep '08

Author: janderwald Date: Sun Aug 31 13:07:21 2008 New Revision: 35839 URL: http://svn.reactos.org/svn/reactos?rev=35839&view=rev Log: - Remove old unused enumeration code - Implement displaying network component properties Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c trunk/reactos/dll/win32/netshell/netshell.rc 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] Sun Aug 31 13:07:21 2008 @@ -16,12 +16,15 @@ NET_TYPE Type; DWORD dwCharacteristics; LPWSTR szHelp; + INetCfgComponent *pNCfgComp; + UINT NumPropDialogOpen; }NET_ITEM, *PNET_ITEM; typedef struct { INetConnectionPropertyUi *lpVtbl; INetConnection * pCon; + INetCfg * pNCfg; LONG ref; }INetConnectionPropertyUiImpl, *LPINetConnectionPropertyUiImpl; @@ -57,92 +60,6 @@ lvItem.iItem = ListView_GetItemCount(hDlgCtrl); lvItem.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&lvItem); ListView_SetCheckState(hDlgCtrl, lvItem.iItem, TRUE); -} - -VOID -EnumClientServiceProtocol(HWND hDlgCtrl, HKEY hKey, UINT Type) -{ - DWORD dwIndex = 0; - DWORD dwSize; - DWORD dwRetVal; - DWORD dwCharacteristics; - WCHAR szName[100]; - WCHAR szText[100]; - WCHAR szHelp[200]; - HKEY hSubKey; - static WCHAR szNDI[] = L"\\Ndi"; - PNET_ITEM pItem; - - do - { - szHelp[0] = L'\0'; - dwCharacteristics = 0; - szText[0] = L'\0'; - - dwSize = sizeof(szName)/sizeof(WCHAR); - if (RegEnumKeyExW(hKey, dwIndex++, szName, &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) - { - /* Get Help Text */ - if (dwSize + (sizeof(szNDI)/sizeof(WCHAR)) + 1 < sizeof(szName)/sizeof(WCHAR)) - { - wcscpy(&szName[dwSize], szNDI); - if (RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) - { -#if 0 - if (RegLoadMUIStringW(hSubKey, L"HelpText", szHelp, sizeof(szHelp)/sizeof(WCHAR), &dwRetVal, 0, NULL) == ERROR_SUCCESS) - szHelp[(sizeof(szHelp)/sizeof(WCHAR))-1] = L'\0'; -#else - DWORD dwType; - dwRetVal = sizeof(szHelp); - if (RegQueryValueExW(hSubKey, L"HelpText", NULL, &dwType, (LPBYTE)szHelp, &dwRetVal) == ERROR_SUCCESS) - szHelp[(sizeof(szHelp)/sizeof(WCHAR))-1] = L'\0'; -#endif - RegCloseKey(hSubKey); - } - szName[dwSize] = L'\0'; - } - /* Get Characteristics */ - if (RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) - { - dwSize = sizeof(dwCharacteristics); - if (RegQueryValueExW(hSubKey, L"Characteristics", NULL, NULL, (LPBYTE)&dwCharacteristics, &dwSize) == ERROR_SUCCESS) - { - if (dwCharacteristics & NCF_HIDDEN) - { - RegCloseKey(hSubKey); - continue; - } - } - /* Get the Client/Procotol/Service name */ - dwSize = sizeof(szText); - if (RegQueryValueExW(hSubKey, L"Description", NULL, NULL, (LPBYTE)szText, &dwSize) == ERROR_SUCCESS) - { - szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0'; - } - RegCloseKey(hSubKey); - } - - if (!wcslen(szText)) - continue; - - - pItem = CoTaskMemAlloc(sizeof(NET_ITEM)); - if (!pItem) - continue; - - pItem->dwCharacteristics = dwCharacteristics; - pItem->Type = Type; - pItem->szHelp = CoTaskMemAlloc((wcslen(szHelp)+1)*sizeof(WCHAR)); - if (pItem->szHelp) - wcscpy(pItem->szHelp, szHelp); - - AddItemToListView(hDlgCtrl, pItem, szText); - } - else - break; - - }while(TRUE); - } VOID @@ -182,17 +99,17 @@ pItem->dwCharacteristics = dwCharacteristics; pItem->szHelp = pHelpText; pItem->Type = Type; + pItem->pNCfgComp = pNCfgComp; + pItem->NumPropDialogOpen = 0; AddItemToListView(hDlgCtrl, pItem, pDisplayName); CoTaskMemFree(pDisplayName); - - INetCfgComponent_Release(pNCfgComp); } IEnumNetCfgComponent_Release(pENetCfg); } VOID -InitializeLANPropertiesUIDlg(HWND hwndDlg) +InitializeLANPropertiesUIDlg(HWND hwndDlg, INetConnectionPropertyUiImpl * This) { HRESULT hr; INetCfg * pNCfg; @@ -200,6 +117,23 @@ LVCOLUMNW lc; RECT rc; DWORD dwStyle; + NETCON_PROPERTIES * pProperties; + + 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) + { + /* check show item on taskbar*/ + SendDlgItemMessageW(hwndDlg, IDC_SHOWTASKBAR, BM_SETCHECK, BST_CHECKED, 0); + } + if (pProperties->dwCharacter & NCCF_NOTIFY_DISCONNECTED) + { + /* check notify item */ + SendDlgItemMessageW(hwndDlg, IDC_NOTIFYNOCONNECTION, BM_SETCHECK, BST_CHECKED, 0); + } memset(&lc, 0, sizeof(LV_COLUMN)); lc.mask = LVCF_TEXT | LVCF_SUBITEM | LVCF_FMT; @@ -231,10 +165,92 @@ EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETCLIENT, NET_TYPE_CLIENT); EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETSERVICE, NET_TYPE_SERVICE); EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETTRANS, NET_TYPE_PROTOCOL); - - INetCfg_Release(pNCfg); -} - + This->pNCfg = pNCfg; +} + +VOID +ShowNetworkComponentProperties( + HWND hwndDlg, + INetConnectionPropertyUiImpl * This) +{ + LVITEMW lvItem; + HWND hDlgCtrl; + UINT Index, Count; + HRESULT hr; + INetConnectionPropertyUi * pConUI = NULL; + INetCfgComponent * pNCfgComp; + PNET_ITEM pItem; + INetCfgLock * pLock; + LPWSTR pLockApp; + + 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; + lvItem.stateMask = (UINT)-1; + for (Index = 0; Index < Count; Index++) + { + lvItem.iItem = Index; + if (SendMessageW(hDlgCtrl, LVM_GETITEMW, 0, (LPARAM)&lvItem)) + { + if (lvItem.state & LVIS_SELECTED) + break; + } + } + + if (!(lvItem.state & LVIS_SELECTED)) + { + INetConnectionPropertyUi_Release(pConUI); + return; + } + + pItem = (PNET_ITEM)lvItem.lParam; + pNCfgComp = (INetCfgComponent*) pItem->pNCfgComp; + + hr = INetCfg_QueryInterface(This->pNCfg, &IID_INetCfgLock, (LPVOID*)&pLock); + if (FAILED(hr)) + return; + + hr = INetCfgLock_AcquireWriteLock(pLock, 10000, L"", &pLockApp); + if (FAILED(hr)) + { + CoTaskMemFree(pLockApp); + INetConnectionPropertyUi_Release(pConUI); + return; + } + + + hr = INetCfgComponent_RaisePropertyUi(pNCfgComp, GetParent(hwndDlg), NCRP_QUERY_PROPERTY_UI, (IUnknown*)pConUI); + if (SUCCEEDED(hr)) + { + hr = INetCfgComponent_RaisePropertyUi(pNCfgComp, GetParent(hwndDlg), NCRP_SHOW_PROPERTY_UI, (IUnknown*)pConUI); + } + + INetCfgLock_ReleaseWriteLock(pLock); + INetConnectionPropertyUi_Release(pConUI); + +} INT_PTR @@ -250,25 +266,15 @@ LPNMLISTVIEW lppl; LVITEMW li; PNET_ITEM pItem; - NETCON_PROPERTIES * pProperties; + INetConnectionPropertyUiImpl * This; switch(uMsg) { case WM_INITDIALOG: page = (PROPSHEETPAGE*)lParam; - pProperties = (NETCON_PROPERTIES*)page->lParam; - SendDlgItemMessageW(hwndDlg, IDC_NETCARDNAME, WM_SETTEXT, 0, (LPARAM)pProperties->pszwDeviceName); - if (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) - { - /* check notify item */ - SendDlgItemMessageW(hwndDlg, IDC_NOTIFYNOCONNECTION, BM_SETCHECK, BST_CHECKED, 0); - } - InitializeLANPropertiesUIDlg(hwndDlg); + This = (INetConnectionPropertyUiImpl*)page->lParam; + InitializeLANPropertiesUIDlg(hwndDlg, This); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)This); return TRUE; case WM_NOTIFY: lppl = (LPNMLISTVIEW) lParam; @@ -301,6 +307,14 @@ } } break; + case WM_COMMAND: + if (LOWORD(wParam) == IDC_PROPERTIES) + { + This = (INetConnectionPropertyUiImpl*) GetWindowLongPtr(hwndDlg, DWLP_USER); + ShowNetworkComponentProperties(hwndDlg, This); + return FALSE; + } + break; } return FALSE; } @@ -385,37 +399,34 @@ LPARAM lParam) { HPROPSHEETPAGE hProp; + BOOL ret; + HRESULT hr = E_FAIL; + INITCOMMONCONTROLSEX initEx; NETCON_PROPERTIES * pProperties; - BOOL ret; - HRESULT hr; - INITCOMMONCONTROLSEX initEx; INetConnectionPropertyUiImpl * This = (INetConnectionPropertyUiImpl*)iface; initEx.dwSize = sizeof(initEx); initEx.dwICC = ICC_LISTVIEW_CLASSES; - - if(!InitCommonControlsEx(&initEx)) return E_FAIL; - - hr = INetConnection_GetProperties(This->pCon, &pProperties); if (FAILED(hr)) return hr; - hProp = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_NETPROPERTIES), LANPropertiesUIDlg, (LPARAM)pProperties, pProperties->pszwName); + hProp = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_NETPROPERTIES), LANPropertiesUIDlg, (LPARAM)This, pProperties->pszwName); if (hProp) { ret = (*pfnAddPage)(hProp, lParam); if (ret) { - return NOERROR; + hr = NOERROR; } DestroyPropertySheetPage(hProp); } - return E_FAIL; + //NcFreeNetconProperties(pProperties); + return hr; } static const INetConnectionPropertyUiVtbl vt_NetConnectionPropertyUi = @@ -443,6 +454,7 @@ This->ref = 1; This->pCon = NULL; + This->pNCfg = NULL; This->lpVtbl = (INetConnectionPropertyUi*)&vt_NetConnectionPropertyUi; if (!SUCCEEDED (INetConnectionPropertyUi_fnQueryInterface ((INetConnectionPropertyUi*)This, riid, ppv))) Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] Sun Aug 31 13:07:21 2008 @@ -11,6 +11,7 @@ #define REACTOS_STR_ORIGINAL_FILENAME "netshell.dll\0" #define REACTOS_STR_PRODUCT_VERSION "5.1.2600.3264\0" #define REACTOS_STR_FILE_VERSION "5.1.2600.3264\0" +#define REACTOS_STR_COMPANY_NAME "Microsoft Corporation" #include <reactos/version.rc>

2 1

[pschweitzer] 35846: Reverted r35812 because of unwanted triple fault bug. See issue #3704, 3706 for more details.
by pschweitzer＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: pschweitzer Date: Sun Aug 31 16:58:44 2008 New Revision: 35846 URL: http://svn.reactos.org/svn/reactos?rev=35846&view=rev Log: Reverted r35812 because of unwanted triple fault bug. See issue #3704,3706 for more details. Modified: trunk/reactos/dll/ntdll/dispatch/ (props changed) trunk/reactos/dll/ntdll/dispatch/dispatch.c trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S trunk/reactos/lib/rtl/i386/except.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/lib/rtl/vectoreh.c Propchange: trunk/reactos/dll/ntdll/dispatch/ ------------------------------------------------------------------------------ (empty) Modified: trunk/reactos/dll/ntdll/dispatch/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/dispatc… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] Sun Aug 31 16:58:44 2008 @@ -15,6 +15,10 @@ typedef NTSTATUS (NTAPI *USER_CALL)(PVOID Argument, ULONG ArgumentLength); +EXCEPTION_DISPOSITION NTAPI +RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context); + /* FUNCTIONS ****************************************************************/ /* @@ -28,16 +32,26 @@ EXCEPTION_RECORD NestedExceptionRecord; NTSTATUS Status; - /* Dispatch the exception and check the result */ - if (RtlDispatchException(ExceptionRecord, Context)) + /* call the vectored exception handlers */ + if(RtlpExecuteVectoredExceptionHandlers(ExceptionRecord, + Context) != ExceptionContinueExecution) { - /* Continue executing */ - Status = NtContinue(Context, FALSE); + goto ContinueExecution; } else { - /* Raise an exception */ - Status = NtRaiseException(ExceptionRecord, Context, FALSE); + /* Dispatch the exception and check the result */ + if(RtlDispatchException(ExceptionRecord, Context)) + { +ContinueExecution: + /* Continue executing */ + Status = NtContinue(Context, FALSE); + } + else + { + /* Raise an exception */ + Status = NtRaiseException(ExceptionRecord, Context, FALSE); + } } /* Setup the Exception record */ Modified: trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/i386/di… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] Sun Aug 31 16:58:44 2008 @@ -183,13 +183,43 @@ .globl _KiUserExceptionDispatcher@8 _KiUserExceptionDispatcher@8: - /* Clear direction flag */ + /* clear the direct flag + * text from bug 2279 + * if it not clear it means that if an exception occurs while + * the direction flag is set (typically inside memmove), the + * exception handlers will be called with the direction flag still + * set. The Windows x86-32 and x86-64 ABI requires that the + * direction flag be Calling memset() with a compile-time constant + * size on both GCC and MSVC will result in inlining a "rep stosd" + * instruction. Because of the ABI, they will assume that the + * direction flag is clear and not emit a "cld" instruction. + * Using memset() in an exception handler therefore will + * corrupt memory if the exception occurred during a reverse copy + * such as a forward overlapping memmove(). + * + * For reliability and ease of debugging, please add "cld" to the beginning of + * KiUserExceptionDispatcher. Note that the same will be true of x86-64 whenever + * that happens. This does not affect continuing execution; the CONTEXT of the + * exception has the direction flag set and will be restored upon NtContinue. + * KiUserApcDispatcher and KiUserCallbackDispatcher need to be evaluated for this + * issue. + */ + cld /* Save the Context and Exception Records */ mov ecx, [esp+4] mov ebx, [esp] + /* Call the vectored exception handler */ + push ecx + push ebx + call _RtlpExecuteVectoredExceptionHandlers@8 + + /* Check for success */ + or al, al + jnz ContinueExecution + /* Dispatch the exception */ sub esp, 8 call _RtlDispatchException@8 @@ -198,6 +228,7 @@ or al, al jz RaiseException +ContinueExecution: /* Pop off the records */ pop ebx pop ecx Modified: trunk/reactos/lib/rtl/i386/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/except.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] Sun Aug 31 16:58:44 2008 @@ -73,13 +73,6 @@ EXCEPTION_DISPOSITION Disposition; ULONG_PTR StackLow, StackHigh; ULONG_PTR RegistrationFrameEnd; - - /* Call any registered vectored handlers */ - if (RtlCallVectoredExceptionHandlers(ExceptionRecord, Context)) - { - /* Exception handled, continue execution */ - return TRUE; - } /* Get the current stack limits and registration frame */ RtlpGetStackLimits(&StackLow, &StackHigh); Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=35846&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Sun Aug 31 16:58:44 2008 @@ -36,13 +36,6 @@ VOID NTAPI RtlpSetExceptionList(PEXCEPTION_REGISTRATION_RECORD NewExceptionList); - -BOOLEAN -NTAPI -RtlCallVectoredExceptionHandlers( - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context -); typedef struct _DISPATCHER_CONTEXT { Modified: trunk/reactos/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/vectoreh.c?rev=358… ============================================================================== --- trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] Sun Aug 31 16:58:44 2008 @@ -28,10 +28,9 @@ /* FUNCTIONS ***************************************************************/ -BOOLEAN -NTAPI -RtlCallVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context) +EXCEPTION_DISPOSITION NTAPI +RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context) { PLIST_ENTRY CurrentEntry; PRTL_VECTORED_EXCEPTION_HANDLER veh; @@ -56,7 +55,7 @@ if(VectoredHandler(&ExceptionInfo) == EXCEPTION_CONTINUE_EXECUTION) { - return TRUE; + return ExceptionContinueSearch; } RtlEnterCriticalSection(&RtlpVectoredExceptionLock); @@ -64,7 +63,7 @@ RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); } - return FALSE; + return ExceptionContinueExecution; } VOID

1 0

[sginsberg] 35837: - "0xbadf00d" is not a valid tag. use "PcNt" instead
by sginsberg＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: sginsberg Date: Sun Aug 31 12:56:13 2008 New Revision: 35837 URL: http://svn.reactos.org/svn/reactos?rev=35837&view=rev Log: - "0xbadf00d" is not a valid tag. use "PcNt" instead Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] Sun Aug 31 12:56:13 2008 @@ -146,7 +146,7 @@ #endif /* memory pool tag */ -#define PCNET_TAG 0xbaadf00d +#define PCNET_TAG TAG('P', 'c', 'N', 't') #endif // _PCNET_H_

2 1

[pschweitzer] 35844: Add primary tests to FsRtlInsertPerFileObjectContext. That's only to test branch build ; ).
by pschweitzer＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: pschweitzer Date: Sun Aug 31 14:47:19 2008 New Revision: 35844 URL: http://svn.reactos.org/svn/reactos?rev=35844&view=rev Log: Add primary tests to FsRtlInsertPerFileObjectContext. That's only to test branch build ;). Modified: branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/filtr… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c [iso-8859-1] Sun Aug 31 14:47:19 2008 @@ -112,7 +112,7 @@ } ExAcquireFastMutex(PerStreamContext->FastMutex); - InsertHeadList(&PerStreamContext->FilterContexts, &Ptr->Links); + InsertHeadList(&(PerStreamContext->FilterContexts), &(Ptr->Links)); ExReleaseFastMutex(PerStreamContext->FastMutex); return STATUS_SUCCESS; } @@ -179,6 +179,16 @@ FsRtlInsertPerFileObjectContext(IN PFILE_OBJECT FileObject, IN PFSRTL_PER_FILEOBJECT_CONTEXT Ptr) { + if (!FileObject) + { + return STATUS_INVALID_PARAMETER; + } + + if (FileObject->Flags & FO_NAMED_PIPE) + { + return STATUS_INVALID_DEVICE_REQUEST; + } + KEBUGCHECK(0); return STATUS_NOT_IMPLEMENTED; }

1 0

[pschweitzer] 35843: Define TAG macro before use. That fixes build
by pschweitzer＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: pschweitzer Date: Sun Aug 31 14:15:06 2008 New Revision: 35843 URL: http://svn.reactos.org/svn/reactos?rev=35843&view=rev Log: Define TAG macro before use. That fixes build Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] Sun Aug 31 14:15:06 2008 @@ -145,6 +145,10 @@ #define BREAKPOINT #endif +#ifndef TAG +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#endif + /* memory pool tag */ #define PCNET_TAG TAG('P', 'c', 'N', 't')

1 0

[pschweitzer] 35842: Get back some code that left with r35841... Code, don't leave us :).
by pschweitzer＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: pschweitzer Date: Sun Aug 31 13:50:56 2008 New Revision: 35842 URL: http://svn.reactos.org/svn/reactos?rev=35842&view=rev Log: Get back some code that left with r35841... Code, don't leave us :). Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/name.… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Aug 31 13:50:56 2008 @@ -278,6 +278,8 @@ { ULONG i, j, k = 0; + ASSERT(!FsRtlDoesNameContainWildCards(Name)); + for (i = 0 ; i < Expression->Length / sizeof(WCHAR) ; i++) { if ((FsRtlpUpcaseUnicodeChar(Expression->Buffer[i], IgnoreCase, UpcaseTable) == @@ -298,6 +300,7 @@ if (Name->Buffer[j] == '.') { k = j; + break; } } }

1 0

[pschweitzer] 35841: Removed some (really) crappy code in FsRtlIsNameInExpression using a private helper function
by pschweitzer＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: pschweitzer Date: Sun Aug 31 13:47:08 2008 New Revision: 35841 URL: http://svn.reactos.org/svn/reactos?rev=35841&view=rev Log: Removed some (really) crappy code in FsRtlIsNameInExpression using a private helper function Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/name.… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Aug 31 13:47:08 2008 @@ -13,6 +13,28 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +WCHAR +NTAPI +FsRtlpUpcaseUnicodeChar(IN WCHAR SourceCharacter, + IN BOOLEAN IgnoreCase, + IN PWCHAR UpcaseTable OPTIONAL) +{ + if (IgnoreCase) + { + if (!UpcaseTable) + { + return RtlUpcaseUnicodeChar(SourceCharacter); + } + else + { + return UpcaseTable[SourceCharacter]; + } + } + return SourceCharacter; +} /* PUBLIC FUNCTIONS **********************************************************/ @@ -255,69 +277,27 @@ IN PWCHAR UpcaseTable OPTIONAL) { ULONG i, j, k = 0; - UNICODE_STRING IntExpression, IntName; - WCHAR IntExprBuffer[Expression->Length / sizeof(WCHAR)], IntNameBuffer[Name->Length / sizeof(WCHAR)]; - - ASSERT(!FsRtlDoesNameContainWildCards(Name)); - - /* We'll first upcase the both strings, if necessary. - In all cases, we'll create internal strings to work on. */ - if (IgnoreCase) - { - IntExpression.Buffer = IntExprBuffer; - IntName.Buffer = IntNameBuffer; - if (!UpcaseTable) - { - RtlUpcaseUnicodeString(&IntExpression, Expression, FALSE); - RtlUpcaseUnicodeString(&IntName, Name, FALSE); - - } - else - { - for (i = 0 ; i < Expression->Length / sizeof (WCHAR) + 1 ; i++) + + for (i = 0 ; i < Expression->Length / sizeof(WCHAR) ; i++) + { + if ((FsRtlpUpcaseUnicodeChar(Expression->Buffer[i], IgnoreCase, UpcaseTable) == + FsRtlpUpcaseUnicodeChar(Name->Buffer[k], IgnoreCase, UpcaseTable)) || + (Expression->Buffer[i] == '?') || (Expression->Buffer[i] == ANSI_DOS_QM) || + (Expression->Buffer[i] == ANSI_DOS_DOT && (Name->Buffer[k] == '.' || Name->Buffer[k] == '0'))) + { + k++; + } + else if (Expression->Buffer[i] == '*') + { + k = Name->Length / sizeof(WCHAR); + } + else if (Expression->Buffer[i] == ANSI_DOS_STAR) + { + for (j = k ; j < Name->Length / sizeof(WCHAR) ; j++) { - IntExpression.Buffer[i] = UpcaseTable[Expression->Buffer[i]]; - } - IntExpression.Length = Expression->Length; - IntExpression.MaximumLength = Expression->MaximumLength; - for (i = 0 ; i < Name->Length / sizeof (WCHAR) + 1 ; i++) - { - IntName.Buffer[i] = UpcaseTable[Name->Buffer[i]]; - } - IntName.Length = Name->Length; - IntName.MaximumLength = Name->MaximumLength; - } - } - else - { - IntExpression.Length = Expression->Length; - IntExpression.MaximumLength = Expression->MaximumLength; - IntExpression.Buffer = Expression->Buffer; - IntName.Length = Name->Length; - IntName.MaximumLength = Name->MaximumLength; - IntName.Buffer = Name->Buffer; - } - - for (i = 0 ; i < IntExpression.Length / sizeof(WCHAR) ; i++) - { - if ((IntExpression.Buffer[i] == IntName.Buffer[k]) || (IntExpression.Buffer[i] == '?') || - (IntExpression.Buffer[i] == ANSI_DOS_QM) || - (IntExpression.Buffer[i] == ANSI_DOS_DOT && (IntName.Buffer[k] == '.' || IntName.Buffer[k] == '0'))) - { - k++; - } - else if (IntExpression.Buffer[i] == '*') - { - k = IntName.Length / sizeof(WCHAR); - } - else if (IntExpression.Buffer[i] == ANSI_DOS_STAR) - { - for (j = k ; j < IntName.Length / sizeof(WCHAR) ; j++) - { - if (IntName.Buffer[j] == '.') + if (Name->Buffer[j] == '.') { k = j; - break; } } } @@ -325,7 +305,7 @@ { k = 0; } - if (k == IntName.Length / sizeof(WCHAR)) + if (k == Name->Length / sizeof(WCHAR)) { return TRUE; }

1 0

[janderwald] 35840: - Fix resource
by janderwald＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: janderwald Date: Sun Aug 31 13:09:35 2008 New Revision: 35840 URL: http://svn.reactos.org/svn/reactos?rev=35840&view=rev Log: - Fix resource Modified: trunk/reactos/dll/win32/netshell/netshell.rc Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] Sun Aug 31 13:09:35 2008 @@ -6,12 +6,11 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "W32 subsystem kernel\0" +#define REACTOS_STR_FILE_DESCRIPTION "Shell for Network Connections\0" #define REACTOS_STR_INTERNAL_NAME "netshell.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "netshell.dll\0" #define REACTOS_STR_PRODUCT_VERSION "5.1.2600.3264\0" #define REACTOS_STR_FILE_VERSION "5.1.2600.3264\0" -#define REACTOS_STR_COMPANY_NAME "Microsoft Corporation" #include <reactos/version.rc>

1 0

[janderwald] 35838: - Add INetCfgLock interface - Add NCRP flags
by janderwald＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: janderwald Date: Sun Aug 31 13:01:36 2008 New Revision: 35838 URL: http://svn.reactos.org/svn/reactos?rev=35838&view=rev Log: - Add INetCfgLock interface - Add NCRP flags Modified: trunk/reactos/include/psdk/netcfgx.h Modified: trunk/reactos/include/psdk/netcfgx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcfgx.h?rev… ============================================================================== --- trunk/reactos/include/psdk/netcfgx.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/netcfgx.h [iso-8859-1] Sun Aug 31 13:01:36 2008 @@ -1,5 +1,37 @@ #ifndef __NETCFGX_H__ #define __NETCFGX_H__ + +#undef INTERFACE +#define INTERFACE INetCfgLock +DECLARE_INTERFACE_(INetCfgLock, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,AcquireWriteLock)(THIS_ DWORD cmsTimeout, LPCWSTR pszwClientDescription, LPWSTR *ppszwClientDescription) PURE; + STDMETHOD_(HRESULT,ReleaseWriteLock)(THIS) PURE; + STDMETHOD_(HRESULT,IsWriteLocked)(THIS_ LPWSTR *ppszwClientDescription) PURE; +}; +#undef INTERFACE + +EXTERN_C const IID IID_INetCfgLock; + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define INetCfgLock_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetCfgLock_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetCfgLock_Release(p) (p)->lpVtbl->Release(p) +#define INetCfgLock_AcquireWriteLock(p,a,b,c) (p)->lpVtbl->AcquireWriteLock(p,a,b,c) +#define INetCfgLock_ReleaseWriteLock(p) (p)->lpVtbl->ReleaseWriteLock(p) +#define INetCfgLock_IsWriteLocked(p,a) (p)->lpVtbl->IsWriteLocked(p,a) +#endif + +typedef enum +{ + NCRP_QUERY_PROPERTY_UI = 1, + NCRP_SHOW_PROPERTY_UI = 2 +}NCRP_FLAGS; + #undef INTERFACE #define INTERFACE INetCfgComponent @@ -39,7 +71,7 @@ #define INetCfgComponent_GetBindName(p,a) (p)->lpVtbl->GetBindName(p,a) #define INetCfgComponent_GetDeviceStatus(p,a) (p)->lpVtbl->GetDeviceStatus(p,a) #define INetCfgComponent_OpenParamKey(p,a) (p)->lpVtbl->OpenParamKey(p,a) -#define INetCfgComponent_RaisePropertyUi(p,a,b,c) (p)->lpVtbl->OpenParamKey(p,a,b,c) +#define INetCfgComponent_RaisePropertyUi(p,a,b,c) (p)->lpVtbl->RaisePropertyUi(p,a,b,c) #endif #undef INTERFACE

1 0

[fireball] 35836: - Fix two major problems in CmpCleanUpKcbCacheWithLock: * Accessing (reading and writing - corruption!) freed paged pool memory. * Lacking a dereference of a parent key. - Fix a typo in the comment ("reference" -> "dereference").
by fireball＠svn.reactos.org 31 Aug '08

31 Aug '08

Author: fireball Date: Sun Aug 31 11:24:29 2008 New Revision: 35836 URL: http://svn.reactos.org/svn/reactos?rev=35836&view=rev Log: - Fix two major problems in CmpCleanUpKcbCacheWithLock: * Accessing (reading and writing - corruption!) freed paged pool memory. * Lacking a dereference of a parent key. - Fix a typo in the comment ("reference" -> "dereference"). Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c 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] Sun Aug 31 11:24:29 2008 @@ -483,7 +483,7 @@ /* Cleanup the value cache */ CmpCleanUpKcbValueCache(Kcb); - /* Reference the NCB */ + /* Dereference the NCB */ CmpDereferenceNameControlBlockWithLock(Kcb->NameBlock); /* Check if we have an index hint block and free it */ @@ -492,10 +492,10 @@ /* Check if we were already deleted */ Parent = Kcb->ParentKcb; if (!Kcb->Delete) CmpRemoveKeyControlBlock(Kcb); - + /* Set invalid KCB signature */ Kcb->Signature = CM_KCB_INVALID_SIGNATURE; - + /* Free the KCB as well */ CmpFreeKeyControlBlock(Kcb); @@ -504,8 +504,8 @@ { /* Dereference the parent */ LockHeldExclusively ? - CmpDereferenceKeyControlBlockWithLock(Kcb,LockHeldExclusively) : - CmpDelayDerefKeyControlBlock(Kcb); + CmpDereferenceKeyControlBlockWithLock(Parent,LockHeldExclusively) : + CmpDelayDerefKeyControlBlock(Parent); } }

1 0

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 August 2008