Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[jmorlan] 34539: Increment a console's initial screen buffer's reference count *after* calling CsrInitConsoleScreenBuffer (which sets the reference count to 0). Fixes bug 3524.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Tue Jul 15 19:24:54 2008 New Revision: 34539 URL: http://svn.reactos.org/svn/reactos?rev=34539&view=rev Log: Increment a console's initial screen buffer's reference count *after* calling CsrInitConsoleScreenBuffer (which sets the reference count to 0). Fixes bug 3524. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Tue Jul 15 19:24:54 2008 @@ -191,9 +191,6 @@ /* make console active, and insert into console list */ Console->ActiveBuffer = (PCSRSS_SCREEN_BUFFER) NewBuffer; Console->hActiveBuffer = INVALID_HANDLE_VALUE; - /* add a reference count because the buffer is tied to the console */ - InterlockedIncrement(&Console->ActiveBuffer->Header.ReferenceCount); - if (! GuiMode) { @@ -229,6 +226,9 @@ DPRINT1("CsrInitConsoleScreenBuffer: failed\n"); return Status; } + + /* add a reference count because the buffer is tied to the console */ + InterlockedIncrement(&Console->ActiveBuffer->Header.ReferenceCount); /* copy buffer contents to screen */ ConioDrawConsole(Console);

16 years, 2 months

[silverblade] 34538: Implemented WOM_OPEN, WOM_DONE and WOM_CLOSE callbacks. Added missing prototype of DriverCallback to digitalv.h in the PSDK (as per MSDN). Looped buffers aren't meant to be marked "done" until all loops are finished. But even then, NT4's own sndblst.dll seems to horde looped buffers if we break out of the loop. (Give the damn things back!) So, don't expect WOM_DONE from looped buffers. MSDN states that you shouldn't call any wave functions within the wave callback, or a dead

by silverblade＠svn.reactos.org

Author: silverblade Date: Tue Jul 15 17:42:34 2008 New Revision: 34538 URL: http://svn.reactos.org/svn/reactos?rev=34538&view=rev Log: Implemented WOM_OPEN, WOM_DONE and WOM_CLOSE callbacks. Added missing prototype of DriverCallback to digitalv.h in the PSDK (as per MSDN). Looped buffers aren't meant to be marked "done" until all loops are finished. But even then, NT4's own sndblst.dll seems to horde looped buffers if we break out of the loop. (Give the damn things back!) So, don't expect WOM_DONE from looped buffers. MSDN states that you shouldn't call any wave functions within the wave callback, or a deadlock will occur. Since buffer submission is dealt with inside the streaming thread, as is the callback, this situation holds true for my implementation. Things are almost at a state now where it may be possible to drop this in-place of the original sndblst.dll on an NT4 installation and have it function for wave audio playback. But there are still issues to be sorted out. Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/psdk/digitalv.h branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/callback.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -126,6 +126,19 @@ WORD Buffer[5347700 / 2]; WAVEHDR WaveHeaders[534]; + +VOID CALLBACK +callback( + HWAVEOUT Handle, + UINT Message, + DWORD_PTR Instance, + DWORD_PTR Parameter1, + DWORD_PTR Parameter2) +{ + printf("Callback called! Handle %d, message %d, instance %d, parameters %d %d\n", + (int) Handle, (int) Message, (int) Instance, (int) Parameter1, + (int) Parameter2); +} int APIENTRY wWinMain( HINSTANCE hInstance, @@ -178,7 +191,9 @@ //SOUND_DEBUG(L"WODM_OPEN test 2"); OpenDesc.lpFormat = &Format; - Result = wodMessage(0, WODM_OPEN, (DWORD) &InstanceData, (DWORD) &OpenDesc, 0); + OpenDesc.dwCallback = (DWORD) &callback; + OpenDesc.dwInstance = 0x69696969; + Result = wodMessage(0, WODM_OPEN, (DWORD) &InstanceData, (DWORD) &OpenDesc, CALLBACK_FUNCTION); /*SOUND_DEBUG_HEX(Result);*/ POPUP("Click for WODM_WRITE test"); Modified: branches/silverblade-audio/include/psdk/digitalv.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/psdk/… ============================================================================== --- branches/silverblade-audio/include/psdk/digitalv.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/psdk/digitalv.h [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -857,6 +857,20 @@ LPWSTR lpstrText; } MCI_DGV_WINDOW_PARMSW, *LPMCI_DGV_WINDOW_PARMSW; +/* Driver callback for multimedia components (implemented in winmm) */ + +WINAPI BOOL +DriverCallback( + DWORD dwCallBack, + DWORD dwFlags, + HDRVR hdrvr, + DWORD msg, + DWORD dwUser, + DWORD dwParam1, + DWORD dwParam2 +); + + #ifdef __cplusplus } #endif Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -293,7 +293,10 @@ /* Stuff generously donated to us from WinMM */ struct { + HDRVR Handle; + DWORD Flags; DWORD ClientCallback; + DWORD ClientCallbackInstanceData; } WinMM; /* Device-specific parameters */ @@ -699,4 +702,15 @@ DWORD parameter2); +/* + mme/callback.c +*/ + +VOID +NotifySoundClient( + PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + DWORD Message, + DWORD Parameter); + + #endif Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/callback.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/callback.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/callback.c [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -11,11 +11,30 @@ #include <windows.h> #include <mmsystem.h> +#include <digitalv.h> + +#include <mmebuddy.h> VOID NotifySoundClient( + PSOUND_DEVICE_INSTANCE SoundDeviceInstance, DWORD Message, DWORD Parameter) { - /* TODO... DriverCallback */ + ASSERT( SoundDeviceInstance ); + + TRACE_("MME client callback - message %d, parameter %d\n", + (int) Message, + (int) Parameter); + + if ( SoundDeviceInstance->WinMM.ClientCallback ) + { + DriverCallback(SoundDeviceInstance->WinMM.ClientCallback, + HIWORD(SoundDeviceInstance->WinMM.Flags), + SoundDeviceInstance->WinMM.Handle, + Message, + SoundDeviceInstance->WinMM.ClientCallbackInstanceData, + Parameter, + 0); + } } Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -11,6 +11,7 @@ <file>utility.c</file> <directory name="mme"> <file>DriverProc.c</file> + <file>callback.c</file> </directory> <directory name="wave"> <file>wodMessage.c</file> Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -237,12 +237,36 @@ WaveHeader->reserved += BytesWritten; ASSERT(WaveHeader->reserved <= WaveHeader->dwBufferLength); + StreamInfo = &SoundDeviceInstance->Streaming.Wave; + + /* Did we complete a header sent by the client? */ if ( WaveHeader->reserved == WaveHeader->dwBufferLength ) { TRACE_("* Completed wavehdr %p (length %d)\n", WaveHeader, (int) WaveHeader->dwBufferLength); - /* TODO: Give it back to the client */ + + if ( StreamInfo->LoopsRemaining > 0 ) + { + /* Let's go round again... */ + WaveHeader->reserved = 0; + + /* + FIXME: + I have no idea wtf happens with completions - tests with the NT4 + mmdrv indicate that they just randomly throw back completed + buffers later on. Like, a lot later on... Like, when the device + is being reset. + */ + } + else + { + /* Mark the header as done */ + WaveHeader->dwFlags |= WHDR_DONE; + + /* Notify the client */ + NotifySoundClient(SoundDeviceInstance, WOM_DONE, (DWORD) WaveHeader); + } } else { @@ -251,8 +275,6 @@ (int) WaveHeader->reserved, (int) WaveHeader->dwBufferLength); } - - StreamInfo = &SoundDeviceInstance->Streaming.Wave; /* Decrease the number of outstanding buffers */ ASSERT(StreamInfo->BuffersOutstanding > 0); @@ -422,6 +444,8 @@ /* ugly HACK to stop sound playback... FIXME */ SoundDeviceInstance->Streaming.Wave.CurrentBuffer = NULL; + /* TODO: Return all audio buffers to the client, marking as DONE */ + return Functions->ResetWaveDevice(SoundDeviceInstance); } Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -95,10 +95,18 @@ return Result; } + /* Set up the callback - TODO: Put this somewhere else? */ + Instance->WinMM.ClientCallback = OpenParameters->dwCallback; + Instance->WinMM.ClientCallbackInstanceData = + OpenParameters->dwInstance; + Instance->WinMM.Handle = (HDRVR) OpenParameters->hWave; + Instance->WinMM.Flags = parameter2; + /* Provide winmm with instance handle */ *((PSOUND_DEVICE_INSTANCE*)private_handle) = Instance; - /* TODO: Send callback... */ + /* Notify the client */ + NotifySoundClient(Instance, WOM_OPEN, 0); return MMSYSERR_NOERROR; } @@ -118,10 +126,11 @@ if ( State != WAVE_DD_IDLE ) return WAVERR_STILLPLAYING; + /* Notify the client */ + NotifySoundClient(Instance, WOM_CLOSE, 0); + Result = DestroySoundDeviceInstance(Instance); ASSERT(Result == MMSYSERR_NOERROR); - - /* TODO: Send the callback */ return Result; }

16 years, 2 months

[mkupfer] 34537: Mario Kacmar <kario AT szm DOT sk> - Slovak translation of several inf-files - See #3518 for more details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Tue Jul 15 17:29:42 2008 New Revision: 34537 URL: http://svn.reactos.org/svn/reactos?rev=34537&view=rev Log: Mario Kacmar <kario AT szm DOT sk> - Slovak translation of several inf-files - See #3518 for more details. Modified: trunk/reactos/media/inf/NET_NIC.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/msmouse.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/scsi.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=3453… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=3453… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=3… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=34… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=345… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=3453… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available.

16 years, 2 months

[cfinck] 34536: Revert r34533 (except the nice indentation in the Makefile) for unbreaking trunk. This change is also not compatible with current cleaning scripts in RosBE and on the Buildslaves (which only delete "makefile.auto"), leading to possibly unclean builds if the generated makefile wouldn't be deleted. The ultimate goal would be putting the generated makefiles into the intermediate directories, so we also save one cleaning step.

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Jul 15 17:04:16 2008 New Revision: 34536 URL: http://svn.reactos.org/svn/reactos?rev=34536&view=rev Log: Revert r34533 (except the nice indentation in the Makefile) for unbreaking trunk. This change is also not compatible with current cleaning scripts in RosBE and on the Buildslaves (which only delete "makefile.auto"), leading to possibly unclean builds if the generated makefile wouldn't be deleted. The ultimate goal would be putting the generated makefiles into the intermediate directories, so we also save one cleaning step. Modified: trunk/reactos/Makefile trunk/reactos/ReactOS-arm.rbuild trunk/reactos/ReactOS-i386.rbuild trunk/reactos/ReactOS-ppc.rbuild Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=34536&r1=3453… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Tue Jul 15 17:04:16 2008 @@ -125,7 +125,7 @@ # -r Input XML # # ROS_AUTOMAKE -# Alternate name of makefile-$(ARCH).auto +# Alternate name of makefile.auto # # ROS_BUILDENGINE # The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET) @@ -158,7 +158,7 @@ endif ifeq ($(ROS_AUTOMAKE),) -ROS_AUTOMAKE=makefile-$(ARCH).auto +ROS_AUTOMAKE=makefile.auto endif all: $(ROS_AUTOMAKE) Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=345… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Tue Jul 15 17:04:16 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile-arm.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config-arm.rbuild"> <xi:fallback> <xi:include href="config-arm.template.rbuild" /> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=34… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Tue Jul 15 17:04:16 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config.rbuild"> <xi:fallback> <xi:include href="config.template.rbuild" /> Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=345… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] Tue Jul 15 17:04:16 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile-ppc.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config-ppc.rbuild"> <xi:fallback> <xi:include href="config-ppc.template.rbuild" />

16 years, 2 months

[pschweitzer] 34535: Fixed typos spotted by "jeanmichel" <jeanmichel.123@free.fr> See issue #618 for more details.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Jul 15 16:05:20 2008 New Revision: 34535 URL: http://svn.reactos.org/svn/reactos?rev=34535&view=rev Log: Fixed typos spotted by "jeanmichel" <jeanmichel.123(a)free.fr> See issue #618 for more details. Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Tue Jul 15 16:05:20 2008 @@ -50,7 +50,7 @@ .. répertoire parent\n\ - répertoire précédent\n\n\ /D Changera le lecteur et le répertoire courant.\n\n\ -Taper CD lecteur: pour affiche le répertoire courant sur le disque indiqué.\n\ +Taper CD lecteur: pour afficher le répertoire courant sur le disque indiqué.\n\ Taper CD sans paramètre pour afficher le répertoire courant du disque actuel.\n" STRING_CHCP_HELP, "Affiche ou change la page de codes active.\n\n\ @@ -83,7 +83,7 @@ STRING_CMD_HELP6," [pile de répertoires]" -STRING_CMD_HELP7," [redirections et piping]" +STRING_CMD_HELP7," [redirections et canaux]" STRING_CMD_HELP8, "Démarre une nouvelle instance de l'interpréteur de commandes de ReactOS.\n\n\ CMD [/[C|K] commande][/P][/Q][/T:ap]\n\n\ @@ -124,7 +124,7 @@ /B Spécifie qu'il s'agit d'un fichier binaire.\n\ destination Indique le répertoire ou le nom de fichier\n\ pour le(s) nouveau(x) fichier(s).\n\ - /V Vérifie que les fichier ont été copiés correctement.\n\ + /V Vérifie que les fichiers ont été copiés correctement.\n\ /Y Supprime l'invite de confirmation en cas d'écrasement\n\ d'un fichier destination existant.\n\ /-Y Affiche un invite de confirmation en cas d'écrasement\n\ @@ -153,15 +153,15 @@ /P Demande. Demande avant d'effacer pour chaque fichier.\n\ /T Total. Affiche le total de fichiers effacés et l'espace disque libéré.\n\ /Q Silencieux.\n\ - /W Wipe. Ecrase le fichier avec des nombres aléatoire avant d'effacer.\n\ + /W Wipe. Ecrase le fichier avec des nombres aléatoires avant d'effacer.\n\ /Y Oui. Efface, même *.*, sans demander.\n\ - /F Force la suppression des fichiers cachés, en lecture-seul et système.\n\ + /F Force la suppression des fichiers cachés, en lecture-seule et système.\n\ /S Supprime les fichiers de tous les sous-répertoires.\n\ /A Sélectionne les fichiers à supprimer en fonction des attributs.\n\ attributs\n\ R Fichiers en lecture-seule\n\ S Fichiers système\n\ - A Archiveable files\n\ + A Fichiers archivables\n\ H Fichiers cachés\n\ - préfixe signifiant ne pas\n" @@ -192,7 +192,7 @@ /L Utilise les minuscules.\n\ /N Nouveau format de liste longue où les noms de fichiers sont \n\ sur la droite.\n\ - /O Lister les fichier de façon triée.\n\ + /O Lister les fichiers de façon triée.\n\ ordre de N Par nom (alphabétique) S Par taille (plus petit d'abord)\n\ tri E Par extension tique) D Par date (plus vieux d'abord)\n\ G Répertoires d'abord - Préfixe pour inverser l'ordre\n\ @@ -416,7 +416,7 @@ d'ajouter un fichier source.\n\ /R Remplace les fichiers en lecture-seule aussi bien que les\n\ fichiers sans protection.\n\ - /S Remplaces les fichiers dans tous les sous-répertoires du\n\ + /S Remplace les fichiers dans tous les sous-répertoires du\n\ répertoire de destination. Ne peut être utilisé avec /A\n\ /W Attend que vous insériez un disque avant de commencer.\n\ /U Remplace (met à jour) uniquement les fichiers qui sont plus anciens que\n\ @@ -491,7 +491,7 @@ n peut être :\n\ 0 millisecondes\n\ 1 hh%cmm%css%cdd\n\n\ -Si aucun de ON, OFF or /S n'est spécifié la commande\n\ +En l'absence d'une option ON, OFF ou /S la commande\n\ changera l'état du chronomètre sélectionné\n\n" STRING_TYPE_HELP1, "Affiche le contenu de fichiers textes.\n\nTYPE [lecteur:][chemin]nomfich \n\ @@ -507,7 +507,7 @@ STRING_VERIFY_HELP3, "Vous devez indiquer ON ou OFF." -STRING_VERSION_HELP1, "Affiche les information de version du shell\n\n\ +STRING_VERSION_HELP1, "Affiche les informations de version du shell\n\n\ VER [/C][/R][/W]\n\n\ /C Affiche les crédits.\n\ /R Affiche les informations sur la redistribution.\n\ @@ -565,7 +565,7 @@ ALIAS Défini, supprime ou montre les alias.\n\ ATTRIB Affiche ou change les attributs d'un fichier.\n\ BEEP Émet un bip par le haut-parleur système.\n\ -CALL Appeller un programme batch à partir d'un autre.\n\ +CALL Appelle un programme batch à partir d'un autre.\n\ CD Affiche ou change le répertoire courant.\n\ CHCP Affiche ou défini le numéro de page de codes.\n\ CHOICE Attend après l'utilisateur pour un choix parmi un ensemble de propositions.\n\ @@ -606,14 +606,14 @@ SCREEN Déplace le curseur, optionnellement affiche du texte.\n\ SET Affiche, défini, ou supprime des variables d'environnement de ReactOS.\n\ SHIFT Déplace la position des paramètres remplacables dans un fichier batch.\n" -STRING_HELP2, "START Démarre une fenêtre séparer pour lancer un programme spécifié ou une commande.\n\ +STRING_HELP2, "START Démarre une fenêtre séparée pour lancer un programme spécifié ou une commande.\n\ Exécute la commande.\n\ TIME Affiche ou défini l'heure du système.\n\ TIMER Permet l'utilisation de dix chronomètres.\n\ TITLE Défini le titre de la fenêtre pour une session de CMD.EXE.\n\ TYPE Affiche le contenu d'un fichier texte.\n\ VER Affiche la version de ReactOS.\n\ -VERIFY Spécifie à ReactOS s'il faut vérifier que vous fichiers sont correctement\n\ +VERIFY Spécifie à ReactOS s'il faut vérifier que les fichiers sont correctement\n\ écrit sur un disque.\n\ VOL Affiche le nom de volume d'un disque et son numéro de série.\n" @@ -625,11 +625,11 @@ STRING_ALIAS_ERROR, "Ligne de commande trop longue après remplacement de l'alias!\n" STRING_BATCH_ERROR, "Erreur à l'ouverture du fichier batch\n" STRING_CHCP_ERROR1, "Page de codes actuelle : %u\n" -STRING_CHCP_ERROR4, "Page de code invalide \n" +STRING_CHCP_ERROR4, "Page de codes invalide \n" STRING_CHOICE_ERROR, "Option invalide. Format attendu : /C[:]options" STRING_CHOICE_ERROR_TXT, "Option invalide. Format attendu : /T[:]c,nn" STRING_CHOICE_ERROR_OPTION, "Option invalide : %s" -STRING_MD_ERROR, "Un sous répertoire ou un fichier est déjà existant.\n" +STRING_MD_ERROR, "Un sous répertoire ou un fichier existe déjà.\n" STRING_MD_ERROR2, "Le chemin vers le nouveau répertoire n'existe pas.\n" STRING_CMD_ERROR1, "Ne peut rediriger l'entrée depuis le fichier %s\n" STRING_CMD_ERROR2, "Erreur à la création du fichier temporaire pour les données du pipe\n" @@ -665,7 +665,7 @@ STRING_REN_ERROR1, "MoveFile() a échoué. Erreur : %lu\n" -STRING_START_ERROR1, "No batch support at the moment !" +STRING_START_ERROR1, "Pas de support batch pour l'instant !" STRING_TIME_ERROR1, "Heure invalide." @@ -710,6 +710,6 @@ STRING_INVALID_OPERAND, "Opérande invalide." STRING_EXPECTED_CLOSE_PAREN, "Attendu ')'." STRING_EXPECTED_NUMBER_OR_VARIABLE,"Attendu nombre ou nom de variable." -STRING_SYNTAX_COMMAND_INCORRECT, "La syntaxe the la commande est incorrecte." +STRING_SYNTAX_COMMAND_INCORRECT, "La syntaxe de la commande est incorrecte." END

16 years, 2 months

[silverblade] 34534: Corrected wave output device close routine to ensure the device is "idle" rather than "stopped" (which actually means playback is paused...) Also added code to the I/O completion routine to detect when a submitted WAVEHDR from the client application has finished being played. No WAVEHDRs are returned to the client application (yet...)

by silverblade＠svn.reactos.org

Author: silverblade Date: Tue Jul 15 15:43:32 2008 New Revision: 34534 URL: http://svn.reactos.org/svn/reactos?rev=34534&view=rev Log: Corrected wave output device close routine to ensure the device is "idle" rather than "stopped" (which actually means playback is paused...) Also added code to the I/O completion routine to detect when a submitted WAVEHDR from the client application has finished being played. No WAVEHDRs are returned to the client application (yet...) Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Tue Jul 15 15:43:32 2008 @@ -176,7 +176,14 @@ StreamInfo->CurrentBuffer = StreamInfo->CurrentBuffer->lpNext; } + /* Reset the writing offset */ StreamInfo->BufferOffset = 0; + + if ( StreamInfo->CurrentBuffer ) + { + /* Reset the completion offset */ + StreamInfo->CurrentBuffer->reserved = 0; + } } /* Increase the number of outstanding buffers */ @@ -217,6 +224,7 @@ IN DWORD BytesWritten) { PWAVE_STREAM_INFO StreamInfo; + PWAVEHDR WaveHeader = (PWAVEHDR) Parameter; TRACE_("CompleteWaveBuffer(%p, %p, %d)\n", SoundDeviceInstance, @@ -224,6 +232,25 @@ (int) BytesWritten); ASSERT(SoundDeviceInstance); + ASSERT(WaveHeader); + + WaveHeader->reserved += BytesWritten; + ASSERT(WaveHeader->reserved <= WaveHeader->dwBufferLength); + + if ( WaveHeader->reserved == WaveHeader->dwBufferLength ) + { + TRACE_("* Completed wavehdr %p (length %d)\n", + WaveHeader, + (int) WaveHeader->dwBufferLength); + /* TODO: Give it back to the client */ + } + else + { + TRACE_("* Partial wavehdr completion %p (%d/%d)\n", + WaveHeader, + (int) WaveHeader->reserved, + (int) WaveHeader->dwBufferLength); + } StreamInfo = &SoundDeviceInstance->Streaming.Wave; Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Tue Jul 15 15:43:32 2008 @@ -114,7 +114,8 @@ Result = GetWaveDeviceState(Instance, &State); ASSERT(Result == MMSYSERR_NOERROR); - if ( State == WAVE_DD_PLAYING ) + /* Must not be playing or paused */ + if ( State != WAVE_DD_IDLE ) return WAVERR_STILLPLAYING; Result = DestroySoundDeviceInstance(Instance);

16 years, 2 months

[hpoussin] 34533: Rename makefile.auto to makefile-$(ARCH).auto

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Jul 15 15:42:08 2008 New Revision: 34533 URL: http://svn.reactos.org/svn/reactos?rev=34533&view=rev Log: Rename makefile.auto to makefile-$(ARCH).auto Modified: trunk/reactos/Makefile trunk/reactos/ReactOS-arm.rbuild trunk/reactos/ReactOS-i386.rbuild trunk/reactos/ReactOS-ppc.rbuild Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=34533&r1=3453… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Tue Jul 15 15:42:08 2008 @@ -125,7 +125,7 @@ # -r Input XML # # ROS_AUTOMAKE -# Alternate name of makefile.auto +# Alternate name of makefile-$(ARCH).auto # # ROS_BUILDENGINE # The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET) @@ -158,7 +158,7 @@ endif ifeq ($(ROS_AUTOMAKE),) -ROS_AUTOMAKE=makefile.auto +ROS_AUTOMAKE=makefile-$(ARCH).auto endif all: $(ROS_AUTOMAKE) @@ -167,20 +167,20 @@ .SUFFIXES: ifeq ($(HOST),) -ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) -ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) -export OSTYPE = msys -HOST=mingw32-linux -HOST_CFLAGS+=-fshort-wchar -HOST_CPPFLAGS+=-fshort-wchar -else -HOST=mingw32-windows -endif -else -HOST=mingw32-linux -HOST_CFLAGS+=-fshort-wchar -HOST_CPPFLAGS+=-fshort-wchar -endif + ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) + ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) + export OSTYPE = msys + HOST=mingw32-linux + HOST_CFLAGS+=-fshort-wchar + HOST_CPPFLAGS+=-fshort-wchar + else + HOST=mingw32-windows + endif + else + HOST=mingw32-linux + HOST_CFLAGS+=-fshort-wchar + HOST_CPPFLAGS+=-fshort-wchar + endif endif # Default to half-verbose mode Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=345… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Tue Jul 15 15:42:08 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-arm.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config-arm.rbuild"> <xi:fallback> <xi:include href="config-arm.template.rbuild" /> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=34… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Tue Jul 15 15:42:08 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config.rbuild"> <xi:fallback> <xi:include href="config.template.rbuild" /> Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=345… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] Tue Jul 15 15:42:08 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-ppc.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config-ppc.rbuild"> <xi:fallback> <xi:include href="config-ppc.template.rbuild" />

16 years, 2 months

[gedmurphy] 34532: - Delete the service key along with any subkeys - Delete the service from the internal list - patch by Yuri Sidorov <jura at cp-lab dot com> See issue #3523 for more details.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jul 15 15:41:35 2008 New Revision: 34532 URL: http://svn.reactos.org/svn/reactos?rev=34532&view=rev Log: - Delete the service key along with any subkeys - Delete the service from the internal list - patch by Yuri Sidorov <jura at cp-lab dot com> See issue #3523 for more details. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Tue Jul 15 15:41:35 2008 @@ -322,11 +322,60 @@ } +DWORD +ScmDeleteRegKey(HKEY hKey, LPCWSTR lpszSubKey) +{ + DWORD dwRet, dwMaxSubkeyLen = 0, dwSize; + WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; + HKEY hSubKey = 0; + + dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); + if (!dwRet) + { + /* Find the maximum subkey length so that we can allocate a buffer */ + dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL); + if (!dwRet) + { + dwMaxSubkeyLen++; + if (dwMaxSubkeyLen > sizeof(szNameBuf)/sizeof(WCHAR)) + /* Name too big: alloc a buffer for it */ + lpszName = HeapAlloc(GetProcessHeap(), 0, dwMaxSubkeyLen*sizeof(WCHAR)); + + if(!lpszName) + dwRet = ERROR_NOT_ENOUGH_MEMORY; + else + { + while (dwRet == ERROR_SUCCESS) + { + dwSize = dwMaxSubkeyLen; + dwRet = RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, NULL, NULL, NULL); + if (dwRet == ERROR_SUCCESS || dwRet == ERROR_MORE_DATA) + dwRet = ScmDeleteRegKey(hSubKey, lpszName); + } + if (dwRet == ERROR_NO_MORE_ITEMS) + dwRet = ERROR_SUCCESS; + + if (lpszName != szNameBuf) + HeapFree(GetProcessHeap(), 0, lpszName); /* Free buffer if allocated */ + } + } + + RegCloseKey(hSubKey); + if (!dwRet) + dwRet = RegDeleteKeyW(hKey, lpszSubKey); + } + return dwRet; +} + + VOID ScmDeleteMarkedServices(VOID) { PLIST_ENTRY ServiceEntry; PSERVICE CurrentService; + HKEY hServicesKey; + DWORD dwError; ServiceEntry = ServiceListHead.Flink; while (ServiceEntry != &ServiceListHead) @@ -337,12 +386,24 @@ if (CurrentService->bDeleted == TRUE) { - DPRINT1("Delete service: %S\n", CurrentService->lpServiceName); - - /* FIXME: Delete the registry keys */ - - /* FIXME: Delete the service record from the list */ - + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + DELETE, + &hServicesKey); + if (dwError == ERROR_SUCCESS) + { + dwError = ScmDeleteRegKey(hServicesKey, CurrentService->lpServiceName); + RegCloseKey(hServicesKey); + if (dwError == ERROR_SUCCESS) + { + RemoveEntryList(&CurrentService->ServiceListEntry); + HeapFree(GetProcessHeap(), 0, CurrentService); + } + } + + if (dwError != ERROR_SUCCESS) + DPRINT1("Delete service failed: %S\n", CurrentService->lpServiceName); } } }

16 years, 2 months

[cfinck] 34531: Fix the mess created by SVN's inability to handle with UTF-16 files. Remove the svn:eol-style property and set svn:mime-type to application/octet-stream, so that these files aren't modified by SVN.

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Jul 15 15:11:26 2008 New Revision: 34531 URL: http://svn.reactos.org/svn/reactos?rev=34531&view=rev Log: Fix the mess created by SVN's inability to handle with UTF-16 files. Remove the svn:eol-style property and set svn:mime-type to application/octet-stream, so that these files aren't modified by SVN. Modified: trunk/reactos/media/inf/NET_NIC.inf (contents, props changed) trunk/reactos/media/inf/acpi.inf (contents, props changed) trunk/reactos/media/inf/cdrom.inf (contents, props changed) trunk/reactos/media/inf/cpu.inf (contents, props changed) trunk/reactos/media/inf/display.inf (contents, props changed) trunk/reactos/media/inf/fdc.inf (contents, props changed) trunk/reactos/media/inf/font.inf (contents, props changed) trunk/reactos/media/inf/hdc.inf (contents, props changed) trunk/reactos/media/inf/intl.inf (contents, props changed) trunk/reactos/media/inf/keyboard.inf (contents, props changed) trunk/reactos/media/inf/layout.inf (contents, props changed) trunk/reactos/media/inf/machine.inf (contents, props changed) trunk/reactos/media/inf/msmouse.inf (contents, props changed) trunk/reactos/media/inf/netamd.inf (contents, props changed) trunk/reactos/media/inf/netisa.inf (contents, props changed) trunk/reactos/media/inf/netrtpnt.inf (contents, props changed) trunk/reactos/media/inf/nettcpip.inf (contents, props changed) trunk/reactos/media/inf/ports.inf (contents, props changed) trunk/reactos/media/inf/scsi.inf (contents, props changed) trunk/reactos/media/inf/syssetup.inf.tpl (props changed) trunk/reactos/media/inf/usb.inf (contents, props changed) trunk/reactos/media/inf/usbport.inf (contents, props changed) trunk/reactos/media/inf/usbstor.inf (contents, props changed) trunk/reactos/media/inf/xboxdisp.inf (contents, props changed) Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/NET_NIC.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/NET_NIC.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/acpi.inf?rev=345… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/acpi.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/acpi.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=34… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/cdrom.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/cdrom.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=3453… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/cpu.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/cpu.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/display.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/display.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=3453… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/fdc.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/fdc.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/font.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/font.inf?rev=345… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/font.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/font.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=3453… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/hdc.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/hdc.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/intl.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/intl.inf?rev=345… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/intl.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/intl.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/keyboard.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/keyboard.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/layout.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/layout.inf?rev=3… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/layout.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/layout.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/machine.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/machine.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/msmouse.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/msmouse.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=3… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/netamd.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/netamd.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=3… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/netisa.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/netisa.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtpnt.inf?rev… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/netrtpnt.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/netrtpnt.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/nettcpip.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/nettcpip.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=34… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/ports.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/ports.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=345… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/scsi.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/scsi.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Propchange: trunk/reactos/media/inf/syssetup.inf.tpl ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -CRLF Propchange: trunk/reactos/media/inf/syssetup.inf.tpl ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=3453… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/usb.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/usb.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/usbport.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/usbport.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/usbstor.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/usbstor.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/xboxdisp.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/xboxdisp.inf?rev… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/xboxdisp.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -LF Propchange: trunk/reactos/media/inf/xboxdisp.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

16 years, 2 months

[mkupfer] 34530: - Revert inf back to LF, because of damaged line endings on checkout with CRLF (under linux). - Take care on further change, change only if you are absolutely sure, that all clients can handle it correctly!

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Tue Jul 15 14:43:28 2008 New Revision: 34530 URL: http://svn.reactos.org/svn/reactos?rev=34530&view=rev Log: - Revert inf back to LF, because of damaged line endings on checkout with CRLF (under linux). - Take care on further change, change only if you are absolutely sure, that all clients can handle it correctly! Modified: trunk/reactos/media/inf/NET_NIC.inf (contents, props changed) trunk/reactos/media/inf/acpi.inf (contents, props changed) trunk/reactos/media/inf/cdrom.inf (contents, props changed) trunk/reactos/media/inf/cpu.inf (contents, props changed) trunk/reactos/media/inf/display.inf (contents, props changed) trunk/reactos/media/inf/fdc.inf (contents, props changed) trunk/reactos/media/inf/font.inf (contents, props changed) trunk/reactos/media/inf/hdc.inf (contents, props changed) trunk/reactos/media/inf/intl.inf (contents, props changed) trunk/reactos/media/inf/keyboard.inf (contents, props changed) trunk/reactos/media/inf/layout.inf (contents, props changed) trunk/reactos/media/inf/machine.inf (contents, props changed) trunk/reactos/media/inf/msmouse.inf (contents, props changed) trunk/reactos/media/inf/netamd.inf (contents, props changed) trunk/reactos/media/inf/netisa.inf (contents, props changed) trunk/reactos/media/inf/netrtpnt.inf (contents, props changed) trunk/reactos/media/inf/nettcpip.inf (contents, props changed) trunk/reactos/media/inf/ports.inf (contents, props changed) trunk/reactos/media/inf/scsi.inf (contents, props changed) trunk/reactos/media/inf/usb.inf (contents, props changed) trunk/reactos/media/inf/usbport.inf (contents, props changed) trunk/reactos/media/inf/usbstor.inf (contents, props changed) trunk/reactos/media/inf/xboxdisp.inf (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… Modified: trunk/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/acpi.inf?rev=345… Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=34… Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=3453… Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=3453… Modified: trunk/reactos/media/inf/font.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/font.inf?rev=345… Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=3453… Modified: trunk/reactos/media/inf/intl.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/intl.inf?rev=345… Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… Modified: trunk/reactos/media/inf/layout.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/layout.inf?rev=3… Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=3… Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=3… Modified: trunk/reactos/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtpnt.inf?rev… Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=34… Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=345… Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=3453… Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… Modified: trunk/reactos/media/inf/xboxdisp.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/xboxdisp.inf?rev…

16 years, 2 months

← Newer
1
...
43
44
45
46
47
48
49
...
77
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 July 2008