Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[cgutman] 43297: - Remove the STATUS_PENDING case in UnlockAndMaybeComplete so we can catch pending IRPs which didn't get queued in the PendingIrpList
by cgutman＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: cgutman Date: Mon Oct 5 04:31:16 2009 New Revision: 43297 URL: http://svn.reactos.org/svn/reactos?rev=43297&view=rev Log: - Remove the STATUS_PENDING case in UnlockAndMaybeComplete so we can catch pending IRPs which didn't get queued in the PendingIrpList Modified: trunk/reactos/drivers/network/afd/afd/lock.c Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Mon Oct 5 04:31:16 2009 @@ -290,22 +290,12 @@ NTSTATUS NTAPI UnlockAndMaybeComplete ( PAFD_FCB FCB, NTSTATUS Status, PIRP Irp, UINT Information ) { - Irp->IoStatus.Status = Status; Irp->IoStatus.Information = Information; - - if( Status == STATUS_PENDING ) { - /* We should firstly mark this IRP as pending, because - otherwise it may be completed by StreamSocketConnectComplete() - before we return from SocketStateUnlock(). */ - IoMarkIrpPending( Irp ); - SocketStateUnlock( FCB ); - } else { - if ( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); - (void)IoSetCancelRoutine(Irp, NULL); - SocketStateUnlock( FCB ); - IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - } + if ( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); + (void)IoSetCancelRoutine(Irp, NULL); + SocketStateUnlock( FCB ); + IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); return Status; } @@ -325,5 +315,6 @@ &Irp->Tail.Overlay.ListEntry ); IoMarkIrpPending(Irp); (void)IoSetCancelRoutine(Irp, AfdCancelHandler); - return UnlockAndMaybeComplete( FCB, STATUS_PENDING, Irp, 0 ); -} + SocketStateUnlock( FCB ); + return STATUS_PENDING; +}

1 0

[cgutman] 43296: - Cancel pending user IRPs when we get a IRP_MJ_CLEANUP request - Previously there was some confusion between IRPs in PendingIrpList and InFlightRequest, InFlightRequest IRPs go from AFD to a TDI transport driver (tcpip) which are sent on behalf of AFD and are cancelled upon socket destruction (IRP_MJ_CLOSE) vs. IRPs in the PendingIrpList which go from user-mode to AFD which are sent of behalf of the user and should be cancelled when handling IRP_MJ_CLEANUP
by cgutman＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: cgutman Date: Mon Oct 5 03:44:17 2009 New Revision: 43296 URL: http://svn.reactos.org/svn/reactos?rev=43296&view=rev Log: - Cancel pending user IRPs when we get a IRP_MJ_CLEANUP request - Previously there was some confusion between IRPs in PendingIrpList and InFlightRequest, InFlightRequest IRPs go from AFD to a TDI transport driver (tcpip) which are sent on behalf of AFD and are cancelled upon socket destruction (IRP_MJ_CLOSE) vs. IRPs in the PendingIrpList which go from user-mode to AFD which are sent of behalf of the user and should be cancelled when handling IRP_MJ_CLEANUP Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Mon Oct 5 03:44:17 2009 @@ -172,6 +172,38 @@ } static NTSTATUS NTAPI +AfdCleanupSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_FCB FCB = FileObject->FsContext; + PLIST_ENTRY CurrentEntry, NextEntry; + UINT Function; + PIRP CurrentIrp; + + if( !SocketAcquireStateLock( FCB ) ) return LostSocket(Irp); + + for (Function = 0; Function < MAX_FUNCTIONS; Function++) + { + CurrentEntry = FCB->PendingIrpList[Function].Flink; + while (CurrentEntry != &FCB->PendingIrpList[Function]) + { + NextEntry = CurrentEntry->Flink; + CurrentIrp = CONTAINING_RECORD(CurrentEntry, IRP, Tail.Overlay.ListEntry); + + /* The cancel routine will remove the IRP from the list */ + IoCancelIrp(CurrentIrp); + + CurrentEntry = NextEntry; + } + } + + KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); + + return UnlockAndMaybeComplete(FCB, STATUS_SUCCESS, Irp, 0); +} + +static NTSTATUS NTAPI AfdCloseSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp) { @@ -346,6 +378,9 @@ case IRP_MJ_CLOSE: /* Ditto the borrowing */ return AfdCloseSocket(DeviceObject, Irp, IrpSp); + + case IRP_MJ_CLEANUP: + return AfdCleanupSocket(DeviceObject, Irp, IrpSp); /* write data */ case IRP_MJ_WRITE: @@ -626,6 +661,7 @@ /* register driver routines */ DriverObject->MajorFunction[IRP_MJ_CLOSE] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_CREATE] = AfdDispatch; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_READ] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = AfdDispatch;

1 0

[dgorbachev] 43295: Add "#pragma code_page(...)" again to fix compilation.
by dgorbachev＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: dgorbachev Date: Mon Oct 5 00:40:01 2009 New Revision: 43295 URL: http://svn.reactos.org/svn/reactos?rev=43295&view=rev Log: Add "#pragma code_page(...)" again to fix compilation. Modified: trunk/reactos/dll/win32/kernel32/lang/de-DE.rc trunk/reactos/dll/win32/kernel32/lang/en-US.rc trunk/reactos/dll/win32/kernel32/lang/es-ES.rc trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/kernel32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/de-DE.rc [iso-8859-1] Mon Oct 5 00:40:01 2009 @@ -1,3 +1,5 @@ +#pragma code_page(1252) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/kernel32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/en-US.rc [iso-8859-1] Mon Oct 5 00:40:01 2009 @@ -1,3 +1,5 @@ +#pragma code_page(1252) + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/kernel32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/es… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/es-ES.rc [iso-8859-1] Mon Oct 5 00:40:01 2009 @@ -1,3 +1,5 @@ +#pragma code_page(1252) + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc [iso-8859-1] Mon Oct 5 00:40:01 2009 @@ -1,3 +1,5 @@ +#pragma code_page(1251) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE

1 0

[dreimer] 43294: Update German NLS Files in Kernel32
by dreimer＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: dreimer Date: Mon Oct 5 00:32:07 2009 New Revision: 43294 URL: http://svn.reactos.org/svn/reactos?rev=43294&view=rev Log: Update German NLS Files in Kernel32 Modified: trunk/reactos/dll/win32/kernel32/nls/dea.nls trunk/reactos/dll/win32/kernel32/nls/dec.nls trunk/reactos/dll/win32/kernel32/nls/del.nls trunk/reactos/dll/win32/kernel32/nls/des.nls trunk/reactos/dll/win32/kernel32/nls/deu.nls Modified: trunk/reactos/dll/win32/kernel32/nls/dea.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/dea… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/dea.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/dea.nls [iso-8859-1] Mon Oct 5 00:32:07 2009 @@ -141,14 +141,14 @@ LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkisch" + LGRPID_TURKISH+LGRPID_RES_BASE "Türkisch" LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebräisch" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" LGRPID_INDIC+LGRPID_RES_BASE "Indisch" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" Modified: trunk/reactos/dll/win32/kernel32/nls/dec.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/dec… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/dec.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/dec.nls [iso-8859-1] Mon Oct 5 00:32:07 2009 @@ -141,14 +141,14 @@ LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkisch" + LGRPID_TURKISH+LGRPID_RES_BASE "Türkisch" LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebräisch" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" LGRPID_INDIC+LGRPID_RES_BASE "Indisch" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" Modified: trunk/reactos/dll/win32/kernel32/nls/del.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/del… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/del.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/del.nls [iso-8859-1] Mon Oct 5 00:32:07 2009 @@ -141,14 +141,14 @@ LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkisch" + LGRPID_TURKISH+LGRPID_RES_BASE "Türkisch" LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebräisch" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" LGRPID_INDIC+LGRPID_RES_BASE "Indisch" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" Modified: trunk/reactos/dll/win32/kernel32/nls/des.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/des… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/des.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/des.nls [iso-8859-1] Mon Oct 5 00:32:07 2009 @@ -141,14 +141,14 @@ LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkisch" + LGRPID_TURKISH+LGRPID_RES_BASE "Türkisch" LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebräisch" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" LGRPID_INDIC+LGRPID_RES_BASE "Indisch" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" Modified: trunk/reactos/dll/win32/kernel32/nls/deu.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/deu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/deu.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/deu.nls [iso-8859-1] Mon Oct 5 00:32:07 2009 @@ -141,7 +141,7 @@ LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkisch" + LGRPID_TURKISH+LGRPID_RES_BASE "Türkisch" LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)"

1 0

[dgorbachev] 43293: Add Spanish translation of Kernel32, fix translation of ServMan. Javier Remacha, bug #4872.
by dgorbachev＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: dgorbachev Date: Mon Oct 5 00:03:21 2009 New Revision: 43293 URL: http://svn.reactos.org/svn/reactos?rev=43293&view=rev Log: Add Spanish translation of Kernel32, fix translation of ServMan. Javier Remacha, bug #4872. Added: trunk/reactos/dll/win32/kernel32/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/kernel32/lang/de-DE.rc trunk/reactos/dll/win32/kernel32/lang/en-US.rc trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1] Mon Oct 5 00:03:21 2009 @@ -148,15 +148,15 @@ END IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148 -CAPTION "Stop Other Services" +CAPTION "Detener otros servicios" FONT 8, "MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL - LTEXT "Do you want to stop these services?",IDC_STATIC, 15, 110, 150, 10 - DEFPUSHBUTTON "Yes", IDOK, 60, 129, 54, 14 + LTEXT "¿Desea detener estos servicios?",IDC_STATIC, 15, 110, 150, 10 + DEFPUSHBUTTON "Si", IDOK, 60, 129, 54, 14 PUSHBUTTON "No", IDCANCEL, 120, 129, 54, 14 END Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Mon Oct 5 00:03:21 2009 @@ -10,4 +10,5 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/dll/win32/kernel32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/de-DE.rc [iso-8859-1] Mon Oct 5 00:03:21 2009 @@ -1,5 +1,3 @@ -#pragma code_page(1252) - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/kernel32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/en-US.rc [iso-8859-1] Mon Oct 5 00:03:21 2009 @@ -1,5 +1,3 @@ -#pragma code_page(1252) - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE Added: trunk/reactos/dll/win32/kernel32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/es… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/es-ES.rc (added) +++ trunk/reactos/dll/win32/kernel32/lang/es-ES.rc [iso-8859-1] Mon Oct 5 00:03:21 2009 @@ -1,0 +1,161 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + /* Names of code pages */ + 1250 "1250 (ANSI - Europa Central)" + 1251 "1251 (ANSI - Cirílico)" + 1252 "1252 (ANSI - Latín I)" + 1253 "1253 (ANSI - Griego)" + 1254 "1254 (ANSI - Turco)" + 1255 "1255 (ANSI - Hebreo)" + 1256 "1256 (ANSI - Árabe)" + 1257 "1257 (ANSI - Báltico)" + 1258 "1258 (ANSI/OEM - VietNam)" + 874 "874 (ANSI/OEM - Tailandés)" + 932 "932 (ANSI/OEM - Japonés Shift-JIS)" + 936 "936 (ANSI/OEM - Chino simplificado GBK)" + 949 "949 (ANSI/OEM - Coreano)" + 950 "950 (ANSI/OEM - Chino tradicional Big5)" + + 437 "437 (OEM - Estados Unidos)" + 737 "737 (OEM - Griego 437G)" + 775 "775 (OEM - Báltico)" + 850 "850 (OEM - Latín I multilíngüe)" + 852 "852 (OEM - Latín II)" + 855 "855 (OEM - Cirílico)" + 857 "857 (OEM - Turco)" + 858 "858 (OEM - Latín I multilíngüe + Euro)" + 860 "860 (OEM - Portugués)" + 861 "861 (OEM - Islandés)" + 862 "862 (OEM - Hebreo)" + 863 "863 (OEM - Francés canadiense)" + 864 "864 (OEM - Árabe)" + 865 "865 (OEM - Nórdico)" + 866 "866 (OEM - Ruso)" + 869 "869 (OEM - Griego moderno)" + + 10000 "10000 (MAC - Romano)" + 10001 "10001 (MAC - Japonés)" + 10002 "10002 (MAC - Chino tradicional Big5)" + 10003 "10003 (MAC - Coreano)" + 10004 "10004 (MAC - Árabe)" + 10005 "10005 (MAC - Hebreo)" + 10006 "10006 (MAC - Griego I)" + 10007 "10007 (MAC - Cyirílico)" + 10008 "10008 (MAC - Chino simplificado GB 2312)" + 10010 "10010 (MAC - Rumania)" + 10017 "10017 (MAC - Ucrania)" + 10021 "10021 (MAC - Tailandés)" + 10029 "10029 (MAC - Latín II)" + 10079 "10079 (MAC - Islandés)" + 10081 "10081 (MAC - Turco)" + 10082 "10082 (MAC - Croacia)" + + 65000 "65000 (UTF-7)" + 65001 "65001 (UTF-8)" + + 3700 "37 (IBM EBCDIC - E.E.U.U y Canadá)" /* FIXME */ + 1026 "1026 (IBM EBCDIC - Turquía (Latin-5))" + 1047 "1047 (IBM EBCDIC - Latin-1 y sistema abierto)" + 1140 "1140 (IBM EBCDIC - E.E.U.U/Canadá (37 + Euro))" + 1141 "1141 (IBM EBCDIC - Alemania (20273 + Euro))" + 1142 "1142 (IBM EBCDIC - Dinamarca y Noruega (20277 + Euro))" + 1143 "1143 (IBM EBCDIC - Finlandia y Suecia(20278 + Euro))" + 1144 "1144 (IBM EBCDIC - Italia (20280 + Euro))" + 1145 "1145 (IBM EBCDIC - Latinoamérica y España (20284 + Euro))" + 1146 "1146 (IBM EBCDIC - Reino Unido (20285 + Euro))" + 1147 "1147 (IBM EBCDIC - Francia (20297 + Euro))" + 1148 "1148 (IBM EBCDIC - Internacional (500 + Euro))" + 1149 "1149 (IBM EBCDIC - Islandia (20871 + Euro))" + 20273 "20273 (IBM EBCDIC - Alemania)" + 20277 "20277 (IBM EBCDIC - Dinamarca/Noruega)" + 20278 "20278 (IBM EBCDIC - Finlandia/Suecia)" + 20280 "20280 (IBM EBCDIC - Italia)" + 20284 "20284 (IBM EBCDIC - Latinoamérica/España)" + 20285 "20285 (IBM EBCDIC - Reino Unido)" + 20290 "20290 (IBM EBCDIC - Katakana japonés extendido)" + 20297 "20297 (IBM EBCDIC - Francia)" + 20420 "20420 (IBM EBCDIC - Árabe)" + 20423 "20423 (IBM EBCDIC - Griego)" + 20424 "20424 (IBM EBCDIC - Hebreo)" + 20833 "20833 (IBM EBCDIC - Coreano extendido)" + 20838 "20838 (IBM EBCDIC - Tailandés)" + 20871 "20871 (IBM EBCDIC - Islandés)" + 20880 "20880 (IBM EBCDIC - Cirílico (Ruso))" + 20905 "20905 (IBM EBCDIC - Turco)" + 20924 "20924 (IBM EBCDIC - Latín-1 y sistema abierto (1047 + Euro))" + 21025 "21025 (IBM EBCDIC - Cirílico (Serbio, Búlgaro))" + 500 "500 (IBM EBCDIC - Internacional)" + 870 "870 (IBM EBCDIC - Multilíngüe/ROECE (Latín-2))" + 875 "875 (IBM EBCDIC - Griego moderno)" + + 20269 "20269 (ISO 6937 Acento sin espacio)" + 28591 "28591 (ISO 8859-1 Latín I)" + 28592 "28592 (ISO 8859-2 Europa Central)" + 28593 "28593 (ISO 8859-3 Latín 3)" + 28594 "28594 (ISO 8859-4 Báltico)" + 28595 "28595 (ISO 8859-5 Cirílico)" + 28596 "28596 (ISO 8859-6 Árabe)" + 28597 "28597 (ISO 8859-7 Griego)" + 28598 "28598 (ISO 8859-8 Hebreo: orden visual)" + 28599 "28599 (ISO 8859-9 Latín 5)" + 28605 "28605 (ISO 8859-15 Latín 9)" + 38598 "38598 (ISO 8859-8 Hebreo: orden lógico)" + + 20105 "20105 (IA5 IRV Alfabeto international No.5)" + 20106 "20106 (IA5 Alemán)" + 20107 "20107 (IA5 Sueco)" + 20108 "20108 (IA5 Noruego)" + + 1361 "1361 (Coreano - Johab)" + 20000 "20000 (CNS - Taiwán)" + 20001 "20001 (TCA - Taiwán)" + 20002 "20002 (Eten - Taiwán)" + 20003 "20003 (IBM5550 - Taiwán)" + 20004 "20004 (TeleText - Taiwán)" + 20005 "20005 (Wang - Taiwán)" + 20127 "20127 (E.E.U.U.-ASCII)" + 20261 "20261 (T.61)" + 20866 "20866 (Ruso - KOI8)" + 21027 "21027 (Alfabeto extendido minúsculas)" + 21866 "21866 (Ucraniano - KOI8-U)" + 708 "708 (Árabe - ASMO)" + 720 "720 (Árabe - Transparente ASMO)" + 20932 "20932 (JIS X 0208-1990 & 0212-1990)" + 20936 "20936 (Chino simplificado GB2312)" + 20949 "20949 (Korean Wansung)" + + 57002 "57002 (ISCII Devanagari)" + 57003 "57003 (ISCII Bengali)" + 57004 "57004 (ISCII Tamil)" + 57005 "57005 (ISCII Telugu)" + 57006 "57006 (ISCII Assamese)" + 57007 "57007 (ISCII Oriya)" + 57008 "57008 (ISCII Kannada)" + 57009 "57009 (ISCII Malayalam)" + 57010 "57010 (ISCII Gujarati)" + 57011 "57011 (ISCII Gurmukhi)" + + 50930 "50930 (IBM EBCDIC - Japonés (Katakana) extendido y Japonés)" + 50931 "50931 (IBM EBCDIC - E.E.U.U/Canadá y Japonés)" + 50933 "50933 (IBM EBCDIC - Coreano extendido y Coreano)" + 50935 "50935 (IBM EBCDIC - Chino simplificado)" + 50937 "50937 (IBM EBCDIC - E.E.U.U/Canadá y Chino tradicional)" + 50939 "50939 (IBM EBCDIC - Japonés (Latín) extendido y Japonés)" + + 50220 "50220 (ISO-2022 Japonés sin Katakana de ancho medio)" + 50221 "50221 (ISO-2022 Japonés con Katakana de ancho medio)" + 50222 "50222 (ISO-2022 Japonés JIS X 0201-1989)" + 50225 "50225 (ISO-2022 Coreano)" + 50227 "50227 (ISO-2022 Chino simplificado)" + 50229 "50229 (ISO-2022 Chino tradicional)" + + 51932 "51932 (EUC-Japonés)" + 51936 "51936 (EUC-Chino simplificado)" + 51949 "51949 (EUC-Coreano)" + 51950 "51950 (EUC-Chino tradicional)" + + 52936 "52936 (HZ-GB2312 Chino simplificado)" + 54936 "54936 (GB18030 Chino simplificado)" +END Propchange: trunk/reactos/dll/win32/kernel32/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc [iso-8859-1] Mon Oct 5 00:03:21 2009 @@ -1,5 +1,3 @@ -#pragma code_page(1251) - LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE

1 0

[mkupfer] 43292: temporarily workaround for swap mouse buttons feature
by mkupfer＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: mkupfer Date: Sun Oct 4 22:45:51 2009 New Revision: 43292 URL: http://svn.reactos.org/svn/reactos?rev=43292&view=rev Log: temporarily workaround for swap mouse buttons feature Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Oct 4 22:45:51 2009 @@ -1120,7 +1120,8 @@ mi->time = MsqCalculateMessageTime(&LargeTickCount); } - SwapButtons = CurInfo->SwapButtons; + // FIXME: CurInfo->SwapButtons doesn't contain the correct value yet + SwapButtons = UserGetSystemMetrics(SM_SWAPBUTTON);//CurInfo->SwapButtons; DoMove = FALSE; IntGetCursorLocation(WinSta, &MousePos);

1 0

[sginsberg] 43291: - Add STATUS_ASSERTION_FAILURE status code required for NT_ASSERT. - Check KdReceivePacket return for KdPacketReceived instead of 0 for correctness. - Use KdpDprintf instead of setting CR2 for unhandled cases. - Add more variables to KdDebuggerDataBlock.
by sginsberg＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: sginsberg Date: Sun Oct 4 22:19:43 2009 New Revision: 43291 URL: http://svn.reactos.org/svn/reactos?rev=43291&view=rev Log: - Add STATUS_ASSERTION_FAILURE status code required for NT_ASSERT. - Check KdReceivePacket return for KdPacketReceived instead of 0 for correctness. - Use KdpDprintf instead of setting CR2 for unhandled cases. - Add more variables to KdDebuggerDataBlock. Modified: trunk/reactos/include/reactos/windbgkd.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/kd64/kdlock.c trunk/reactos/ntoskrnl/kd64/kdprint.c trunk/reactos/ntoskrnl/kd64/kdtrap.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/windbgkd.h… ============================================================================== --- trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -178,7 +178,7 @@ // Fill Memory Flags // #define DBGKD_FILL_MEMORY_VIRTUAL 0x01 -#define DBGKD_FILL_MEMORY_PHYSICAL 0x002 +#define DBGKD_FILL_MEMORY_PHYSICAL 0x02 // // Physical Memory Caching Flags 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] Sun Oct 4 22:19:43 2009 @@ -14,13 +14,14 @@ extern ULONG MmTotalNonPagedPoolQuota; extern PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; extern ULONG MmNumberOfPhysicalPages; +extern ULONG MmLowestPhysicalPage; +extern ULONG MmHighestPhysicalPage; extern PVOID MmPagedPoolBase; extern ULONG MmPagedPoolSize; extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; extern MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; -extern ULONG MmHighestPhysicalPage; struct _KTRAP_FRAME; struct _EPROCESS; Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -282,7 +282,8 @@ #if 0 if (!MmIsAddressValid((PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress)) { - Ke386SetCr2(State->u.ReadMemory.TargetBaseAddress); + KdpDprintf("Tried to read invalid address %p\n", + (PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress); while (TRUE); } #endif @@ -484,6 +485,7 @@ else { /* SMP not yet handled */ + KdpDprintf("SMP UNHANDLED\n"); ControlStart = NULL; while (TRUE); } @@ -534,6 +536,7 @@ else { /* SMP not yet handled */ + KdpDprintf("SMP UNHANDLED\n"); ControlStart = NULL; while (TRUE); } @@ -620,7 +623,7 @@ case DbgKdWriteVirtualMemoryApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteVirtualMemoryApi); + KdpDprintf("DbgKdWriteVirtualMemoryApi called\n"); while (TRUE); break; @@ -668,14 +671,14 @@ case DbgKdReadIoSpaceApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdReadIoSpaceApi); + KdpDprintf("DbgKdReadIoSpaceApi called\n"); while (TRUE); break; case DbgKdWriteIoSpaceApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteIoSpaceApi); + KdpDprintf("DbgKdWriteIoSpaceApi called\n"); while (TRUE); break; @@ -704,64 +707,65 @@ case DbgKdReadPhysicalMemoryApi: /* FIXME: TODO */ - goto fail; - Ke386SetCr2(DbgKdReadPhysicalMemoryApi); + KdpDprintf("DbgKdReadPhysicalMemoryApi called for address %I64X\n", + ManipulateState.u.ReadMemory.TargetBaseAddress); + goto Hack; while (TRUE); break; case DbgKdWritePhysicalMemoryApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWritePhysicalMemoryApi); + KdpDprintf("DbgKdWritePhysicalMemoryApi called\n"); while (TRUE); break; case DbgKdQuerySpecialCallsApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdQuerySpecialCallsApi); + KdpDprintf("DbgKdQuerySpecialCallsApi called\n"); while (TRUE); break; case DbgKdSetSpecialCallApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdSetSpecialCallApi); + KdpDprintf("DbgKdSetSpecialCallApi called\n"); while (TRUE); break; case DbgKdClearSpecialCallsApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdClearSpecialCallsApi); + KdpDprintf("DbgKdClearSpecialCallsApi called\n"); while (TRUE); break; case DbgKdSetInternalBreakPointApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdSetInternalBreakPointApi); + KdpDprintf("DbgKdSetInternalBreakPointApi called\n"); while (TRUE); break; case DbgKdGetInternalBreakPointApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdGetInternalBreakPointApi); + KdpDprintf("DbgKdGetInternalBreakPointApi called\n"); while (TRUE); break; case DbgKdReadIoSpaceExtendedApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdReadIoSpaceExtendedApi); + KdpDprintf("DbgKdReadIoSpaceExtendedApi called\n"); while (TRUE); break; case DbgKdWriteIoSpaceExtendedApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteIoSpaceExtendedApi); + KdpDprintf("DbgKdWriteIoSpaceExtendedApi called\n"); while (TRUE); break; @@ -774,14 +778,14 @@ case DbgKdWriteBreakPointExApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteBreakPointExApi); + KdpDprintf("DbgKdWriteBreakPointExApi called\n"); while (TRUE); break; case DbgKdRestoreBreakPointExApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdRestoreBreakPointExApi); + KdpDprintf("DbgKdRestoreBreakPointExApi called\n"); while (TRUE); break; @@ -794,70 +798,70 @@ case DbgKdSwitchProcessor: /* FIXME: TODO */ - Ke386SetCr2(DbgKdSwitchProcessor); + KdpDprintf("DbgKdSwitchProcessor called\n"); while (TRUE); break; case DbgKdPageInApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdPageInApi); + KdpDprintf("DbgKdPageInApi called\n"); while (TRUE); break; case DbgKdReadMachineSpecificRegister: /* FIXME: TODO */ - Ke386SetCr2(DbgKdReadMachineSpecificRegister); + KdpDprintf("DbgKdReadMachineSpecificRegister called\n"); while (TRUE); break; case DbgKdWriteMachineSpecificRegister: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteMachineSpecificRegister); + KdpDprintf("DbgKdWriteMachineSpecificRegister called\n"); while (TRUE); break; case OldVlm1: /* FIXME: TODO */ - Ke386SetCr2(OldVlm1); + KdpDprintf("OldVlm1 called\n"); while (TRUE); break; case OldVlm2: /* FIXME: TODO */ - Ke386SetCr2(OldVlm2); + KdpDprintf("OldVlm2 called\n"); while (TRUE); break; case DbgKdSearchMemoryApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdSearchMemoryApi); + KdpDprintf("DbgKdSearchMemoryApi called\n"); while (TRUE); break; case DbgKdGetBusDataApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdGetBusDataApi); + KdpDprintf("DbgKdGetBusDataApi called\n"); while (TRUE); break; case DbgKdSetBusDataApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdSetBusDataApi); + KdpDprintf("DbgKdSetBusDataApi called\n"); while (TRUE); break; case DbgKdCheckLowMemoryApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdCheckLowMemoryApi); + KdpDprintf("DbgKdCheckLowMemoryApi called\n"); while (TRUE); break; @@ -870,7 +874,7 @@ case DbgKdFillMemoryApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdFillMemoryApi); + KdpDprintf("DbgKdFillMemoryApi called\n"); while (TRUE); break; @@ -883,7 +887,7 @@ case DbgKdSwitchPartition: /* FIXME: TODO */ - Ke386SetCr2(DbgKdSwitchPartition); + KdpDprintf("DbgKdSwitchPartition called\n"); while (TRUE); break; @@ -891,8 +895,9 @@ default: /* Setup an empty message, with failure */ - while (TRUE); -fail: + KdpDprintf("Received unknown API Number %lx\n", ManipulateState.ApiNumber); + while (TRUE); +Hack: Data.Length = 0; ManipulateState.ReturnStatus = STATUS_UNSUCCESSFUL; @@ -1247,6 +1252,7 @@ KdEnableDebugger(VOID) { /* Use the internal routine */ + KdpDprintf("KdEnableDebugger called\n"); while (TRUE); return KdEnableDebuggerWithLock(TRUE); } Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> +#include "../mm/arm3/miarm.h" #define NDEBUG #include <debug.h> @@ -51,7 +52,7 @@ #if defined(_M_IX86) || defined(_M_AMD64) ULONG KdpBreakpointInstruction = 0xCC; // INT3 #else -#error TODO +#error Define the breakpoint instruction for this architecture #endif BOOLEAN KdpOweBreakpoint; BOOLEAN BreakpointsSuspended; @@ -367,23 +368,23 @@ {0}, // MmSystemCacheStart {0}, // MmSystemCacheEnd {0}, // MmSystemCacheWs - {0}, // MmPfnDatabase - {0}, // MmSystemPtesStart - {0}, // MmSystemPtesEnd + {PtrToUlong(&MmPfnDatabase)}, + {PtrToUlong(MmSystemPtesStart)}, + {PtrToUlong(MmSystemPtesEnd)}, {0}, // MmSubsectionBase {0}, // MmNumberOfPagingFiles - {0}, // MmLowestPhysicalPage - {0}, // MmHighestPhysicalPage - {0}, // MmNumberOfPhysicalPages - {0}, // MmMaximumNonPagedPoolInBytes - {0}, // MmNonPagedSystemStart - {0}, // MmNonPagedPoolStart - {0}, // MmNonPagedPoolEnd - {0}, // MmPagedPoolStart - {0}, // MmPagedPoolEnd - {0}, // MmPagedPoolInfo + {PtrToUlong(&MmLowestPhysicalPage)}, + {PtrToUlong(&MmHighestPhysicalPage)}, + {PtrToUlong(&MmNumberOfPhysicalPages)}, + {PtrToUlong(&MmMaximumNonPagedPoolInBytes)}, + {PtrToUlong(&MmNonPagedSystemStart)}, + {PtrToUlong(&MmNonPagedPoolStart)}, + {PtrToUlong(&MmNonPagedPoolEnd)}, + {PtrToUlong(&MmPagedPoolStart)}, + {PtrToUlong(&MmPagedPoolEnd)}, + {PtrToUlong(&MmPagedPoolInfo)}, PAGE_SIZE, - {0}, // MmSizeOfPagedPoolInBytes + {PtrToUlong(&MmSizeOfPagedPoolInBytes)}, {0}, // MmTotalCommitLimit {0}, // MmTotalCommittedPages {0}, // MmSharedCommit @@ -399,7 +400,7 @@ {0}, // MmAvailablePages {0}, // MmResidentAvailablePages {0}, // PoolTrackTable - {0}, // NonPagedPoolDescriptor + {PtrToUlong(&NonPagedPoolDescriptor)}, {PtrToUlong(&MmHighestUserAddress)}, {PtrToUlong(&MmSystemRangeStart)}, {PtrToUlong(&MmUserProbeAddress)}, @@ -421,9 +422,9 @@ {0}, // MmPeakCommitment {0}, // MmtotalCommitLimitMaximum {PtrToUlong(&CmNtCSDVersion)}, - {0}, // MmPhysicalMemoryBlock - {0}, // MmSessionBase - {0}, // MmSessionSize + {PtrToUlong(&MmPhysicalMemoryBlock)}, + {PtrToUlong(&MmSessionBase)}, + {PtrToUlong(&MmSessionSize)}, {0}, {0}, FIELD_OFFSET(KTHREAD, NextProcessor), @@ -471,6 +472,6 @@ KGDT_TSS, 0, 0, - {0}, // IopNumTriagDumpDataBlocks + {0}, // IopNumTriageDumpDataBlocks {0}, // IopTriageDumpDataBlocks }; Modified: trunk/reactos/ntoskrnl/kd64/kdlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -49,11 +49,11 @@ else { /* Now get a packet */ - if (!KdReceivePacket(PACKET_TYPE_KD_POLL_BREAKIN, + if (KdReceivePacket(PACKET_TYPE_KD_POLL_BREAKIN, NULL, NULL, NULL, - NULL)) + NULL) == KdPacketReceived) { /* Successful breakin */ DoBreak = TRUE; @@ -96,11 +96,11 @@ if (KeTryToAcquireSpinLockAtDpcLevel(&KdpDebuggerLock)) { /* Now get a packet */ - if (!KdReceivePacket(PACKET_TYPE_KD_POLL_BREAKIN, + if (KdReceivePacket(PACKET_TYPE_KD_POLL_BREAKIN, NULL, NULL, NULL, - NULL)) + NULL) == KdPacketReceived) { /* Successful breakin */ DoBreak = TRUE; Modified: trunk/reactos/ntoskrnl/kd64/kdprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdprint.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -61,6 +61,7 @@ IN PKEXCEPTION_FRAME ExceptionFrame) { /* FIXME */ + KdpDprintf("KdpCommandString called\n"); while (TRUE); } @@ -118,6 +119,7 @@ IN PKEXCEPTION_FRAME ExceptionFrame) { /* FIXME */ + KdpDprintf("KdpPrompt called\n"); while (TRUE); return FALSE; } Modified: trunk/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdtrap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -30,7 +30,7 @@ /* Check if this is INT1 or 3, or if we're forced to handle it */ if ((ExceptionCode == STATUS_BREAKPOINT) || (ExceptionCode == STATUS_SINGLE_STEP) || - //(ExceptionCode == STATUS_ASSERTION_FAILURE) || + (ExceptionCode == STATUS_ASSERTION_FAILURE) || (NtGlobalFlag & FLG_STOP_ON_EXCEPTION)) { /* Check if we can't really handle this */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -83,6 +83,8 @@ C_ASSERT(sizeof(POOL_HEADER) == 8); C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY)); +extern POOL_DESCRIPTOR NonPagedPoolDescriptor; + // // END FIXFIX // @@ -119,9 +121,15 @@ extern ULONG MmSizeOfNonPagedPoolInBytes; extern ULONG MmMaximumNonPagedPoolInBytes; +extern PVOID MmNonPagedSystemStart; extern PVOID MmNonPagedPoolStart; extern PVOID MmNonPagedPoolExpansionStart; extern PVOID MmNonPagedPoolEnd; +extern ULONG MmSizeOfPagedPoolInBytes; +extern PVOID MmPagedPoolStart; +extern PVOID MmPagedPoolEnd; +extern PVOID MmSessionBase; +extern ULONG MmSessionSize; extern PMMPTE MmFirstReservedMappingPte, MmLastReservedMappingPte; extern PMMPTE MiFirstReservedZeroingPte; extern MI_PFN_CACHE_ATTRIBUTE MiPlatformCacheAttributes[2][MmMaximumCacheType];

1 0

[janderwald] 43290: - Return correct status code
by janderwald＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: janderwald Date: Sun Oct 4 22:14:09 2009 New Revision: 43290 URL: http://svn.reactos.org/svn/reactos?rev=43290&view=rev Log: - Return correct status code Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Sun Oct 4 22:14:09 2009 @@ -1953,7 +1953,7 @@ Status = SetGetMuteControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, DeviceInfo, FALSE); } - return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); - -} - + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); + +} +

1 0

[janderwald] 43289: - Implement Un-Muting of audio lines - TBD: SEH probing
by janderwald＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: janderwald Date: Sun Oct 4 21:45:16 2009 New Revision: 43289 URL: http://svn.reactos.org/svn/reactos?rev=43289&view=rev Log: - Implement Un-Muting of audio lines - TBD: SEH probing Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Sun Oct 4 21:45:16 2009 @@ -22,6 +22,7 @@ const GUID KSNODETYPE_REVERB = {0xEF0328E0L, 0xC558, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; const GUID KSNODETYPE_SUPERMIX = {0xE573ADC0L, 0xC555, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; const GUID KSNODETYPE_SUM = {0xDA441A60L, 0xC556, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSPROPSETID_Audio = {0x45FFAAA0L, 0x6E1B, 0x11D0, {0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}; #define DESTINATION_LINE 0xFFFF0000 @@ -48,6 +49,43 @@ return NULL; } + +NTSTATUS +GetMixerControlById( + LPMIXER_INFO MixerInfo, + DWORD dwControlID, + LPMIXERLINE_EXT *MixerLine, + LPMIXERCONTROLW *MixerControl, + PULONG NodeId) +{ + PLIST_ENTRY Entry; + LPMIXERLINE_EXT MixerLineSrc; + ULONG Index; + + /* get first entry */ + Entry = MixerInfo->LineList.Flink; + + while(Entry != &MixerInfo->LineList) + { + MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); + + for(Index = 0; Index < MixerLineSrc->Line.cConnections; Index++) + { + if (MixerLineSrc->LineControls[Index].dwControlID == dwControlID) + { + *MixerLine = MixerLineSrc; + *MixerControl = &MixerLineSrc->LineControls[Index]; + *NodeId = MixerLineSrc->NodeIds[Index]; + return STATUS_SUCCESS; + } + } + Entry = Entry->Flink; + } + + return STATUS_NOT_FOUND; +} + + LPMIXERLINE_EXT GetSourceMixerLineByLineId( @@ -1760,6 +1798,74 @@ } NTSTATUS +SetGetMuteControlDetails( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG DeviceId, + IN ULONG NodeId, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN ULONG bSet) +{ + KSNODEPROPERTY_AUDIO_CHANNEL Property; + NTSTATUS Status; + HANDLE hDevice; + PFILE_OBJECT FileObject; + BOOL Value; + ULONG BytesReturned; + LPMIXERCONTROLDETAILS_BOOLEAN Input; + + if (DeviceInfo->u.MixDetails.cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) + return STATUS_INVALID_PARAMETER; + + /* get input */ + Input = (LPMIXERCONTROLDETAILS_BOOLEAN)DeviceInfo->u.MixDetails.paDetails; + + + // + // FIXME SEH!!! + // + if (bSet) + Value = Input->fValue; + + /* open virtual audio device */ + Status = OpenSysAudioDeviceByIndex(DeviceObject, DeviceId, &hDevice, &FileObject); + + if (!NT_SUCCESS(Status)) + { + /* failed */ + return Status; + } + + /* setup the request */ + RtlZeroMemory(&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL)); + + Property.NodeProperty.NodeId = NodeId; + Property.NodeProperty.Property.Id = KSPROPERTY_AUDIO_MUTE; + Property.NodeProperty.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY; + Property.NodeProperty.Property.Set = KSPROPSETID_Audio; + Property.Channel = MAXULONG; + + if (bSet) + Property.NodeProperty.Property.Flags |= KSPROPERTY_TYPE_SET; + else + Property.NodeProperty.Property.Flags |= KSPROPERTY_TYPE_GET; + + /* send the request */ + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), (PVOID)&Value, sizeof(BOOL), &BytesReturned); + + ObDereferenceObject(FileObject); + ZwClose(hDevice); + + if (!bSet) + { + // FIXME SEH !!! + Input->fValue = Value; + } + + DPRINT("Status %x bSet %u NodeId %u Value %u\n", Status, bSet, NodeId, Value); + return Status; +} + +NTSTATUS NTAPI WdmAudSetControlDetails( IN PDEVICE_OBJECT DeviceObject, @@ -1767,9 +1873,41 @@ IN PWDMAUD_DEVICE_INFO DeviceInfo, IN PWDMAUD_CLIENT ClientInfo) { - UNIMPLEMENTED; - //DbgBreakPoint(); - return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); + LPMIXERLINE_EXT MixerLine; + LPMIXERCONTROLW MixerControl; + ULONG NodeId; + PWDMAUD_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + DPRINT1("cbStruct %u Expected %u dwControlID %u cChannels %u cMultipleItems %u cbDetails %u paDetails %p Flags %x\n", + DeviceInfo->u.MixDetails.cbStruct, sizeof(MIXERCONTROLDETAILS), DeviceInfo->u.MixDetails.dwControlID, DeviceInfo->u.MixDetails.cChannels, DeviceInfo->u.MixDetails.cMultipleItems, DeviceInfo->u.MixDetails.cbDetails, DeviceInfo->u.MixDetails.paDetails, DeviceInfo->Flags); + + if (DeviceInfo->Flags & MIXER_GETCONTROLDETAILSF_LISTTEXT) + { + UNIMPLEMENTED; + return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); + } + + /* get device extension */ + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get mixer control */ + Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixDetails.dwControlID, &MixerLine, &MixerControl, &NodeId); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("MixerControl %x not found\n", DeviceInfo->u.MixDetails.dwControlID); + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + Status = STATUS_NOT_IMPLEMENTED; + if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) + { + /* send the request */ + Status = SetGetMuteControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, DeviceInfo, TRUE); + } + + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); } @@ -1781,8 +1919,40 @@ IN PWDMAUD_DEVICE_INFO DeviceInfo, IN PWDMAUD_CLIENT ClientInfo) { - UNIMPLEMENTED; - //DbgBreakPoint(); + LPMIXERLINE_EXT MixerLine; + LPMIXERCONTROLW MixerControl; + ULONG NodeId; + PWDMAUD_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + DPRINT1("cbStruct %u Expected %u dwControlID %u cChannels %u cMultipleItems %u cbDetails %u paDetails %p Flags %x\n", + DeviceInfo->u.MixDetails.cbStruct, sizeof(MIXERCONTROLDETAILS), DeviceInfo->u.MixDetails.dwControlID, DeviceInfo->u.MixDetails.cChannels, DeviceInfo->u.MixDetails.cMultipleItems, DeviceInfo->u.MixDetails.cbDetails, DeviceInfo->u.MixDetails.paDetails, DeviceInfo->Flags); + + if (DeviceInfo->Flags & MIXER_GETCONTROLDETAILSF_LISTTEXT) + { + UNIMPLEMENTED; + return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); + } + + /* get device extension */ + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get mixer control */ + Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixDetails.dwControlID, &MixerLine, &MixerControl, &NodeId); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("MixerControl %x not found\n", DeviceInfo->u.MixDetails.dwControlID); + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + Status = STATUS_NOT_IMPLEMENTED; + if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) + { + /* send the request */ + Status = SetGetMuteControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, DeviceInfo, FALSE); + } + return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); }

1 0

[mkupfer] 43288: - remove double entry in inf - load mouse settings - TODO: mouse settings doesn't work properly, but read and set works
by mkupfer＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: mkupfer Date: Sun Oct 4 21:28:52 2009 New Revision: 43288 URL: http://svn.reactos.org/svn/reactos?rev=43288&view=rev Log: - remove double entry in inf - load mouse settings - TODO: mouse settings doesn't work properly, but read and set works Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Sun Oct 4 21:28:52 2009 @@ -23,7 +23,6 @@ HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" HKCU,"Control Panel\Desktop","FontSmoothing",2,"0" -HKCU,"Control Panel\Desktop","DragFullWindows",2,"0" HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00 HKCU,"Control Panel\Desktop","UserPreferenceMask",3,10,00,00,80 HKCU,"Control Panel\Desktop","LowPowerActive",,"0" Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Sun Oct 4 21:28:52 2009 @@ -216,30 +216,31 @@ /* Load desktop settings */ gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); + /* Load mouse settings */ + gspv.bMouseBtnSwap = SpiLoadInt(KEY_MOUSE, VAL_SWAP, 0); + gspv.iMouseSpeed = SpiLoadInt(KEY_MOUSE, VAL_MOUSE3, 1); + gspv.iDblClickTime = SpiLoadInt(KEY_MOUSE, VAL_DBLCLKTIME, 500); + gspv.iDblClickWidth = SpiLoadInt(KEY_MOUSE, VAL_DBLCLKWIDTH, 4); + gspv.iDblClickHeight = SpiLoadInt(KEY_MOUSE, VAL_DBLCLKHEIGHT, 4); + /* Some hardcoded values for now */ + gspv.iMouseHoverTime = 80; + gspv.iMouseHoverWidth = 4; + gspv.iMouseHoverHeight = 4; + gspv.iWheelScrollLines = 3; +#if (_WIN32_WINNT >= 0x0600) + gspv.uiWheelScrollChars = 1; +#endif + gspv.tmCaptionFont.tmAveCharWidth = 6; gspv.bBeep = TRUE; gspv.bFlatMenu = FALSE; - gspv.iDblClickTime = 500; gspv.uiFocusBorderWidth = 1; gspv.uiFocusBorderHeight = 1; gspv.bMenuDropAlign = 1; gspv.bDropShadow = 1; gspv.dwUserPrefMask = UPM_DEFAULT; gspv.dwMenuShowDelay = 100; - - gspv.bMouseBtnSwap = FALSE; - gspv.iMouseSpeed = 10; - gspv.iMouseHoverTime = 80; - gspv.iMouseHoverWidth = 4; - gspv.iMouseHoverHeight = 4; - gspv.iDblClickTime = 500; - gspv.iDblClickWidth = 4; - gspv.iDblClickHeight = 4; - gspv.iWheelScrollLines = 3; -#if (_WIN32_WINNT >= 0x0600) - gspv.uiWheelScrollChars = 1; -#endif gspv.iScrSaverTimeout = 10; gspv.bScrSaverActive = FALSE;

1 0

← Newer
1
...
57
58
59
60
61
62
63
64
65
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 October 2009