Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 39963: - minor German translation and dialog resource fixes
by mkupfer＠svn.reactos.org 11 Mar '09

11 Mar '09

Author: mkupfer Date: Thu Mar 12 01:00:12 2009 New Revision: 39963 URL: http://svn.reactos.org/svn/reactos?rev=39963&view=rev Log: - minor German translation and dialog resource fixes Modified: trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc trunk/reactos/dll/win32/newdev/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc [iso-8859-1] Thu Mar 12 01:00:12 2009 @@ -79,14 +79,14 @@ BEGIN ICON IDI_ACDC,IDI_ACDC,5,5,20,20 LTEXT "Wählen Sie die Energiesparoptionen aus, die Sie verwenden möchten.",-1,30,5,205,20 - GROUPBOX "Optionen",-1,5,35,225,55 + GROUPBOX "Optionen",-1,5,35,240,55 CONTROL "&Symbol in der Taskleiste anzeigen",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,200,10 CONTROL "&Kennwort beim Reaktivieren aus dem Standbymodus anfordern",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,55,210,10 CONTROL "&Helligkeit der Anzeige beim Batteriebetrieb verringern",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,65,200,10 - GROUPBOX "Netzschaltervorgänge",-1,5,100,230,105 + GROUPBOX "Netzschaltervorgänge",-1,5,100,240,105 LTEXT "Beim Schließen des &Laptops:", IDC_SLIDCLOSE,10,110,210,10 COMBOBOX IDC_LIDCLOSE,10,120,220,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP @@ -106,7 +106,7 @@ ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20 LTEXT "Wenn der Computer in den Ruhezustand wechselt, wird der Inhalt des Arbeitsspeichers gespeichert und der Computer heruntergefahren. Wenn er wieder gestartet wird, kehrt er zum vorherigen Zustand zurück.", -1,35,5,195,35 - GROUPBOX "Ruhezustand",-1,5,45,235,25 + GROUPBOX "Ruhezustand",-1,5,45,240,25 CONTROL "&Ruhezustand aktivieren",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,55,210,10 GROUPBOX "Speicherplatz für den Ruhezustand",-1,5,80,240,60 Modified: trunk/reactos/dll/win32/newdev/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/de-DE.rc [iso-8859-1] Thu Mar 12 01:00:12 2009 @@ -15,7 +15,7 @@ CONTROL "Treiber automatisch installieren",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Treiber von einer bestimmten Position installieren",IDC_RADIO_MANUAL, - "Button",BS_AUTORADIOBUTTON,120,133,164,14 + "Button",BS_AUTORADIOBUTTON,120,133,170,14 END IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193

1 0

[cgutman] 39962: - Fix instructions (I should've read the howto more closely)
by cgutman＠svn.reactos.org 11 Mar '09

11 Mar '09

Author: cgutman Date: Thu Mar 12 00:24:50 2009 New Revision: 39962 URL: http://svn.reactos.org/svn/reactos?rev=39962&view=rev Log: - Fix instructions (I should've read the howto more closely) 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] Thu Mar 12 00:24:50 2009 @@ -273,7 +273,7 @@ <category name="Drivers" icon="8"> <application name="AC97 Driver for VirtualBox"> <version>5.10.00.3610</version> - <description>Unzip in the "ReactOS" folder then restart ReactOS.</description> + <description>Unzip in the "ReactOS" folder then restart ReactOS twice.</description> <location>http://svn.reactos.org/packages/ac97_vbox.exe</location> </application> </category>

1 0

[spetreolle] 39961: -Add French translation thanks to elhoir who saw that my eyes and english aren't perfect :)
by spetreolle＠svn.reactos.org 11 Mar '09

11 Mar '09

Author: spetreolle Date: Wed Mar 11 23:54:37 2009 New Revision: 39961 URL: http://svn.reactos.org/svn/reactos?rev=39961&view=rev Log: -Add French translation thanks to elhoir who saw that my eyes and english aren't perfect :) Added: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/applications/mplay32/rsrc.rc Added: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] Wed Mar 11 23:54:37 2009 @@ -1,0 +1,29 @@ +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Ouvrir...", IDM_OPEN_FILE + MENUITEM "&Fermer", IDM_CLOSE_FILE + MENUITEM SEPARATOR + MENUITEM "&Quitter", IDM_EXIT + END + POPUP "&Aide" + BEGIN + MENUITEM "&A propos...", IDM_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ALL_TYPES_FILTER "Tous les types supportés (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_TOOLTIP_PLAY "Lecture" + IDS_TOOLTIP_STOP "Stop" + IDS_TOOLTIP_EJECT "Ejecter" + IDS_TOOLTIP_BACKWARD "Précédent" + IDS_TOOLTIP_SEEKBACK "Retour rapide" + IDS_TOOLTIP_SEEKFORW "Avance rapide" + IDS_TOOLTIP_FORWARD "Suivant" + IDS_APPTITLE "ReactOS Multimedia Player" +END Propchange: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] Wed Mar 11 23:54:37 2009 @@ -4,6 +4,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

[dgorbachev] 39960: Add Japanese font to USetup.
by dgorbachev＠svn.reactos.org 11 Mar '09

11 Mar '09

Author: dgorbachev Date: Wed Mar 11 23:35:23 2009 New Revision: 39960 URL: http://svn.reactos.org/svn/reactos?rev=39960&view=rev Log: Add Japanese font to USetup. Modified: trunk/reactos/base/setup/usetup/muifonts.h trunk/reactos/base/setup/usetup/muilanguages.h Modified: trunk/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts… ============================================================================== --- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Wed Mar 11 23:35:23 2009 @@ -51,11 +51,27 @@ { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, { L"Times New Roman", L"DejaVu Serif" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"DejaVu Sans" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"DejaVu Sans" }, + { NULL, NULL } +}; + +MUI_SUBFONT JapaneseFonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tahoma", L"IPAMonaUIGothic" }, + { L"MS Sans Serif", L"Tahoma" }, + { L"MS Shell Dlg", L"IPAMonaUIGothic" }, + { L"MS Shell Dlg 2", L"IPAMonaUIGothic" }, + { L"MS UI Gothic", L"IPAMonaUIGothic" }, + { L"MS UI Gothic 2", L"IPAMonaUIGothic" }, + { L"Helv", L"Tahoma" }, { NULL, NULL } }; @@ -65,11 +81,11 @@ { L"Courier", L"DejaVu Sans Mono" }, { L"Courier New", L"DejaVu Sans Mono" }, { L"Times New Roman", L"DejaVu Serif" }, - { L"Tahoma", L"DejaVu Sans" }, - { L"MS Sans Serif", L"DejaVu Sans" }, - { L"MS Shell Dlg", L"DejaVu Sans" }, - { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"DejaVu Sans" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"MS Sans Serif", L"DejaVu Sans" }, + { L"MS Shell Dlg", L"DejaVu Sans" }, + { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Helv", L"DejaVu Sans" }, { NULL, NULL } }; Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Wed Mar 11 23:35:23 2009 @@ -216,7 +216,7 @@ {L"00000421", L"1252", L"850", L"10079", L"Indonesian", L"62", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, idIDLayouts }, {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", L"39", itITPages, itITErrorEntries, itITStrings, LatinFonts, itITLayouts }, {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"41", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, - {L"00000411", L"932", L"932", L"10001", L"Japanese", L"81", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, jaJPLayouts }, + {L"00000411", L"932", L"932", L"10001", L"Japanese", L"81", enUSPages, enUSErrorEntries, enUSStrings, JapaneseFonts, jaJPLayouts }, {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", L"705", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kkKZLayouts }, {L"00000457", L"0", L"437", L"2", L"Konkani", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kokINLayouts},

1 0

[dgorbachev] 39959: Do not crash on Pentium.
by dgorbachev＠svn.reactos.org 11 Mar '09

11 Mar '09

Author: dgorbachev Date: Wed Mar 11 23:34:34 2009 New Revision: 39959 URL: http://svn.reactos.org/svn/reactos?rev=39959&view=rev Log: Do not crash on Pentium. Modified: trunk/reactos/hal/halx86/generic/bios.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Wed Mar 11 23:34:34 2009 @@ -107,6 +107,17 @@ HalpSwitchToRealModeTrapHandlers(VOID) { ULONG Handler; + PHARDWARE_PTE IdtPte; + + /* On i586, the first 7 entries of IDT are write-protected, unprotect them. */ + if (KeGetCurrentPrcb()->CpuType == 5) + { + IdtPte = GetPteAddress(((PKIPCR)KeGetPcr())->IDT); + IdtPte->Write = 1; + + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); + } /* Save the current Invalid Opcode and General Protection Fault Handlers */ HalpGpfHandler = ((((PKIPCR)KeGetPcr())->IDT[13].ExtendedOffset << 16) &

1 0

[cgutman] 39958: - Add a driver section to Download - Add the AC97 driver - We need an icon for this section
by cgutman＠svn.reactos.org 11 Mar '09

11 Mar '09

Author: cgutman Date: Wed Mar 11 22:53:23 2009 New Revision: 39958 URL: http://svn.reactos.org/svn/reactos?rev=39958&view=rev Log: - Add a driver section to Download - Add the AC97 driver - We need an icon for this section 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] Wed Mar 11 22:53:23 2009 @@ -270,6 +270,13 @@ <location>http://www.audiograbber.de/files/4898276276/agsetup183se.exe</location> </application> </category> + <category name="Drivers" icon="8"> + <application name="AC97 Driver for VirtualBox"> + <version>5.10.00.3610</version> + <description>Unzip in the "ReactOS" folder then restart ReactOS.</description> + <location>http://svn.reactos.org/packages/ac97_vbox.exe</location> + </application> + </category> <category name="Others" icon="8"> <application name="Simple Direct Media Layer (SDL) Runtime"> <version>1.2.13</version>

1 0

[janderwald] 39957: - Use Byteswap intriniscs to improve performance - Hint by Physicus
by janderwald＠svn.reactos.org 11 Mar '09

11 Mar '09

Author: janderwald Date: Wed Mar 11 22:02:06 2009 New Revision: 39957 URL: http://svn.reactos.org/svn/reactos?rev=39957&view=rev Log: - Use Byteswap intriniscs to improve performance - Hint by Physicus Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Wed Mar 11 22:02:06 2009 @@ -10,27 +10,6 @@ const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; -#ifdef _X86_ -#define htons(w) \ - ((((w) & 0xFF00) >> 8) | \ - (((w) & 0x00FF) << 8)) - -#define htonl(n) (((((unsigned long)(n) & 0xFF)) << 24) | \ - ((((unsigned long)(n) & 0xFF00)) << 8) | \ - ((((unsigned long)(n) & 0xFF0000)) >> 8) | \ - ((((unsigned long)(n) & 0xFF000000)) >> 24)) - -#define ntohs(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) - - -#define ntohl(n) (((((unsigned long)(n) & 0xFF)) << 24) | \ - ((((unsigned long)(n) & 0xFF00)) << 8) | \ - ((((unsigned long)(n) & 0xFF0000)) >> 8) | \ - ((((unsigned long)(n) & 0xFF000000)) >> 24)) - -#endif - - NTSTATUS PerformQualityConversion( PUCHAR Buffer, @@ -59,7 +38,10 @@ { Sample = Buffer[Index]; Sample *= 2; - BufferOut[Index] = htons(Sample); +#ifdef _X86_ + Sample = _byteswap_ushort(Sample); +#endif + BufferOut[Index] = Sample; } *Result = BufferOut; *ResultLength = Samples * sizeof(USHORT); @@ -75,7 +57,10 @@ { Sample = Buffer[Index]; Sample *= 16777216; - BufferOut[Index] = htonl(Sample); +#ifdef _X86_ + Sample = _byteswap_ulong(Sample); +#endif + BufferOut[Index] = Sample; } *Result = BufferOut; *ResultLength = Samples * sizeof(ULONG); @@ -92,7 +77,10 @@ { Sample = BufferIn[Index]; Sample *= 65536; - BufferOut[Index] = htonl(Sample); +#ifdef _X86_ + Sample = _byteswap_ulong(Sample); +#endif + BufferOut[Index] = Sample; } *Result = BufferOut; *ResultLength = Samples * sizeof(ULONG); @@ -109,9 +97,11 @@ for(Index = 0; Index < Samples; Index++) { Sample = BufferIn[Index]; - Sample = ntohs(Sample); +#ifdef _X86_ + Sample = _byteswap_ushort(Sample); +#endif Sample /= 256; - BufferOut[Index] = (Sample / 0xFF); + BufferOut[Index] = (Sample & 0xFF); } *Result = BufferOut; *ResultLength = Samples * sizeof(UCHAR); @@ -127,9 +117,11 @@ for(Index = 0; Index < Samples; Index++) { Sample = BufferIn[Index]; - Sample = ntohl(Sample); +#ifdef _X86_ + Sample = _byteswap_ulong(Sample); +#endif Sample /= 16777216; - BufferOut[Index] = Sample & 0xFF; + BufferOut[Index] = (Sample & 0xFF); } *Result = BufferOut; *ResultLength = Samples * sizeof(UCHAR); @@ -145,9 +137,11 @@ for(Index = 0; Index < Samples; Index++) { Sample = BufferIn[Index]; - Sample = ntohl(Sample); +#ifdef _X86_ + Sample = _byteswap_ulong(Sample); +#endif Sample /= 65536; - BufferOut[Index] = Sample & 0xFFFF; + BufferOut[Index] = (Sample & 0xFFFF); } *Result = BufferOut; *ResultLength = Samples * sizeof(USHORT); @@ -380,7 +374,7 @@ PKSDATAFORMAT_WAVEFORMATEX BaseFormat, TransformedFormat; - DPRINT1("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); + //DPRINT1("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); BaseFormat = (PKSDATAFORMAT_WAVEFORMATEX)FileObject->FsContext2; @@ -406,10 +400,12 @@ TransformedFormat = (PKSDATAFORMAT_WAVEFORMATEX)(ConnectDetails + 1); StreamHeader = (PKSSTREAM_HEADER)Buffer; +#if 0 DPRINT1("Num Channels %u Old Channels %u\n SampleRate %u Old SampleRate %u\n BitsPerSample %u Old BitsPerSample %u\n", BaseFormat->WaveFormatEx.nChannels, TransformedFormat->WaveFormatEx.nChannels, BaseFormat->WaveFormatEx.nSamplesPerSec, TransformedFormat->WaveFormatEx.nSamplesPerSec, BaseFormat->WaveFormatEx.wBitsPerSample, TransformedFormat->WaveFormatEx.wBitsPerSample); +#endif if (BaseFormat->WaveFormatEx.wBitsPerSample != TransformedFormat->WaveFormatEx.wBitsPerSample) { @@ -421,7 +417,7 @@ &BufferLength); if (NT_SUCCESS(Status)) { - DPRINT1("Old BufferSize %u NewBufferSize %u\n", StreamHeader->DataUsed, BufferLength); + //DPRINT1("Old BufferSize %u NewBufferSize %u\n", StreamHeader->DataUsed, BufferLength); ExFreePool(StreamHeader->Data); StreamHeader->Data = BufferOut; StreamHeader->DataUsed = BufferLength; @@ -431,6 +427,7 @@ if (BaseFormat->WaveFormatEx.nSamplesPerSec != TransformedFormat->WaveFormatEx.nSamplesPerSec) { /* sample format conversion must be done in a deferred routine */ + DPRINT1("SampleRate conversion not available yet\n"); return FALSE; }

1 0

[janderwald] 39956: - Check if handle is re-used. Fixes double-freeing of handle & crash
by janderwald＠svn.reactos.org 11 Mar '09

11 Mar '09

Author: janderwald Date: Wed Mar 11 21:32:32 2009 New Revision: 39956 URL: http://svn.reactos.org/svn/reactos?rev=39956&view=rev Log: - Check if handle is re-used. Fixes double-freeing of handle & crash Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Wed Mar 11 21:32:32 2009 @@ -137,7 +137,7 @@ ACCESS_MASK DesiredAccess = 0; HANDLE PinHandle; KSPIN_CONNECT * PinConnect; - ULONG Length; + ULONG Length, Index; KSDATAFORMAT_WAVEFORMATEX * DataFormat; ULONG FilterId; ULONG PinId; @@ -235,7 +235,20 @@ Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)InstanceInfo, Length, &PinHandle, sizeof(HANDLE), &BytesReturned); if (NT_SUCCESS(Status)) { - PHANDLE Handels = ExAllocatePool(NonPagedPool, sizeof(HANDLE) * (ClientInfo->NumPins+1)); + PHANDLE Handels; + + for(Index = 0; Index < ClientInfo->NumPins; Index++) + { + if (ClientInfo->hPins[Index] == PinHandle) + { + /* the pin handle has been re-used */ + DeviceInfo->hDevice = PinHandle; + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); + } + + } + + Handels = ExAllocatePool(NonPagedPool, sizeof(HANDLE) * (ClientInfo->NumPins+1)); if (Handels) {

1 0

[dchapyshev] 39955: - Fix build
by dchapyshev＠svn.reactos.org 11 Mar '09

11 Mar '09

Author: dchapyshev Date: Wed Mar 11 21:17:54 2009 New Revision: 39955 URL: http://svn.reactos.org/svn/reactos?rev=39955&view=rev Log: - Fix build Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Wed Mar 11 21:17:54 2009 @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDR_MAINMENU MENU BEGIN

1 0

[janderwald] 39954: - Use Interlocked*List function to improve stability as a few of the timing issues have been resolved - Queue a dpc for each completed buffer - Complete the irp as soon as possible
by janderwald＠svn.reactos.org 11 Mar '09

11 Mar '09

Author: janderwald Date: Wed Mar 11 21:00:11 2009 New Revision: 39954 URL: http://svn.reactos.org/svn/reactos?rev=39954&view=rev Log: - Use Interlocked*List function to improve stability as a few of the timing issues have been resolved - Queue a dpc for each completed buffer - Complete the irp as soon as possible Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Wed Mar 11 21:00:11 2009 @@ -216,6 +216,10 @@ STDMETHOD_(BOOL, CancelBuffers)(THIS); + STDMETHOD_(VOID, UpdateFormat)(THIS_ + IN PKSDATAFORMAT DataFormat); + + }; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Wed Mar 11 21:00:11 2009 @@ -13,9 +13,11 @@ typedef struct _IRP_MAPPING_ { + LIST_ENTRY Entry; KSSTREAM_HEADER *Header; PIRP Irp; - struct _IRP_MAPPING_ * Next; + KDPC Dpc; + }IRP_MAPPING, *PIRP_MAPPING; typedef struct @@ -30,15 +32,11 @@ KSPIN_CONNECT *ConnectDetails; PKSDATAFORMAT_WAVEFORMATEX DataFormat; - KDPC Dpc; PIRP_MAPPING FirstMap; PIRP_MAPPING LastMap; - ULONG DpcActive; - PIRP_MAPPING FreeMapHead; - PIRP_MAPPING FreeMapTail; - ULONG FreeDataSize; - LONG FreeCount; + KSPIN_LOCK Lock; + LIST_ENTRY ListHead; }IIrpQueueImpl; @@ -50,39 +48,22 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2) { - PIRP_MAPPING CurMapping, NextMapping = NULL; - ULONG Count; - IIrpQueueImpl * This = (IIrpQueueImpl*)DeferredContext; + PIRP_MAPPING CurMapping; CurMapping = (PIRP_MAPPING)SystemArgument1; ASSERT(CurMapping); - Count = 0; - while(CurMapping) - { - NextMapping = CurMapping->Next; - - This->FreeDataSize -= CurMapping->Header->DataUsed; - - if (CurMapping->Irp) - { - CurMapping->Irp->IoStatus.Information = CurMapping->Header->FrameExtent; - CurMapping->Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(CurMapping->Irp, IO_SOUND_INCREMENT); - } - - ExFreePool(CurMapping->Header->Data); - ExFreePool(CurMapping->Header); - - ExFreePool(CurMapping); - - CurMapping = NextMapping; - InterlockedDecrement(&This->FreeCount); - - Count++; - } - This->DpcActive = FALSE; - DPRINT1("Freed %u Buffers / IRP Available Mappings %u\n", Count, This->NumMappings); + if (CurMapping->Irp) + { + CurMapping->Irp->IoStatus.Information = CurMapping->Header->FrameExtent; + CurMapping->Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(CurMapping->Irp, IO_SOUND_INCREMENT); + } + + ExFreePool(CurMapping->Header->Data); + ExFreePool(CurMapping->Header); + + ExFreePool(CurMapping); } NTSTATUS @@ -144,8 +125,8 @@ This->ConnectDetails = ConnectDetails; This->DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)DataFormat; - - KeInitializeDpc(&This->Dpc, DpcRoutine, (PVOID)This); + InitializeListHead(&This->ListHead); + KeInitializeSpinLock(&This->Lock); return STATUS_SUCCESS; } @@ -167,18 +148,17 @@ Mapping->Header = (KSSTREAM_HEADER*)Buffer; Mapping->Irp = Irp; - Mapping->Next = NULL; - - //DPRINT1("FirstMap %p LastMap %p NumMappings %u\n", This->FirstMap, This->LastMap, This->NumMappings); - - if (!This->FirstMap) - This->FirstMap = Mapping; - else - This->LastMap->Next = Mapping; - - This->LastMap = Mapping; - - InterlockedIncrement(&This->NumMappings); + KeInitializeDpc(&Mapping->Dpc, DpcRoutine, (PVOID)Mapping); + + This->NumDataAvailable += Mapping->Header->DataUsed; + + DPRINT1("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Irp %p\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Irp); + + /* FIXME use InterlockedCompareExchangePointer */ + if (InterlockedCompareExchange((volatile long *)&This->FirstMap, (LONG)Mapping, (LONG)0) != 0) + ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); + + (void)InterlockedIncrement((volatile long*)&This->NumMappings); if (Irp) { @@ -187,9 +167,6 @@ IoMarkIrpPending(Irp); } - This->NumDataAvailable += Mapping->Header->DataUsed; - - DPRINT1("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Irp %p\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Irp); return STATUS_SUCCESS; } @@ -227,35 +204,16 @@ if (This->FirstMap->Header->DataUsed <=This->CurrentOffset) { This->CurrentOffset = 0; - Mapping = This->FirstMap; - This->FirstMap = This->FirstMap->Next; - - if (!This->FirstMap) - This->LastMap = NULL; - - This->FreeCount++; - - if (!This->FreeMapHead) - This->FreeMapHead = Mapping; - else - This->FreeMapTail->Next = Mapping; - - This->FreeMapTail = Mapping; - Mapping->Next = NULL; - This->FreeDataSize += Mapping->Header->DataUsed; + Mapping = (PIRP_MAPPING)ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); + InterlockedDecrement(&This->NumMappings); - This->NumDataAvailable -= Mapping->Header->DataUsed; - - - if (This->FreeCount > 5 && This->DpcActive == FALSE) - { - Mapping = This->FreeMapHead; - This->FreeMapHead = NULL; - This->FreeMapTail = NULL; - This->DpcActive = TRUE; - KeInsertQueueDpc(&This->Dpc, (PVOID)Mapping, NULL); - } - } + This->NumDataAvailable -= This->FirstMap->Header->DataUsed; + + KeInsertQueueDpc(&This->FirstMap->Dpc, (PVOID)This->FirstMap, NULL); + (void)InterlockedExchangePointer((PVOID volatile*)&This->FirstMap, (PVOID)Mapping); + + } + } ULONG @@ -298,29 +256,20 @@ IIrpQueue_fnCancelBuffers( IN IIrpQueue *iface) { - PIRP_MAPPING Mapping; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - - if (This->DpcActive) - return FALSE; - - ASSERT(This->FirstMap == NULL); - ASSERT(This->LastMap == NULL); - - if (This->FreeMapHead == NULL) - { - ASSERT(This->FreeMapTail == NULL); - This->FreeMapTail = NULL; - return TRUE; - } - - Mapping = This->FreeMapHead; - This->FreeMapHead = NULL; - This->FreeMapTail = NULL; - This->DpcActive = TRUE; - KeInsertQueueDpc(&This->Dpc, (PVOID)Mapping, NULL); - return FALSE; -} + return TRUE; +} + +VOID +NTAPI +IIrpQueue_fnUpdateFormat( + IN IIrpQueue *iface, + PKSDATAFORMAT DataFormat) +{ + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + This->DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)DataFormat; + +} + static IIrpQueueVtbl vt_IIrpQueue = { @@ -334,7 +283,8 @@ IIrpQueue_fnNumMappings, IIrpQueue_fnMinMappings, IIrpQueue_fnMinimumDataAvailable, - IIrpQueue_fnCancelBuffers + IIrpQueue_fnCancelBuffers, + IIrpQueue_fnUpdateFormat }; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Wed Mar 11 21:00:11 2009 @@ -334,8 +334,9 @@ if (Property->Flags & KSPROPERTY_TYPE_SET) { + Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + if (This->Stream) { Status = This->Stream->lpVtbl->SetState(This->Stream, *State); @@ -344,14 +345,11 @@ if (NT_SUCCESS(Status)) { This->State = *State; - Irp->IoStatus.Information = sizeof(KSSTATE); - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; } - Irp->IoStatus.Status = Status; } - return Irp->IoStatus.Status; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } else if (Property->Flags & KSPROPERTY_TYPE_GET) { @@ -379,24 +377,29 @@ if (This->Stream) { - while(!This->IrpQueue->lpVtbl->CancelBuffers(This->IrpQueue)) - KeStallExecutionProcessor(10); - - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); + Status = This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); This->State = KSSTATE_STOP; + DPRINT1("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)DataFormat)->WaveFormatEx.nChannels, + ((PKSDATAFORMAT_WAVEFORMATEX)DataFormat)->WaveFormatEx.wBitsPerSample, + ((PKSDATAFORMAT_WAVEFORMATEX)DataFormat)->WaveFormatEx.nSamplesPerSec); Status = This->Stream->lpVtbl->SetFormat(This->Stream, NewDataFormat); if (NT_SUCCESS(Status)) { if (This->Format) ExFreePoolWithTag(This->Format, TAG_PORTCLASS); + + This->IrpQueue->lpVtbl->UpdateFormat(This->IrpQueue, (PKSDATAFORMAT)NewDataFormat); This->Format = NewDataFormat; Irp->IoStatus.Information = DataFormat->FormatSize; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } + } + DPRINT1("Failed to set format\n"); +DbgBreakPoint(); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -658,37 +661,33 @@ Packet = (PCONTEXT_WRITE)Buffer; + if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue)) + { Irp = Packet->Irp; + StatusBlock->Status = STATUS_PENDING; + } else + { Irp = NULL; - - Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, Buffer, Length, Irp); - - if (!NT_SUCCESS(Status)) - return FALSE; - - if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) - { - /* some should initiate a state request but didnt do it */ - DPRINT1("Starting stream with %lu mappings\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)); - - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN); - This->State = KSSTATE_RUN; - } - - if (!Irp) - { - //DPRINT1("Completing Irp %p\n", Packet->Irp); - Packet->Irp->IoStatus.Status = STATUS_SUCCESS; Packet->Irp->IoStatus.Information = Packet->Header.FrameExtent; IoCompleteRequest(Packet->Irp, IO_SOUND_INCREMENT); StatusBlock->Status = STATUS_SUCCESS; } - else - { - StatusBlock->Status = STATUS_PENDING; + + Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, Buffer, Length, Irp); + + if (!NT_SUCCESS(Status)) + return FALSE; + + if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) + { + /* some should initiate a state request but didnt do it */ + DPRINT1("Starting stream with %lu mappings\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)); + + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN); + This->State = KSSTATE_RUN; } return TRUE;

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