Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[cgutman] 39964: - Merge aicom-network-fixes up to r39943

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Mar 12 01:15:12 2009 New Revision: 39964 URL: http://svn.reactos.org/svn/reactos?rev=39964&view=rev Log: - Merge aicom-network-fixes up to r39943 Removed: trunk/reactos/drivers/network/tcpip/include/bug.h trunk/reactos/drivers/network/tcpip/tcpip/bug.c trunk/reactos/drivers/network/tcpip/tcpip/mockbug.c Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/tcpip/include/precomp.h trunk/reactos/drivers/network/tcpip/tcpip.rbuild trunk/reactos/lib/drivers/ip/network/memtrack.c trunk/reactos/lib/drivers/ip/transport/tcp/event.c Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Thu Mar 12 01:15:12 2009 @@ -235,6 +235,9 @@ UINT i; NDIS_STATUS Status; PNIC_ADAPTER Adapter; + NDIS_HANDLE ConfigurationHandle; + UINT *RegNetworkAddress = 0; + UINT RegNetworkAddressLength = 0; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -281,10 +284,7 @@ if (Status != NDIS_STATUS_SUCCESS) { PNDIS_CONFIGURATION_PARAMETER ConfigurationParameter; - NDIS_HANDLE ConfigurationHandle; UNICODE_STRING Keyword; - UINT *RegNetworkAddress = 0; - UINT RegNetworkAddressLength = 0; NdisOpenConfiguration(&Status, &ConfigurationHandle, WrapperConfigurationContext); if (Status == NDIS_STATUS_SUCCESS) @@ -308,18 +308,6 @@ Adapter->IoBaseAddress = ConfigurationParameter->ParameterData.IntegerData; } - /* the returned copy of the data is owned by NDIS and will be released on NdisCloseConfiguration */ - NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); - if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == DRIVER_LENGTH_OF_ADDRESS) - { - int i; - NDIS_DbgPrint(MID_TRACE,("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", - RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], - RegNetworkAddress[4], RegNetworkAddress[5])); - for(i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) - Adapter->StationAddress[i] = RegNetworkAddress[i]; - } - NdisCloseConfiguration(ConfigurationHandle); } else @@ -366,6 +354,30 @@ NDIS_DbgPrint(MID_TRACE, ("Status (0x%X).\n", Status)); MiniportHalt((NDIS_HANDLE)Adapter); return Status; + } + + NdisOpenConfiguration(&Status, &ConfigurationHandle, WrapperConfigurationContext); + if (Status == NDIS_STATUS_SUCCESS) + { + NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); + if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == DRIVER_LENGTH_OF_ADDRESS) + { + int i; + NDIS_DbgPrint(MID_TRACE,("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", + RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], + RegNetworkAddress[4], RegNetworkAddress[5])); + for(i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) + Adapter->StationAddress[i] = RegNetworkAddress[i]; + } + + NdisCloseConfiguration(ConfigurationHandle); + } + + if (Status != NDIS_STATUS_SUCCESS) + { + int i; + for (i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) + Adapter->StationAddress[i] = Adapter->PermanentAddress[i]; } NDIS_DbgPrint(MID_TRACE, ("BOARDDATA:\n")); @@ -659,11 +671,19 @@ * Status of operation */ { + NDIS_STATUS NdisStatus = NDIS_STATUS_SUCCESS; + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - return NDIS_STATUS_FAILURE; +#ifndef NOCARD + NdisStatus = NICReset((PNIC_ADAPTER)MiniportAdapterContext); +#endif + + *AddressingReset = TRUE; + + return NdisStatus; } Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Thu Mar 12 01:15:12 2009 @@ -699,16 +699,7 @@ PNDIS_CONFIGURATION_PARAMETER ParameterValue = NULL; NDIS_STRING Keyword; UINT *IntArray = 0; - int i; - - /* FIXME - We don't quite support this yet due to buggy code below */ - { - *Status = NDIS_STATUS_FAILURE; - return; - } - - *NetworkAddress = NULL; - *NetworkAddressLength = 6;/* XXX magic constant */ + UINT i,j = 0; NdisInitUnicodeString(&Keyword, L"NetworkAddress"); NdisReadConfiguration(Status, &ParameterValue, ConfigurationHandle, &Keyword, NdisParameterString); @@ -718,8 +709,11 @@ return; } - /* 6 bytes for ethernet, tokenring, fddi, everything else? */ - IntArray = ExAllocatePool(PagedPool, 6*sizeof(UINT)); + while (ParameterValue->ParameterData.StringData.Buffer[j] != '\0') j++; + + *NetworkAddressLength = (UINT)((j/2)+0.5); + + IntArray = ExAllocatePool(PagedPool, (*NetworkAddressLength)*sizeof(UINT)); if(!IntArray) { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); @@ -742,7 +736,7 @@ ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); /* convert from string to bytes */ - for(i=0; i<6; i++) + for(i=0; i<(*NetworkAddressLength); i++) { IntArray[i] = (UnicodeToHexByte((ParameterValue->ParameterData.StringData.Buffer)[2*i]) << 4) + UnicodeToHexByte((ParameterValue->ParameterData.StringData.Buffer)[2*i+1]); Removed: trunk/reactos/drivers/network/tcpip/include/bug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/bug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/bug.h (removed) @@ -1,6 +1,0 @@ -#ifndef _TCPIP_BUG_H -#define _TCPIP_BUG_H - -VOID TcpipBugCheck( ULONG BugCode ); - -#endif/*_TCPIP_BUG_H*/ Modified: trunk/reactos/drivers/network/tcpip/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/precomp.h [iso-8859-1] Thu Mar 12 01:15:12 2009 @@ -30,7 +30,6 @@ #include <fileobjs.h> #include <lock.h> #include <wait.h> -#include <bug.h> #include <memtrack.h> #include <oskittcp.h> #include <interface.h> Modified: trunk/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] Thu Mar 12 01:15:12 2009 @@ -26,7 +26,6 @@ </directory> <directory name="tcpip"> <file>buffer.c</file> - <file>bug.c</file> <file>dispatch.c</file> <file>fileobjs.c</file> <file>iinfo.c</file> Removed: trunk/reactos/drivers/network/tcpip/tcpip/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/bug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/bug.c (removed) @@ -1,11 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS TCP/IP protocol driver - * FILE: tcpip/bug.c - * PURPOSE: Bugcheck - * PROGRAMMERS: Art Yerkes - * REVISIONS: - */ -#include "precomp.h" - -VOID TcpipBugCheck( ULONG BugCode ) { KeBugCheck( BugCode ); } Removed: trunk/reactos/drivers/network/tcpip/tcpip/mockbug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/mockbug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/mockbug.c (removed) @@ -1,14 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS TCP/IP protocol driver - * FILE: tcpip/bug.c - * PURPOSE: Bugcheck - * PROGRAMMERS: Art Yerkes - * REVISIONS: - */ -#include "precomp.h" - -VOID TcpipBugCheck( ULONG BugCode ) { - DbgPrint("BugCheck called: %x\n", BugCode); - ASSERT(0); -} Modified: trunk/reactos/lib/drivers/ip/network/memtrack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/mem… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] Thu Mar 12 01:15:12 2009 @@ -124,7 +124,7 @@ if ( ThingInList->Tag != Tag ) { DbgPrint("UNTRACK: TAG DOES NOT MATCH (%x)\n", Thing); ShowTrackedThing("Tag Mismatch (Item in list)", ThingInList, TRUE); - TcpipBugCheck( 0 ); + ASSERT( FALSE ); } ExFreeToNPagedLookasideList( &AllocatedObjectsLookasideList, @@ -139,7 +139,7 @@ } TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); DbgPrint("UNTRACK: SPECIFIED ALREADY FREE ITEM %x\n", Thing); - TcpipBugCheck( 0 ); + ASSERT( FALSE ); } VOID TrackDumpFL( PCHAR File, ULONG Line ) { Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Thu Mar 12 01:15:12 2009 @@ -76,8 +76,6 @@ OskitDumpBuffer( data, len ); return OSK_EINVAL; } - - RemoteAddress.Type = LocalAddress.Type = IP_ADDRESS_V4; if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { TI_DbgPrint(MIN_TRACE,("No route to %s\n", A2S(&RemoteAddress)));

15 years, 9 months

[mkupfer] 39963: - minor German translation and dialog resource fixes

by mkupfer＠svn.reactos.org

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

15 years, 9 months

[cgutman] 39962: - Fix instructions (I should've read the howto more closely)

by cgutman＠svn.reactos.org

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>

15 years, 9 months

[spetreolle] 39961: -Add French translation thanks to elhoir who saw that my eyes and english aren't perfect :)

by spetreolle＠svn.reactos.org

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"

15 years, 9 months

[dgorbachev] 39960: Add Japanese font to USetup.

by dgorbachev＠svn.reactos.org

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},

15 years, 9 months

[dgorbachev] 39959: Do not crash on Pentium.

by dgorbachev＠svn.reactos.org

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) &

15 years, 9 months

[cgutman] 39958: - Add a driver section to Download - Add the AC97 driver - We need an icon for this section

by cgutman＠svn.reactos.org

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>

15 years, 9 months

[janderwald] 39957: - Use Byteswap intriniscs to improve performance - Hint by Physicus

by janderwald＠svn.reactos.org

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; }

15 years, 9 months

[janderwald] 39956: - Check if handle is re-used. Fixes double-freeing of handle & crash

by janderwald＠svn.reactos.org

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) {

15 years, 9 months

[dchapyshev] 39955: - Fix build

by dchapyshev＠svn.reactos.org

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

15 years, 9 months

← Newer
1
...
32
33
34
35
36
37
38
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009