Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 54580: [EVENTLOG] - Open the application log if the desired log does not exist. - Log eventlog service stop and shutdown.
by ekohl＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: ekohl Date: Sun Dec 4 10:53:43 2011 New Revision: 54580 URL: http://svn.reactos.org/svn/reactos?rev=54580&view=rev Log: [EVENTLOG] - Open the application log if the desired log does not exist. - Log eventlog service stop and shutdown. Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Sun Dec 4 10:53:43 2011 @@ -63,6 +63,12 @@ { case SERVICE_CONTROL_STOP: DPRINT(" SERVICE_CONTROL_STOP received\n"); + + LogfReportEvent(EVENTLOG_INFORMATION_TYPE, + 0, + EVENT_EventlogStopped, 0, NULL, 0, NULL); + + /* Stop listening to incoming RPC messages */ RpcMgmtStopServerListening(NULL); UpdateServiceStatus(SERVICE_STOPPED); @@ -86,6 +92,11 @@ case SERVICE_CONTROL_SHUTDOWN: DPRINT(" SERVICE_CONTROL_SHUTDOWN received\n"); + + LogfReportEvent(EVENTLOG_INFORMATION_TYPE, + 0, + EVENT_EventlogStopped, 0, NULL, 0, NULL); + UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sun Dec 4 10:53:43 2011 @@ -103,6 +103,13 @@ lpLogHandle->CurrentRecord = LogfGetOldestRecord(lpLogHandle->LogFile); break; } + } + + /* Use the application log if the desired log does not exist */ + if (lpLogHandle->LogFile == NULL) + { + lpLogHandle->LogFile = LogfListItemByName(L"Application"); + lpLogHandle->CurrentRecord = LogfGetOldestRecord(lpLogHandle->LogFile); } }

1 0

[cgutman] 54579: [NTOSKRNL] - Release the address space lock before entering SEH because an exception would result in recursive acquisition of the address space lock when the fault handler tries to...
by cgutman＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: cgutman Date: Sun Dec 4 08:25:35 2011 New Revision: 54579 URL: http://svn.reactos.org/svn/reactos?rev=54579&view=rev Log: [NTOSKRNL] - Release the address space lock before entering SEH because an exception would result in recursive acquisition of the address space lock when the fault handler tries to grab it Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sun Dec 4 08:25:35 2011 @@ -1004,8 +1004,8 @@ NTSTATUS Status; PEPROCESS Process; PMMSUPPORT AddressSpace; - PVOID BaseAddress, PBaseAddress; - SIZE_T RegionSize, PRegionSize; + PVOID BaseAddress = NULL, PBaseAddress; + SIZE_T RegionSize = 0, PRegionSize; PEPROCESS CurrentProcess = PsGetCurrentProcess(); KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); KAPC_STATE ApcState; @@ -1183,22 +1183,26 @@ goto unlock_deref_and_return; } - /* Enter SEH */ - _SEH2_TRY - { - /* Copy rounded values back in success case */ - *UBaseAddress = BaseAddress; - *URegionSize = RegionSize; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - DPRINT1("Failed to copy values back! (Status: 0x%x)\n", Status); - } - _SEH2_END; - unlock_deref_and_return: MmUnlockAddressSpace(AddressSpace); + + /* Copy rounded values back in success case */ + if (NT_SUCCESS(Status)) + { + /* Enter SEH */ + _SEH2_TRY + { + *UBaseAddress = BaseAddress; + *URegionSize = RegionSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + DPRINT1("Failed to copy values back! (Status: 0x%x)\n", Status); + } + _SEH2_END; + } + if (Attached) KeUnstackDetachProcess(&ApcState); if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process);

1 0

[cgutman] 54578: [NTOSKRNL] - Fix usage of SEH
by cgutman＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: cgutman Date: Sun Dec 4 06:11:47 2011 New Revision: 54578 URL: http://svn.reactos.org/svn/reactos?rev=54578&view=rev Log: [NTOSKRNL] - Fix usage of SEH Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sun Dec 4 06:11:47 2011 @@ -1033,9 +1033,9 @@ /* Check for user-mode parameters */ if (PreviousMode != KernelMode) { - /* Make sure they are readable */ - ProbeForReadPointer(UBaseAddress); - ProbeForReadUlong(URegionSize); + /* Make sure they are writeable */ + ProbeForWritePointer(UBaseAddress); + ProbeForWriteUlong(URegionSize); } /* Capture their values */ @@ -1186,14 +1186,6 @@ /* Enter SEH */ _SEH2_TRY { - /* Check for user-mode parameters */ - if (PreviousMode != KernelMode) - { - /* Make sure they are writable */ - ProbeForWritePointer(UBaseAddress); - ProbeForWriteUlong(URegionSize); - } - /* Copy rounded values back in success case */ *UBaseAddress = BaseAddress; *URegionSize = RegionSize;

1 0

[cgutman] 54577: [NTOSKRNL] - Gracefully fail when there is no more pool space left - Mm already prints plenty of warnings in this case
by cgutman＠svn.reactos.org 03 Dec '11

03 Dec '11

Author: cgutman Date: Sat Dec 3 22:46:15 2011 New Revision: 54577 URL: http://svn.reactos.org/svn/reactos?rev=54577&view=rev Log: [NTOSKRNL] - Gracefully fail when there is no more pool space left - Mm already prints plenty of warnings in this case Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sat Dec 3 22:46:15 2011 @@ -686,7 +686,9 @@ // There were no free entries left, so we have to allocate a new fresh page // Entry = MiAllocatePoolPages(PoolType, PAGE_SIZE); - ASSERT(Entry != NULL); + if (Entry == NULL) + return NULL; + Entry->Ulong1 = 0; Entry->BlockSize = i; Entry->PoolType = PoolType + 1;

1 0

[cgutman] 54576: [AFD] - Fix the allocation size for AFD_ACTIVE_POLL to fix a 1 byte non-paged pool overrun
by cgutman＠svn.reactos.org 03 Dec '11

03 Dec '11

Author: cgutman Date: Sat Dec 3 21:34:49 2011 New Revision: 54576 URL: http://svn.reactos.org/svn/reactos?rev=54576&view=rev Log: [AFD] - Fix the allocation size for AFD_ACTIVE_POLL to fix a 1 byte non-paged pool overrun Modified: trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Sat Dec 3 21:34:49 2011 @@ -163,9 +163,6 @@ PFILE_OBJECT FileObject; PAFD_POLL_INFO PollReq = Irp->AssociatedIrp.SystemBuffer; PAFD_DEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; - UINT CopySize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; - UINT AllocSize = - CopySize + sizeof(AFD_ACTIVE_POLL) - sizeof(AFD_POLL_INFO); KIRQL OldIrql; UINT i, Signalled = 0; ULONG Exclusive = PollReq->Exclusive; @@ -223,7 +220,7 @@ PAFD_ACTIVE_POLL Poll = NULL; - Poll = ExAllocatePool( NonPagedPool, AllocSize ); + Poll = ExAllocatePool( NonPagedPool, sizeof(AFD_ACTIVE_POLL) ); if (Poll){ Poll->Irp = Irp;

1 0

[ekohl] 54575: [BOOTDATA] Remove class2 and scsiport service keys from the registry because these drivers are loaded automatically when they are needed.
by ekohl＠svn.reactos.org 03 Dec '11

03 Dec '11

Author: ekohl Date: Sat Dec 3 21:17:11 2011 New Revision: 54575 URL: http://svn.reactos.org/svn/reactos?rev=54575&view=rev Log: [BOOTDATA] Remove class2 and scsiport service keys from the registry because these drivers are loaded automatically when they are needed. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Sat Dec 3 21:17:11 2011 @@ -981,10 +981,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \ "Boot Bus Extender", \ "System Bus Extender", \ - "SCSI Port", \ "SCSI Miniport", \ "Primary Disk", \ - "SCSI Class Helper", \ "SCSI Class", \ "Boot File System", \ "Base", \ @@ -1149,13 +1147,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Type",0x00010001,0x00000001 -; Class2 driver -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","Group",0x00000000,"SCSI Class Helper" -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","ImagePath",0x00020000,"system32\drivers\class2.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","Type",0x00010001,0x00000001 - ; Debug output driver HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Group",0x00000000,"Debug" @@ -1309,13 +1300,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"%SystemRoot%\system32\rpcss.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Type",0x00010001,0x00000010 - -; Scsiport driver -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Group",0x00000000,"SCSI Port" -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","ImagePath",0x00020000,"system32\drivers\scsiport.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Type",0x00010001,0x00000001 ; Spooler service HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","DependOnService",0x00010000,"RPCSS" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Dec 3 21:17:11 2011 @@ -1080,10 +1080,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \ "Boot Bus Extender", \ "System Bus Extender", \ - "SCSI Port", \ "SCSI Miniport", \ "Primary Disk", \ - "SCSI Class Helper", \ "SCSI Class", \ "Boot File System", \ "Base", \ @@ -1248,13 +1246,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ImagePath",0x00020000,"system32\drivers\cdrom.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Type",0x00010001,0x00000001 - -; Class2 driver -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","Group",0x00000000,"SCSI Class Helper" -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","ImagePath",0x00020000,"system32\drivers\class2.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Class2","Type",0x00010001,0x00000001 ; Debug output driver HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ErrorControl",0x00010001,0x00000000 @@ -1619,13 +1610,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Type",0x00010001,0x00000010 -; Scsiport driver -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Group",0x00000000,"SCSI Port" -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","ImagePath",0x00020000,"system32\drivers\scsiport.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Type",0x00010001,0x00000001 - ; Spooler service HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","DependOnService",0x00010000,"RPCSS" HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","DisplayName",0x00000000,"Printer Spooler" @@ -1777,6 +1761,6 @@ HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000001 ; Debug channels -;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+advapi,+testsvc,+wkssvc" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+ole,+rpc" ; EOF

1 0

[khornicek] 54574: [TRANSLATION] Improved Czech resources.
by khornicek＠svn.reactos.org 03 Dec '11

03 Dec '11

Author: khornicek Date: Sat Dec 3 18:39:11 2011 New Revision: 54574 URL: http://svn.reactos.org/svn/reactos?rev=54574&view=rev Log: [TRANSLATION] Improved Czech resources. Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Sat Dec 3 18:39:11 2011 @@ -11,18 +11,18 @@ CAPTION "Pozadí" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW, + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 80, 0 - CONTROL "", IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 LTEXT "Vyberte obrázek, který chcete pouít jako pozadí", IDC_STATIC, 8, 103, 180, 9 - PUSHBUTTON "&Vybrat...",IDC_BROWSE_BUTTON, 188, 114, 50, 15 - PUSHBUTTON "&Barva...",IDC_COLOR_BUTTON, 188, 177, 50, 15 - LTEXT "Umístìní",IDC_STATIC, 188, 138, 36, 9 + PUSHBUTTON "&Vybrat...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 + PUSHBUTTON "&Barva...", IDC_COLOR_BUTTON, 188, 177, 50, 15 + LTEXT "Umístìní", IDC_STATIC, 188, 138, 36, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 @@ -42,10 +42,10 @@ UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 LTEXT "minut", IDC_MINTEXT, 70, 125, 26, 9 - CONTROL "Chránit &heslem.", IDC_SCREENS_USEPASSCHK, "button", - BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 + CONTROL "Chránit &heslem", IDC_SCREENS_USEPASSCHK, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 GROUPBOX "Napájení monitoru", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 - LTEXT "Pro nastavení napájení Vaeho monitoru, kliknìte na Napájení.", + LTEXT "Pro nastavení napájení Vaeho monitoru, kliknìte na Napájení", IDC_STATIC, 14, 166, 146, 20 PUSHBUTTON "Na&pájení...", IDC_SCREENS_POWER_BUTTON, 165, 171, 61, 13 END @@ -57,11 +57,11 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Visual Style", IDC_STATIC, 7, 130, 64, 7 + LTEXT "Styl", IDC_STATIC, 7, 130, 64, 7 COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Poloka", IDC_STATIC, 7, 160, 64, 7 + LTEXT "Schéma", IDC_STATIC, 7, 160, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "&Efekty...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Upøesnit", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END @@ -132,13 +132,13 @@ CAPTION "Nastavení" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Taením nastavte ikony monitorù, aby odpovídaly fyzickému uspoøádání vaich monitorù.",-1,3,3,240,10 + LTEXT "Taením nastavte ikony monitorù, aby odpovídaly fyzickému uspoøádání vaich monitorù.",-1,3,3,240,20 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,23,240,82,WS_EX_CLIENTEDGE LTEXT "&Obrazovka",1820,3,107,38,8 LTEXT "<není>",IDC_SETTINGS_DEVICE,9,116,224,8 GROUPBOX "&Velikost obrazovky",1818,3,127,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,137,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Mení",1815,9,137,18,8,NOT WS_GROUP LTEXT "Vìtí",1816,93,137,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,157,100,10,NOT WS_GROUP | SS_CENTER @@ -146,7 +146,7 @@ COMBOBOX IDC_SETTINGS_BPP,131,137,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,155,103,9 - PUSHBUTTON "R&ozíøené nastavení...",IDC_SETTINGS_ADVANCED,170,174,70,14 + PUSHBUTTON "&Upøesnit",IDC_SETTINGS_ADVANCED,170,174,70,14 END IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Sat Dec 3 18:39:11 2011 @@ -116,16 +116,16 @@ IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Copy Profile" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 +CAPTION "Kopírovat profil" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Z:", IDC_STATIC, 5, 10, 20, 8 LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 - LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + LTEXT "Do:", IDC_STATIC, 5, 30, 20, 8 EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 199, 30, 50, 14 END @@ -308,6 +308,6 @@ IDS_MESSAGEBOXTITLE "Systémový aplet kontrolních panelù" IDS_WARNINITIALSIZE "Zadejte èíselnou hodnotu pro úvodní velikost stránkovacího souboru." IDS_WARNMAXIMUMSIZE "Zadejte èíselnou hodnotu pro maximální velikost stránkovacího souboru." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." - IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." -END + IDS_WARNINITIALRANGE "Výchozí velikost stránkovacího souboru nesmí být mení ne 2 MB a nesmí pøekroèit mnoství volného místa na zvolené diskové jednotce." + IDS_WARNMAXIMUMRANGE "Maximální velikost stránkovacího souboru nesmí být mení ne velikost výchozí a nesmí pøekroèit mnoství volného místa na zvolené diskové jednotce." +END

1 0

[janderwald] 54573: [PORTCLS] - Use parameters which have been already probed by ks - re-enable traces for property handler bug - see bug 6662 6663
by janderwald＠svn.reactos.org 03 Dec '11

03 Dec '11

Author: janderwald Date: Sat Dec 3 17:39:19 2011 New Revision: 54573 URL: http://svn.reactos.org/svn/reactos?rev=54573&view=rev Log: [PORTCLS] - Use parameters which have been already probed by ks - re-enable traces for property handler bug - see bug 6662 6663 Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Sat Dec 3 17:39:19 2011 @@ -6,6 +6,8 @@ * PROGRAMMER: Johannes Anderwald */ +#undef NDEBUG +#define YDEBUG #include "private.hpp" NTSTATUS @@ -91,6 +93,7 @@ // store device descriptor KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PKSPROPERTY_ITEM)SubDeviceDescriptor; + // then try KsPropertyHandler return KsPropertyHandler(Irp, PropertySetCount, PropertySet); @@ -154,7 +157,7 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); // get input property request - Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + Property = (PKSPROPERTY)Request; // get property set PropertySet = (PKSPROPERTY_SET)KSPROPERTY_SET_IRP_STORAGE(Irp); @@ -209,7 +212,7 @@ // store value size PropertyRequest->ValueSize = ValueSize; - PropertyRequest->Value = (ValueSize != 0 ? Irp->UserBuffer : NULL); + PropertyRequest->Value = Data; // now scan the property set for the attached property set item stored in Relations member if (PropertySet) @@ -273,14 +276,14 @@ if (PropertyRequest->PropertyItem && PropertyRequest->PropertyItem->Handler) { // now call the handler - //UNICODE_STRING GuidBuffer; - //RtlStringFromGUID(Property->Set, &GuidBuffer); - //DPRINT("Calling Node %lu MajorTarget %p MinorTarget %p PropertySet %S PropertyId %lu PropertyFlags %lx InstanceSize %lu ValueSize %lu Handler %p PropertyRequest %p PropertyItemFlags %lx PropertyItemId %lu\n", - // PropertyRequest->Node, PropertyRequest->MajorTarget, PropertyRequest->MinorTarget, GuidBuffer.Buffer, Property->Id, Property->Flags, PropertyRequest->InstanceSize, PropertyRequest->ValueSize, - // PropertyRequest->PropertyItem->Handler, PropertyRequest, PropertyRequest->PropertyItem->Flags, PropertyRequest->PropertyItem->Id); - + UNICODE_STRING GuidBuffer; + RtlStringFromGUID(Property->Set, &GuidBuffer); + DPRINT1("Calling Node %lu MajorTarget %p MinorTarget %p PropertySet %S PropertyId %lu PropertyFlags %lx InstanceSize %lu ValueSize %lu Handler %p PropertyRequest %p PropertyItemFlags %lx PropertyItemId %lu\n", + PropertyRequest->Node, PropertyRequest->MajorTarget, PropertyRequest->MinorTarget, GuidBuffer.Buffer, Property->Id, Property->Flags, PropertyRequest->InstanceSize, PropertyRequest->ValueSize, + PropertyRequest->PropertyItem->Handler, PropertyRequest, PropertyRequest->PropertyItem->Flags, PropertyRequest->PropertyItem->Id); + RtlFreeUnicodeString(&GuidBuffer); Status = PropertyRequest->PropertyItem->Handler(PropertyRequest); - //DPRINT("Status %lx ValueSize %lu Information %lu\n", Status, PropertyRequest->ValueSize, Irp->IoStatus.Information); + DPRINT1("Status %lx ValueSize %lu Information %lu\n", Status, PropertyRequest->ValueSize, Irp->IoStatus.Information); Irp->IoStatus.Information = PropertyRequest->ValueSize; if (Status != STATUS_PENDING) @@ -652,7 +655,7 @@ RtlCopyMemory(Descriptor->Interfaces, InterfaceGuids, sizeof(GUID) * InterfaceCount); Descriptor->InterfaceCount = InterfaceCount; - //DumpFilterDescriptor(FilterDescription); + DumpFilterDescriptor(FilterDescription); // are any property sets supported by the portcls if (FilterPropertiesCount)

1 0

[janderwald] 54572: [KS] - store property item when there are custom specific properties - Fix bug where the property handle routine received an invalid pointer to the data
by janderwald＠svn.reactos.org 03 Dec '11

03 Dec '11

Author: janderwald Date: Sat Dec 3 16:59:47 2011 New Revision: 54572 URL: http://svn.reactos.org/svn/reactos?rev=54572&view=rev Log: [KS] - store property item when there are custom specific properties - Fix bug where the property handle routine received an invalid pointer to the data Modified: trunk/reactos/drivers/ksfilter/ks/property.c Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Sat Dec 3 16:59:47 2011 @@ -20,7 +20,8 @@ IN ULONG OutputBufferLength, OUT PVOID OutputBuffer, OUT PFNKSHANDLER *PropertyHandler, - OUT PKSPROPERTY_SET * Set) + OUT PKSPROPERTY_SET * Set, + OUT PKSPROPERTY_ITEM *PropertyItem) { ULONG Index, ItemIndex; @@ -50,6 +51,7 @@ /* store property set */ *Set = (PKSPROPERTY_SET)&PropertySet[Index]; + *PropertyItem = (PKSPROPERTY_ITEM)&PropertySet[Index].PropertyItem[ItemIndex]; if (Property->Flags & KSPROPERTY_TYPE_SET) { @@ -132,12 +134,14 @@ IN ULONG PropertyItemSize OPTIONAL) { PKSPROPERTY Property; + PKSPROPERTY_ITEM PropertyItem; PKSPROPERTY_SET Set; PIO_STACK_LOCATION IoStack; NTSTATUS Status; PFNKSHANDLER PropertyHandler = NULL; ULONG Index, InputBufferLength, OutputBufferLength, TotalSize; LPGUID Guid; + //UNICODE_STRING GuidBuffer; /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -248,19 +252,33 @@ Property = (PKSPROPERTY)((ULONG_PTR)Irp->AssociatedIrp.SystemBuffer + OutputBufferLength); } - DPRINT("KspPropertyHandler Irp %p PropertySetsCount %u PropertySet %p Allocator %p PropertyItemSize %u ExpectedPropertyItemSize %u\n", Irp, PropertySetsCount, PropertySet, Allocator, PropertyItemSize, sizeof(KSPROPERTY_ITEM)); + //RtlStringFromGUID(&Property->Set, &GuidBuffer); + + //DPRINT("KspPropertyHandler Irp %p PropertySetsCount %u PropertySet %p Allocator %p PropertyItemSize %u ExpectedPropertyItemSize %u\n", Irp, PropertySetsCount, PropertySet, Allocator, PropertyItemSize, sizeof(KSPROPERTY_ITEM)); + //DPRINT("PropertyId %lu PropertyFlags %x Guid %S\n", Property->Id, Property->Flags, GuidBuffer.Buffer); + + //RtlFreeUnicodeString(&GuidBuffer); /* sanity check */ ASSERT(PropertyItemSize == 0 || PropertyItemSize == sizeof(KSPROPERTY_ITEM)); /* find the property handler */ - Status = FindPropertyHandler(&Irp->IoStatus, PropertySet, PropertySetsCount, Property, InputBufferLength, OutputBufferLength, Irp->AssociatedIrp.SystemBuffer, &PropertyHandler, &Set); + Status = FindPropertyHandler(&Irp->IoStatus, PropertySet, PropertySetsCount, Property, InputBufferLength, OutputBufferLength, Irp->AssociatedIrp.SystemBuffer, &PropertyHandler, &Set, &PropertyItem); if (NT_SUCCESS(Status) && PropertyHandler) { + /* store set */ + KSPROPERTY_SET_IRP_STORAGE(Irp) = Set; + + /* are any custom property item sizes used */ + if (PropertyItemSize) + { + /* store custom property item */ + KSPROPERTY_ITEM_IRP_STORAGE(Irp) = PropertyItem; + } + /* call property handler */ - KSPROPERTY_SET_IRP_STORAGE(Irp) = Set; - Status = PropertyHandler(Irp, Property, Irp->AssociatedIrp.SystemBuffer); + Status = PropertyHandler(Irp, Property, (OutputBufferLength > 0 ? Irp->AssociatedIrp.SystemBuffer : NULL)); if (Status == STATUS_BUFFER_TOO_SMALL) {

1 0

[janderwald] 54571: - debug code for bug 6663
by janderwald＠svn.reactos.org 03 Dec '11

03 Dec '11

Author: janderwald Date: Sat Dec 3 13:55:07 2011 New Revision: 54571 URL: http://svn.reactos.org/svn/reactos?rev=54571&view=rev Log: - debug code for bug 6663 Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/priv.h Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sat Dec 3 13:55:07 2011 @@ -468,12 +468,15 @@ /* get next nodes */ MMixerGetNextNodesFromPinIndex(MixerContext, Topology, PinId, bUpStream, &NodesCount, Nodes); - if (NodesCount > 1) - { - /* FIXME: the pin is connected by several nodes */ - DPRINT1("Topology split detected at Pin %lu bUpStream %lu NodesCount %lu", PinId, bUpStream, NodesCount); - for(NodeIndex = 0; NodeIndex < NodesCount; NodeIndex++) - DPRINT1("Pin Connected from Node %lu", Nodes[NodeIndex]); + if (NodesCount == 0) + { + /* a pin which is not connected from any node + * a) it is a topology bug (driver bug) + * b) the request is from an alternative mixer + alternative mixer code scans all pins which have not been used and tries to build lines + */ + DPRINT1("MMixerCountMixerControls PinId %lu is not connected by any node\n", PinId); + MMixerPrintTopology(Topology); return MM_STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] Sat Dec 3 13:55:07 2011 @@ -523,3 +523,6 @@ IN ULONG NodeIndex, OUT PULONG OutPinCount, OUT PULONG OutPins); + +VOID +MMixerPrintTopology();

1 0

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