Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[sginsberg] 36640: - Register all Win32 callouts/procedures (just stubs for now though)
by sginsberg＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: sginsberg Date: Sat Oct 4 05:16:39 2008 New Revision: 36640 URL: http://svn.reactos.org/svn/reactos?rev=36640&view=rev Log: - Register all Win32 callouts/procedures (just stubs for now though) Modified: branches/nwin32/subsystems/win32/win32k/gre/init.c Modified: branches/nwin32/subsystems/win32/win32k/gre/init.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/gre/init.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/gre/init.c [iso-8859-1] Sat Oct 4 05:16:39 2008 @@ -20,7 +20,73 @@ NTSTATUS APIENTRY -Win32kWinStaObjectParse(PWIN32_PARSEMETHOD_PARAMETERS Parameters) +Win32kProcessCallout(PEPROCESS Process, + BOOLEAN Create) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS +APIENTRY +Win32kThreadCallout(PETHREAD Thread, + PSW32THREADCALLOUTTYPE Type) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS +APIENTRY +Win32kGlobalAtomTableCallout(VOID) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS +APIENTRY +Win32kPowerEventCallout(PWIN32_POWEREVENT_PARAMETERS Parameters) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS +APIENTRY +Win32kPowerStateCallout(PWIN32_POWERSTATE_PARAMETERS Parameters) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS +APIENTRY +Win32kJobCallout(PWIN32_JOBCALLOUT_PARAMETERS Parameters) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS +APIENTRY +Win32kDesktopOpenProcedure(PWIN32_OPENMETHOD_PARAMETERS Parameters) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS +APIENTRY +Win32kDesktopOkToCloseProcedure(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS +APIENTRY +Win32kDesktopCloseProcedure(PWIN32_CLOSEMETHOD_PARAMETERS Parameters) { UNIMPLEMENTED; return STATUS_SUCCESS; @@ -28,23 +94,14 @@ VOID APIENTRY -Win32kWinStaObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters) +Win32kDesktopDeleteProcedure(PWIN32_DELETEMETHOD_PARAMETERS Parameters) { UNIMPLEMENTED; } -VOID -APIENTRY -Win32kDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters) -{ - UNIMPLEMENTED; -} - - NTSTATUS APIENTRY -Win32kProcessCallback(struct _EPROCESS *Process, - BOOLEAN Create) +Win32kWindowStationOkToCloseProcedure(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters) { UNIMPLEMENTED; return STATUS_SUCCESS; @@ -52,8 +109,40 @@ NTSTATUS APIENTRY -Win32kThreadCallback(struct _ETHREAD *Thread, - PSW32THREADCALLOUTTYPE Type) +Win32kWindowStationCloseProcedure(PWIN32_CLOSEMETHOD_PARAMETERS Parameters) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +VOID +APIENTRY +Win32kWindowStationDeleteProcedure(PWIN32_DELETEMETHOD_PARAMETERS Parameters) +{ + UNIMPLEMENTED; +} + +NTSTATUS +APIENTRY +Win32kWindowStationParseProcedure(PWIN32_PARSEMETHOD_PARAMETERS Parameters) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS +APIENTRY +Win32kWindowStationOpenProcedure(PWIN32_OPENMETHOD_PARAMETERS Parameters) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +NTSTATUS +APIENTRY +Win32kWin32DataCollectionProcedure(PEPROCESS Process, + PVOID Callback, + PVOID Context) { UNIMPLEMENTED; return STATUS_SUCCESS; @@ -66,7 +155,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { - WIN32_CALLOUTS_FPNS CalloutData = {0}; + WIN32_CALLOUTS_FPNS CalloutData; DPRINT1("Win32k initialization: DO %p, RegPath %wZ\n", DriverObject, RegistryPath); @@ -82,15 +171,27 @@ return STATUS_UNSUCCESSFUL; } - /* Register Win32 callouts */ - CalloutData.WindowStationParseProcedure = Win32kWinStaObjectParse; - CalloutData.WindowStationDeleteProcedure = Win32kWinStaObjectDelete; - CalloutData.DesktopDeleteProcedure = Win32kDesktopObjectDelete; - CalloutData.ProcessCallout = Win32kProcessCallback; - CalloutData.ThreadCallout = Win32kThreadCallback; + /* Set up Win32 callouts */ + CalloutData.ProcessCallout = Win32kProcessCallout; + CalloutData.ThreadCallout = Win32kThreadCallout; + CalloutData.GlobalAtomTableCallout = Win32kGlobalAtomTableCallout; + CalloutData.PowerEventCallout = Win32kPowerEventCallout; + CalloutData.PowerStateCallout = Win32kPowerStateCallout; + CalloutData.JobCallout = Win32kJobCallout; CalloutData.BatchFlushRoutine = NtGdiFlushUserBatch; + CalloutData.DesktopOpenProcedure = Win32kDesktopOpenProcedure; + CalloutData.DesktopOkToCloseProcedure = Win32kDesktopOkToCloseProcedure; + CalloutData.DesktopCloseProcedure = Win32kDesktopCloseProcedure; + CalloutData.DesktopDeleteProcedure = Win32kDesktopDeleteProcedure; + CalloutData.WindowStationOkToCloseProcedure = Win32kWindowStationOkToCloseProcedure; + CalloutData.WindowStationCloseProcedure = Win32kWindowStationCloseProcedure; + CalloutData.WindowStationDeleteProcedure = Win32kWindowStationDeleteProcedure; + CalloutData.WindowStationParseProcedure = Win32kWindowStationParseProcedure; + CalloutData.WindowStationOpenProcedure = Win32kWindowStationOpenProcedure; + CalloutData.Win32DataCollectionProcedure = Win32kWin32DataCollectionProcedure; - PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData); + /* Register them */ + PsEstablishWin32Callouts(&CalloutData); return STATUS_SUCCESS; }

1 0

[cfinck] 36639: - Set "lake.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop
by cfinck＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: cfinck Date: Sat Oct 4 03:39:49 2008 New Revision: 36639 URL: http://svn.reactos.org/svn/reactos?rev=36639&view=rev Log: - Set "lake.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop Modified: branches/ros-branch-0_3_7/reactos/boot/bootdata/hivedef_i386.inf branches/ros-branch-0_3_7/reactos/dll/win32/syssetup/install.c Modified: branches/ros-branch-0_3_7/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_7/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Sat Oct 4 03:39:49 2008 @@ -20,7 +20,7 @@ HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\lake.bmp" HKCU,"Control Panel\International",,0x00000012 HKCU,"Control Panel\International","Locale",0x00000000,"0409" HKCU,"Control Panel\International\Geo","Nation",0x00000000,"1" Modified: branches/ros-branch-0_3_7/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_7/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sat Oct 4 03:39:49 2008 @@ -756,6 +756,7 @@ /* Create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\downloader.exe"), IDS_CMT_DOWNLOADER, TRUE); /* Create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE);

1 0

[cfinck] 36638: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases
by cfinck＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: cfinck Date: Sat Oct 4 03:36:18 2008 New Revision: 36638 URL: http://svn.reactos.org/svn/reactos?rev=36638&view=rev Log: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases Modified: branches/ros-branch-0_3_7/reactos/base/applications/mstsc/connectdialog.c Modified: branches/ros-branch-0_3_7/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_7/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Sat Oct 4 03:36:18 2008 @@ -198,19 +198,12 @@ static VOID -GeneralOnInit(HWND hwnd, - PINFO pInfo) -{ - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hGeneralPage = hwnd; - +GeneralOnInit(PINFO pInfo) +{ SetWindowPos(pInfo->hGeneralPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -256,13 +249,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - GeneralOnInit(hDlg, (PINFO)lParam); + pInfo->hGeneralPage = hDlg; + GeneralOnInit(pInfo); return TRUE; case WM_COMMAND: @@ -746,23 +740,16 @@ static VOID -DisplayOnInit(HWND hwnd, - PINFO pInfo) +DisplayOnInit(PINFO pInfo) { DISPLAY_DEVICEW displayDevice; DWORD iDevNum = 0; BOOL GotDev = FALSE; - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hDisplayPage = hwnd; - SetWindowPos(pInfo->hDisplayPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -836,13 +823,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - DisplayOnInit(hDlg, (PINFO)lParam); + pInfo->hDisplayPage = hDlg; + DisplayOnInit(pInfo); return TRUE; case WM_DRAWITEM: @@ -986,11 +974,10 @@ pInfo->hTab = GetDlgItem(hwnd, IDC_TAB); if (pInfo->hTab) { - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_GENERAL), - pInfo->hTab, - (DLGPROC)GeneralDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_GENERAL), + hwnd, + (DLGPROC)GeneralDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM)); @@ -1001,11 +988,10 @@ (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item); } - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_DISPLAY), - pInfo->hTab, - (DLGPROC)DisplayDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_DISPLAY), + hwnd, + (DLGPROC)DisplayDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM));

1 0

[cfinck] 36637: Change the version to 0.3.7 (also in the Explorer start menu bitmap)
by cfinck＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: cfinck Date: Sat Oct 4 03:34:30 2008 New Revision: 36637 URL: http://svn.reactos.org/svn/reactos?rev=36637&view=rev Log: Change the version to 0.3.7 (also in the Explorer start menu bitmap) Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_7/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/base/s… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_7/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_7/reactos/include/reactos/version.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/include/reactos/version.h [iso-8859-1] Sat Oct 4 03:34:30 2008 @@ -18,13 +18,13 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 7 #define COPYRIGHT_YEAR "2008" /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"" #endif

1 0

[cfinck] 36636: Branch for the 0.3.7 release
by cfinck＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: cfinck Date: Sat Oct 4 03:15:10 2008 New Revision: 36636 URL: http://svn.reactos.org/svn/reactos?rev=36636&view=rev Log: Branch for the 0.3.7 release Added: branches/ros-branch-0_3_7/ - copied from r36635, trunk/

1 0

[cgutman] 36635: - Send NDIS_STATUS_RESET_START to all bound protocols before we reset - Send NDIS_STATUS_RESET_END to all bound protocols after we reset - Set MiniportBusy to TRUE if the MiniportReset handler returned NDIS_STATUS_PENDING
by cgutman＠svn.reactos.org 03 Oct '08

03 Oct '08

Author: cgutman Date: Fri Oct 3 16:44:12 2008 New Revision: 36635 URL: http://svn.reactos.org/svn/reactos?rev=36635&view=rev Log: - Send NDIS_STATUS_RESET_START to all bound protocols before we reset - Send NDIS_STATUS_RESET_END to all bound protocols after we reset - Set MiniportBusy to TRUE if the MiniportReset handler returned NDIS_STATUS_PENDING Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Oct 3 16:44:12 2008 @@ -298,7 +298,13 @@ IN NDIS_STATUS Status, IN BOOLEAN AddressingReset) { - UNIMPLEMENTED + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + KIRQL OldIrql; + NDIS_DbgPrint(MIN_TRACE, ("FIXME: MiniResetComplete is partially implemented\n")); + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -631,11 +637,23 @@ return NDIS_STATUS_PENDING; } + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); + NdisMIndicateStatusComplete(Adapter); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, AddressingReset); KeLowerIrql(OldIrql); + + if (Status != NDIS_STATUS_PENDING) { + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); + NdisMIndicateStatusComplete(Adapter); + } else { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + Adapter->MiniportBusy = TRUE; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + } return Status; } @@ -953,6 +971,9 @@ break; case NdisWorkItemResetRequested: + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); + NdisMIndicateStatusComplete(Adapter); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext,

1 0

[fireball] 36426: [FORMATTING] - Reformat to the kernel coding style.
by fireball＠svn.reactos.org 03 Oct '08

03 Oct '08

Author: fireball Date: Tue Sep 23 06:45:40 2008 New Revision: 36426 URL: http://svn.reactos.org/svn/reactos?rev=36426&view=rev Log: [FORMATTING] - Reformat to the kernel coding style. Modified: trunk/reactos/subsystems/win32/csrss/video.c Modified: trunk/reactos/subsystems/win32/csrss/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/vid… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/video.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/video.c [iso-8859-1] Tue Sep 23 06:45:40 2008 @@ -1,115 +1,117 @@ -/* $Id$ - * - * ReactOS Project +/* + * PROJECT: ReactOS Client/Server Runtime subsystem + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: subsystems/win32/csrss/video.c + * PURPOSE: Video memory initialization. + * PROGRAMMERS: ReactOS Development Team */ + +/* INCLUDES ******************************************************************/ #include <csrss.h> #define NDEBUG #include <debug.h> +/* FUNCTIONS *****************************************************************/ + ULONG InitializeVideoAddressSpace(VOID) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); - NTSTATUS Status; - HANDLE PhysMemHandle; - PVOID BaseAddress; - PVOID NullAddress; - LARGE_INTEGER Offset; - ULONG ViewSize; - CHAR IVTAndBda[1024+256]; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); + NTSTATUS Status; + HANDLE PhysMemHandle; + PVOID BaseAddress; + PVOID NullAddress; + LARGE_INTEGER Offset; + ULONG ViewSize; + CHAR IVTAndBda[1024+256]; - /* - * Open the physical memory section - */ - InitializeObjectAttributes(&ObjectAttributes, - &PhysMemName, - 0, - NULL, - NULL); - Status = ZwOpenSection(&PhysMemHandle, SECTION_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Couldn't open \\Device\\PhysicalMemory\n"); - return(0); - } + /* Open the physical memory section */ + InitializeObjectAttributes(&ObjectAttributes, + &PhysMemName, + 0, + NULL, + NULL); + Status = ZwOpenSection(&PhysMemHandle, + SECTION_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't open \\Device\\PhysicalMemory\n"); + return 0; + } - /* - * Map the BIOS and device registers into the address space - */ - Offset.QuadPart = 0xa0000; - ViewSize = 0x100000 - 0xa0000; - BaseAddress = (PVOID)0xa0000; - Status = NtMapViewOfSection(PhysMemHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - 8192, - &Offset, - &ViewSize, - ViewUnmap, - 0, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Couldn't map physical memory (%x)\n", Status); - NtClose(PhysMemHandle); - return(0); - } - NtClose(PhysMemHandle); - if (BaseAddress != (PVOID)0xa0000) - { - DbgPrint("Couldn't map physical memory at the right address " - "(was %x)\n", BaseAddress); - return(0); - } + /* Map the BIOS and device registers into the address space */ + Offset.QuadPart = 0xa0000; + ViewSize = 0x100000 - 0xa0000; + BaseAddress = (PVOID)0xa0000; + Status = NtMapViewOfSection(PhysMemHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + 8192, + &Offset, + &ViewSize, + ViewUnmap, + 0, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't map physical memory (%x)\n", Status); + NtClose(PhysMemHandle); + return 0; + } - /* - * Map some memory to use for the non-BIOS parts of the v86 mode address - * space - */ - BaseAddress = (PVOID)0x1; - ViewSize = 0xa0000 - 0x1000; - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &BaseAddress, - 0, - &ViewSize, - MEM_COMMIT, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Failed to allocate virtual memory (Status %x)\n", Status); - return(0); - } - if (BaseAddress != (PVOID)0x0) - { - DbgPrint("Failed to allocate virtual memory at right address " - "(was %x)\n", BaseAddress); - return(0); - } + /* Close physical memory section handle */ + NtClose(PhysMemHandle); - /* - * Get the real mode IVT and BDA from the kernel - */ - Status = NtVdmControl(VdmInitialize, IVTAndBda); + if (BaseAddress != (PVOID)0xa0000) + { + DPRINT1("Couldn't map physical memory at the right address " + "(was %x)\n", BaseAddress); + return 0; + } + + /* Map some memory to use for the non-BIOS parts of + * the v86 mode address space + */ + BaseAddress = (PVOID)0x1; + ViewSize = 0xa0000 - 0x1000; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_COMMIT, + PAGE_EXECUTE_READWRITE); if (!NT_SUCCESS(Status)) - { - DbgPrint("NtVdmControl failed (status %x)\n", Status); - return(0); - } + { + DPRINT1("Failed to allocate virtual memory (Status %x)\n", Status); + return 0; + } + if (BaseAddress != (PVOID)0x0) + { + DPRINT1("Failed to allocate virtual memory at right address " + "(was %x)\n", BaseAddress); + return 0; + } - /* - * Copy the IVT and BDA into the right place - */ - NullAddress = (PVOID)0x0; /* Workaround for GCC 3.4 */ - memcpy(NullAddress, IVTAndBda, 1024); - memcpy((PVOID)0x400, &IVTAndBda[1024], 256); + /* Get the real mode IVT and BDA from the kernel */ + Status = NtVdmControl(VdmInitialize, IVTAndBda); + if (!NT_SUCCESS(Status)) + { + DbgPrint("NtVdmControl failed (status %x)\n", Status); + return 0; + } - return(1); + /* Copy the IVT and BDA into the right place */ + NullAddress = (PVOID)0x0; /* Workaround for GCC 3.4 */ + memcpy(NullAddress, IVTAndBda, 1024); + memcpy((PVOID)0x400, &IVTAndBda[1024], 256); + + /* Return success */ + return 1; } - /* EOF */

3 2

[cgutman] 36634: - Merge aicom-network-fixes up to r36633 - tcpip's ProtocolStatus routine now gets called if a media status change occurs - This would fix a problem in which tcpip doesn't recognize the disconnect of an adapter but the ProtocolStatus handler in tcpip isn't implemented yet so the bug remains
by cgutman＠svn.reactos.org 03 Oct '08

03 Oct '08

Author: cgutman Date: Fri Oct 3 13:51:33 2008 New Revision: 36634 URL: http://svn.reactos.org/svn/reactos?rev=36634&view=rev Log: - Merge aicom-network-fixes up to r36633 - tcpip's ProtocolStatus routine now gets called if a media status change occurs - This would fix a problem in which tcpip doesn't recognize the disconnect of an adapter but the ProtocolStatus handler in tcpip isn't implemented yet so the bug remains Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Oct 3 13:51:33 2008 @@ -1052,7 +1052,29 @@ IN PVOID StatusBuffer, IN UINT StatusBufferSize) { - UNIMPLEMENTED + PLOGICAL_ADAPTER Adapter = MiniportHandle; + PLIST_ENTRY CurrentEntry; + PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + CurrentEntry = Adapter->ProtocolListHead.Flink; + + while (CurrentEntry != &Adapter->ProtocolListHead) + { + AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); + + (*AdapterBinding->ProtocolBinding->Chars.StatusHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + GeneralStatus, + StatusBuffer, + StatusBufferSize); + + CurrentEntry = CurrentEntry->Flink; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -1061,7 +1083,26 @@ MiniStatusComplete( IN NDIS_HANDLE MiniportAdapterHandle) { - UNIMPLEMENTED + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + PLIST_ENTRY CurrentEntry; + PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + CurrentEntry = Adapter->ProtocolListHead.Flink; + + while (CurrentEntry != &Adapter->ProtocolListHead) + { + AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); + + (*AdapterBinding->ProtocolBinding->Chars.StatusCompleteHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext); + + CurrentEntry = CurrentEntry->Flink; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -1126,7 +1167,7 @@ } /* - * @unimplemented + * @implemented */ #undef NdisMIndicateStatus VOID @@ -1137,11 +1178,11 @@ IN PVOID StatusBuffer, IN UINT StatusBufferSize) { - UNIMPLEMENTED -} - -/* - * @unimplemented + MiniStatus(MiniportAdapterHandle, GeneralStatus, StatusBuffer, StatusBufferSize); +} + +/* + * @implemented */ #undef NdisMIndicateStatusComplete VOID @@ -1149,7 +1190,7 @@ NdisMIndicateStatusComplete( IN NDIS_HANDLE MiniportAdapterHandle) { - UNIMPLEMENTED + MiniStatusComplete(MiniportAdapterHandle); }

1 0

[cgutman] 36633: - Move the implementation of NdisMIndicateStatus to MiniStatus and call it from NdisMIndicateStatus - Move the implementation of NdisMIndicateStatusComplete to MiniStatusComplete and call it from NdisMIndicateStatusComplete
by cgutman＠svn.reactos.org 03 Oct '08

03 Oct '08

Author: cgutman Date: Fri Oct 3 13:38:40 2008 New Revision: 36633 URL: http://svn.reactos.org/svn/reactos?rev=36633&view=rev Log: - Move the implementation of NdisMIndicateStatus to MiniStatus and call it from NdisMIndicateStatus - Move the implementation of NdisMIndicateStatusComplete to MiniStatusComplete and call it from NdisMIndicateStatusComplete Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Oct 3 13:38:40 2008 @@ -1052,7 +1052,29 @@ IN PVOID StatusBuffer, IN UINT StatusBufferSize) { - UNIMPLEMENTED + PLOGICAL_ADAPTER Adapter = MiniportHandle; + PLIST_ENTRY CurrentEntry; + PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + CurrentEntry = Adapter->ProtocolListHead.Flink; + + while (CurrentEntry != &Adapter->ProtocolListHead) + { + AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); + + (*AdapterBinding->ProtocolBinding->Chars.StatusHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + GeneralStatus, + StatusBuffer, + StatusBufferSize); + + CurrentEntry = CurrentEntry->Flink; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -1061,7 +1083,26 @@ MiniStatusComplete( IN NDIS_HANDLE MiniportAdapterHandle) { - UNIMPLEMENTED + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + PLIST_ENTRY CurrentEntry; + PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + CurrentEntry = Adapter->ProtocolListHead.Flink; + + while (CurrentEntry != &Adapter->ProtocolListHead) + { + AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); + + (*AdapterBinding->ProtocolBinding->Chars.StatusCompleteHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext); + + CurrentEntry = CurrentEntry->Flink; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -1137,29 +1178,7 @@ IN PVOID StatusBuffer, IN UINT StatusBufferSize) { - PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; - PLIST_ENTRY CurrentEntry; - PADAPTER_BINDING AdapterBinding; - KIRQL OldIrql; - - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - - CurrentEntry = Adapter->ProtocolListHead.Flink; - - while (CurrentEntry != &Adapter->ProtocolListHead) - { - AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); - - (*AdapterBinding->ProtocolBinding->Chars.StatusHandler)( - AdapterBinding->NdisOpenBlock.ProtocolBindingContext, - GeneralStatus, - StatusBuffer, - StatusBufferSize); - - CurrentEntry = CurrentEntry->Flink; - } - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + MiniStatus(MiniportAdapterHandle, GeneralStatus, StatusBuffer, StatusBufferSize); } /* @@ -1171,26 +1190,7 @@ NdisMIndicateStatusComplete( IN NDIS_HANDLE MiniportAdapterHandle) { - PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; - PLIST_ENTRY CurrentEntry; - PADAPTER_BINDING AdapterBinding; - KIRQL OldIrql; - - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - - CurrentEntry = Adapter->ProtocolListHead.Flink; - - while (CurrentEntry != &Adapter->ProtocolListHead) - { - AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); - - (*AdapterBinding->ProtocolBinding->Chars.StatusCompleteHandler)( - AdapterBinding->NdisOpenBlock.ProtocolBindingContext); - - CurrentEntry = CurrentEntry->Flink; - } - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + MiniStatusComplete(MiniportAdapterHandle); }

1 0

[cgutman] 36632: - Implement NdisMIndicateStatusComplete
by cgutman＠svn.reactos.org 03 Oct '08

03 Oct '08

Author: cgutman Date: Fri Oct 3 13:16:43 2008 New Revision: 36632 URL: http://svn.reactos.org/svn/reactos?rev=36632&view=rev Log: - Implement NdisMIndicateStatusComplete Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Oct 3 13:16:43 2008 @@ -1163,7 +1163,7 @@ } /* - * @unimplemented + * @implemented */ #undef NdisMIndicateStatusComplete VOID @@ -1171,7 +1171,26 @@ NdisMIndicateStatusComplete( IN NDIS_HANDLE MiniportAdapterHandle) { - UNIMPLEMENTED + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + PLIST_ENTRY CurrentEntry; + PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + CurrentEntry = Adapter->ProtocolListHead.Flink; + + while (CurrentEntry != &Adapter->ProtocolListHead) + { + AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); + + (*AdapterBinding->ProtocolBinding->Chars.StatusCompleteHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext); + + CurrentEntry = CurrentEntry->Flink; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); }

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