Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 36643: Update some links properly and update the description of Opera (sounds stupid to use the same for Firefox and Opera)
by cfinck＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: cfinck Date: Sat Oct 4 08:00:33 2008 New Revision: 36643 URL: http://svn.reactos.org/svn/reactos?rev=36643&view=rev Log: Update some links properly and update the description of Opera (sounds stupid to use the same for Firefox and Opera) Modified: trunk/rosapps/applications/downloader/downloader.xml Modified: trunk/rosapps/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/downloader/do… ============================================================================== --- trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] Sat Oct 4 08:00:33 2008 @@ -12,13 +12,13 @@ <licence>MPL/GPL/LGPL</licence> <version>2.0.0.17</version> <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-2.0/win…</location> + <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.17/win32…</location> </application> <application name="Opera"> <regname>Opera</regname> <licence>Freeware</licence> <version>9.26</version> - <description>The most popular and one of the best free Web Browsers out there.</description> + <description>The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.</description> <location>http://mirror.nwps.ws/opera/win/926/en/Opera_9.26_Classic_Setup.exe</location> </application> <application name="Thunderbird 1.5"> @@ -26,20 +26,20 @@ <licence>MPL/GPL/LGPL</licence> <version>1.5.0.14</version> <description>The most popular and one of the best free Mail Clients out there.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-1.5…</location> + <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.14/w…</location> </application> <application name="Thunderbird 2.0"> <regname>Mozilla Thunderbird (2.0.0.16)</regname> <licence>MPL/GPL/LGPL</licence> <version>2.0.0.16</version> <description>The most popular and one of the best free Mail Clients out there.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-2.0…</location> + <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.17/w…</location> </application> <application name="SeaMonkey"> <regname>SeaMonkey (1.1.9)</regname> <version>1.1.9</version> <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.9/seamon…</location> + <location>http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.12/seamo…</location> </application> <application name="Mozilla ActiveX Control"> <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname>

1 0

[gedmurphy] 36642: use latest firefox link, from caemyr
by gedmurphy＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: gedmurphy Date: Sat Oct 4 07:09:30 2008 New Revision: 36642 URL: http://svn.reactos.org/svn/reactos?rev=36642&view=rev Log: use latest firefox link, from caemyr Modified: trunk/rosapps/applications/downloader/downloader.xml Modified: trunk/rosapps/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/downloader/do… ============================================================================== --- trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] Sat Oct 4 07:09:30 2008 @@ -8,11 +8,11 @@ <location>http://svn.reactos.org/packages/Firefox%20Setup%201.5.0.12.exe</location> </application> <application name="Firefox 2.0"> - <regname>Mozilla Firefox (2.0.0.16)</regname> + <regname>Mozilla Firefox (2.0.0.17)</regname> <licence>MPL/GPL/LGPL</licence> - <version>2.0.0.16</version> + <version>2.0.0.17</version> <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-2.0/win…</location> + <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-2.0/win…</location> </application> <application name="Opera"> <regname>Opera</regname>

1 0

[jimtabor] 36641: - Update DEVCAPS to W2k/XP.
by jimtabor＠svn.reactos.org 04 Oct '08

04 Oct '08

Author: jimtabor Date: Sat Oct 4 06:18:30 2008 New Revision: 36641 URL: http://svn.reactos.org/svn/reactos?rev=36641&view=rev Log: - Update DEVCAPS to W2k/XP. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sat Oct 4 06:18:30 2008 @@ -280,7 +280,10 @@ ULONG ulDesktopHorzRes; ULONG ulDesktopVertRes; ULONG ulBltAlignment; - ULONG ulReserved[4]; + ULONG ulPanningHorzRes; + ULONG ulPanningVertRes; + ULONG xPanningAlignment; + ULONG yPanningAlignment; ULONG ulShadeBlend; ULONG ulColorMgmtCaps; } DEVCAPS, *PDEVCAPS;

1 0

[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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs