Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 61971: [explorer_new] - Commit a great experiment for explorer. Our explorer will try to load a library called rshell.dll which will provide an alternative implementation of some fun...
by gadamopoulos＠svn.reactos.org 04 Feb '14

04 Feb '14

Author: gadamopoulos Date: Tue Feb 4 10:41:02 2014 New Revision: 61971 URL: http://svn.reactos.org/svn/reactos?rev=61971&view=rev Log: [explorer_new] - Commit a great experiment for explorer. Our explorer will try to load a library called rshell.dll which will provide an alternative implementation of some functions that are built in in windows shell. These functions are CStartMenu_Constructor, SHCreateDesktop, SHDesktopMessageLoop, WinList_Init and ShellDDEInit. Providing our own implementation for these functions will allow us to make it run in all windows versions up to windows 8 and also test the implementation of our own components that will be placed temporarily in rshell.dll while they are developed and debugged in windows. Added: branches/shell-experiments/base/shell/explorer-new/rshell.c (with props) Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt branches/shell-experiments/base/shell/explorer-new/precomp.h branches/shell-experiments/base/shell/explorer-new/startmnu.c Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Tue Feb 4 10:41:02 2014 @@ -1,3 +1,5 @@ + +PROJECT(SHELL) add_definitions(-DWIN32) @@ -5,6 +7,7 @@ desktop.c dragdrop.c explorer.c + rshell.c settings.c startmnu.c startup.c Modified: branches/shell-experiments/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/precomp.h [iso-8859-1] Tue Feb 4 10:41:02 2014 @@ -167,6 +167,15 @@ IN LPCTSTR lpValue); /* + * rshell.c + */ + +HRESULT +CStartMenu_Constructor( + REFIID riid, + void **ppv); + +/* * traywnd.c */ Added: branches/shell-experiments/base/shell/explorer-new/rshell.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/rshell.c (added) +++ branches/shell-experiments/base/shell/explorer-new/rshell.c [iso-8859-1] Tue Feb 4 10:41:02 2014 @@ -0,0 +1,162 @@ +/* + * ReactOS Explorer + * + * Copyright 2014 Giannis Adamopoulos + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "precomp.h" + +typedef HRESULT(*PSTARTMENU_CONSTRUCTOR)(REFIID riid, void **ppv); + +HRESULT +CStartMenu_Constructor( + REFIID riid, + void **ppv) +{ + HINSTANCE hRShell = LoadLibraryW(L"rshell.dll"); + + if (hRShell) + { + PSTARTMENU_CONSTRUCTOR func = (PSTARTMENU_CONSTRUCTOR)GetProcAddress(hRShell, "CStartMenu_Constructor"); + if(func) + { + return func(riid, ppv); + } + } + + return CoCreateInstance(&CLSID_StartMenu, + NULL, + CLSCTX_INPROC_SERVER, + riid, + ppv); +} + +typedef HANDLE(WINAPI *PSHCREATEDESKTOP)(IShellDesktopTray *ShellDesk); + +HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk) +{ + HINSTANCE hRShell = LoadLibraryW(L"rshell.dll"); + + if (hRShell) + { + PSHCREATEDESKTOP func = (PSHCREATEDESKTOP)GetProcAddress(hRShell, "SHCreateDesktop"); + if (func) + { + return func(ShellDesk); + } + } + + hRShell = LoadLibraryW(L"shell32.dll"); + + if (hRShell) + { + PSHCREATEDESKTOP func = (PSHCREATEDESKTOP)GetProcAddress(hRShell, "SHCreateDesktop"); + if (func) + { + return func(ShellDesk); + } + } + + return 0; +} + +typedef BOOL(WINAPI *PSHDESKTOPMESSAGELOOP)(HANDLE hDesktop); + +BOOL WINAPI SHDesktopMessageLoop(HANDLE hDesktop) +{ + HINSTANCE hRShell = LoadLibraryW(L"rshell.dll"); + + if (hRShell) + { + PSHDESKTOPMESSAGELOOP func = (PSHDESKTOPMESSAGELOOP)GetProcAddress(hRShell, "SHDesktopMessageLoop"); + if (func) + { + return func(hDesktop); + } + } + + hRShell = LoadLibraryW(L"shell32.dll"); + + if (hRShell) + { + PSHDESKTOPMESSAGELOOP func = (PSHDESKTOPMESSAGELOOP)GetProcAddress(hRShell, "SHDesktopMessageLoop"); + if (func) + { + return func(hDesktop); + } + } + + return FALSE; +} + +typedef DWORD(WINAPI* PWINLIST_INIT)(void); + +DWORD WINAPI WinList_Init(void) +{ + HINSTANCE hRShell = LoadLibraryW(L"rshell.dll"); + + if (hRShell) + { + PWINLIST_INIT func = (PWINLIST_INIT)GetProcAddress(hRShell, "WinList_Init"); + if (func) + { + return func(); + } + } + + hRShell = LoadLibraryW(L"shdocvw.dll"); + + if (hRShell) + { + PWINLIST_INIT func = (PWINLIST_INIT)GetProcAddress(hRShell, "WinList_Init"); + if (func) + { + return func(); + } + } + + return 0; +} + +typedef void (WINAPI *PSHELLDDEINIT)(BOOL bInit); + +void WINAPI ShellDDEInit(BOOL bInit) +{ + HINSTANCE hRShell = LoadLibraryW(L"rshell.dll"); + + if (hRShell) + { + PSHELLDDEINIT func = (PSHELLDDEINIT)GetProcAddress(hRShell, "ShellDDEInit"); + if (func) + { + func(bInit); + return; + } + } + + hRShell = LoadLibraryW(L"shell32.dll"); + + if (hRShell) + { + PSHELLDDEINIT func = (PSHELLDDEINIT)GetProcAddress(hRShell, "ShellDDEInit"); + if (func) + { + func(bInit); + return; + } + } +} Propchange: branches/shell-experiments/base/shell/explorer-new/rshell.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/shell-experiments/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/startmnu.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/startmnu.c [iso-8859-1] Tue Feb 4 10:41:02 2014 @@ -848,11 +848,15 @@ if (pSms == NULL) return NULL; +#if 0 hr = CoCreateInstance(&CLSID_StartMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IMenuPopup, (PVOID *)&pMp); +#else + hr = CStartMenu_Constructor(&IID_IMenuPopup,(PVOID *)&pMp); +#endif if (FAILED(hr)) { DbgPrint("CoCreateInstance failed: %x\n", hr);

1 0

[akhaldi] 61970: [MMIXER] * Properly name the main header. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 04 Feb '14

04 Feb '14

Author: akhaldi Date: Tue Feb 4 10:36:20 2014 New Revision: 61970 URL: http://svn.reactos.org/svn/reactos?rev=61970&view=rev Log: [MMIXER] * Properly name the main header. * Improve header inclusions. CORE-7716 Added: trunk/reactos/lib/drivers/sound/mmixer/precomp.h - copied, changed from r61614, trunk/reactos/lib/drivers/sound/mmixer/priv.h Removed: trunk/reactos/lib/drivers/sound/mmixer/priv.h Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/filter.c trunk/reactos/lib/drivers/sound/mmixer/midi.c trunk/reactos/lib/drivers/sound/mmixer/mixer.c trunk/reactos/lib/drivers/sound/mmixer/sup.c trunk/reactos/lib/drivers/sound/mmixer/topology.c trunk/reactos/lib/drivers/sound/mmixer/wave.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Tue Feb 4 10:36:20 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define YDEBUG #include <debug.h> @@ -1761,4 +1761,3 @@ InsertTailList(&MixerInfo->EventList, &EventData->Entry); return MM_STATUS_SUCCESS; } - Modified: trunk/reactos/lib/drivers/sound/mmixer/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/f… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/filter.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/filter.c [iso-8859-1] Tue Feb 4 10:36:20 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define YDEBUG #include <debug.h> Modified: trunk/reactos/lib/drivers/sound/mmixer/midi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/midi.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/midi.c [iso-8859-1] Tue Feb 4 10:36:20 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define YDEBUG #include <debug.h> Modified: trunk/reactos/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Tue Feb 4 10:36:20 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define YDEBUG #include <debug.h> Copied: trunk/reactos/lib/drivers/sound/mmixer/precomp.h (from r61614, trunk/reactos/lib/drivers/sound/mmixer/priv.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/precomp.h [iso-8859-1] Tue Feb 4 10:36:20 2014 @@ -1,4 +1,4 @@ -#include <ntddk.h> +#include <wdm.h> #include <windef.h> #define NOBITMAP #include <mmreg.h> Removed: trunk/reactos/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/priv.h (removed) @@ -1,520 +0,0 @@ -#include <ntddk.h> -#include <windef.h> -#define NOBITMAP -#include <mmreg.h> -#include <ksmedia.h> -#include <mmsystem.h> - -#include "mmixer.h" - -typedef struct __TOPOLOGY_NODE__ -{ - GUID NodeType; - ULONG NodeIndex; - - ULONG NodeConnectedToCount; - struct __TOPOLOGY_NODE__ ** NodeConnectedTo; - - ULONG NodeConnectedFromCount; - struct __TOPOLOGY_NODE__ ** NodeConnectedFrom; - PULONG LogicalPinNodeConnectedFrom; - - ULONG PinConnectedFromCount; - PULONG PinConnectedFrom; - - ULONG PinConnectedToCount; - PULONG PinConnectedTo; - - ULONG Visited; - ULONG Reserved; -}TOPOLOGY_NODE, *PTOPOLOGY_NODE; - -typedef struct -{ - ULONG PinId; - - ULONG NodesConnectedToCount; - PTOPOLOGY_NODE * NodesConnectedTo; - - ULONG NodesConnectedFromCount; - PTOPOLOGY_NODE * NodesConnectedFrom; - - ULONG PinConnectedFromCount; - PULONG PinConnectedFrom; - - ULONG PinConnectedToCount; - PULONG PinConnectedTo; - - ULONG Visited; - ULONG Reserved; -}PIN, *PPIN; - - -typedef struct -{ - ULONG TopologyPinsCount; - PPIN TopologyPins; - - ULONG TopologyNodesCount; - PTOPOLOGY_NODE TopologyNodes; - -}TOPOLOGY, *PTOPOLOGY; - -typedef struct -{ - LIST_ENTRY Entry; - MIXERCAPSW MixCaps; - LIST_ENTRY LineList; - ULONG ControlId; - LIST_ENTRY EventList; -}MIXER_INFO, *LPMIXER_INFO; - -typedef struct -{ - LIST_ENTRY Entry; - MIXERCONTROLW Control; - ULONG NodeID; - HANDLE hDevice; - PVOID ExtraData; -}MIXERCONTROL_EXT, *LPMIXERCONTROL_EXT; - -typedef struct -{ - LIST_ENTRY Entry; - ULONG PinId; - MIXERLINEW Line; - LIST_ENTRY ControlsList; - -}MIXERLINE_EXT, *LPMIXERLINE_EXT; - -typedef struct -{ - LIST_ENTRY Entry; - ULONG dwControlID; -}MIXERCONTROL_DATA, *LPMIXERCONTROL_DATA; - -typedef struct -{ - MIXERCONTROL_DATA Header; - LONG SignedMinimum; - LONG SignedMaximum; - LONG SteppingDelta; - ULONG InputSteppingDelta; - ULONG ValuesCount; - PLONG Values; -}MIXERVOLUME_DATA, *LPMIXERVOLUME_DATA; - -typedef struct -{ - LIST_ENTRY Entry; - ULONG DeviceId; - HANDLE hDevice; - HANDLE hDeviceInterfaceKey; - LPWSTR DeviceName; - PTOPOLOGY Topology; - LPMIXER_INFO MixerInfo; -}MIXER_DATA, *LPMIXER_DATA; - -typedef struct -{ - LIST_ENTRY Entry; - ULONG DeviceId; - ULONG PinId; - union - { - WAVEOUTCAPSW OutCaps; - WAVEINCAPSW InCaps; - }u; -}WAVE_INFO, *LPWAVE_INFO; - -typedef struct -{ - LIST_ENTRY Entry; - ULONG DeviceId; - ULONG PinId; - union - { - MIDIOUTCAPSW OutCaps; - MIDIINCAPSW InCaps; - }u; - -}MIDI_INFO, *LPMIDI_INFO; - -typedef struct -{ - ULONG MixerListCount; - LIST_ENTRY MixerList; - - ULONG MixerDataCount; - LIST_ENTRY MixerData; - - ULONG WaveInListCount; - LIST_ENTRY WaveInList; - - ULONG WaveOutListCount; - LIST_ENTRY WaveOutList; - - ULONG MidiInListCount; - LIST_ENTRY MidiInList; - - ULONG MidiOutListCount; - LIST_ENTRY MidiOutList; -}MIXER_LIST, *PMIXER_LIST; - -typedef struct -{ - LIST_ENTRY Entry; - PVOID MixerEventContext; - PMIXER_EVENT MixerEventRoutine; - -}EVENT_NOTIFICATION_ENTRY, *PEVENT_NOTIFICATION_ENTRY; - -#define DESTINATION_LINE (0xFFFF0000) -#define SOURCE_LINE (0x10000) -ULONG -MMixerGetFilterPinCount( - IN PMIXER_CONTEXT MixerContext, - IN HANDLE hMixer); - -LPGUID -MMixerGetNodeType( - IN PKSMULTIPLE_ITEM MultipleItem, - IN ULONG Index); - -MIXER_STATUS -MMixerGetNodeIndexes( - IN PMIXER_CONTEXT MixerContext, - IN PKSMULTIPLE_ITEM MultipleItem, - IN ULONG NodeIndex, - IN ULONG bNode, - IN ULONG bFrom, - OUT PULONG NodeReferenceCount, - OUT PULONG *NodeReference); - -PKSTOPOLOGY_CONNECTION -MMixerGetConnectionByIndex( - IN PKSMULTIPLE_ITEM MultipleItem, - IN ULONG Index); - -ULONG -MMixerGetControlTypeFromTopologyNode( - IN LPGUID NodeType); - -LPMIXERLINE_EXT -MMixerGetSourceMixerLineByLineId( - LPMIXER_INFO MixerInfo, - DWORD dwLineID); - -MIXER_STATUS -MMixerGetFilterTopologyProperty( - IN PMIXER_CONTEXT MixerContext, - IN HANDLE hMixer, - IN ULONG PropertyId, - OUT PKSMULTIPLE_ITEM * OutMultipleItem); - -VOID -MMixerFreeMixerInfo( - IN PMIXER_CONTEXT MixerContext, - IN LPMIXER_INFO MixerInfo); - -MIXER_STATUS -MMixerGetPhysicalConnection( - IN PMIXER_CONTEXT MixerContext, - IN HANDLE hMixer, - IN ULONG PinId, - OUT PKSPIN_PHYSICALCONNECTION *OutConnection); - -MIXER_STATUS -MMixerSetupFilter( - IN PMIXER_CONTEXT MixerContext, - IN PMIXER_LIST MixerList, - IN LPMIXER_DATA MixerData, - IN PULONG DeviceCount); - -PKSPIN_CONNECT -MMixerAllocatePinConnect( - IN PMIXER_CONTEXT MixerContext, - ULONG DataFormatSize); - -MIXER_STATUS -MMixerGetAudioPinDataRanges( - IN PMIXER_CONTEXT MixerContext, - IN HANDLE hDevice, - IN ULONG PinId, - IN OUT PKSMULTIPLE_ITEM * OutMultipleItem); - -VOID -MMixerInitializeMidiForFilter( - IN PMIXER_CONTEXT MixerContext, - IN PMIXER_LIST MixerList, - IN LPMIXER_DATA MixerData, - IN PTOPOLOGY Topology); - -MIXER_STATUS -MMixerVerifyContext( - IN PMIXER_CONTEXT MixerContext); - -LPMIXER_INFO -MMixerGetMixerInfoByIndex( - IN PMIXER_CONTEXT MixerContext, - IN ULONG MixerIndex); - -LPMIXERLINE_EXT -MMixerGetSourceMixerLineByComponentType( - LPMIXER_INFO MixerInfo, - DWORD dwComponentType); - -MIXER_STATUS -MMixerGetMixerControlById( - LPMIXER_INFO MixerInfo, - DWORD dwControlID, - LPMIXERLINE_EXT *MixerLine, - LPMIXERCONTROL_EXT *MixerControl, - PULONG NodeId); - -MIXER_STATUS -MMixerSetGetMuteControlDetails( - IN PMIXER_CONTEXT MixerContext, - IN LPMIXER_INFO MixerInfo, - IN LPMIXERCONTROL_EXT MixerControl, - IN ULONG dwLineID, - IN LPMIXERCONTROLDETAILS MixerControlDetails, - IN ULONG bSet); - -MIXER_STATUS -MMixerSetGetVolumeControlDetails( - IN PMIXER_CONTEXT MixerContext, - IN LPMIXER_INFO MixerInfo, - IN ULONG NodeId, - IN ULONG bSet, - LPMIXERCONTROL_EXT MixerControl, - IN LPMIXERCONTROLDETAILS MixerControlDetails, - LPMIXERLINE_EXT MixerLine); - -MIXER_STATUS -MMixerSetGetMuxControlDetails( - IN PMIXER_CONTEXT MixerContext, - IN LPMIXER_INFO MixerInfo, - IN ULONG NodeId, - IN ULONG bSet, - IN ULONG Flags, - LPMIXERCONTROL_EXT MixerControl, - IN LPMIXERCONTROLDETAILS MixerControlDetails, - LPMIXERLINE_EXT MixerLine); - - -MIXER_STATUS -MMixerSetGetControlDetails( - IN PMIXER_CONTEXT MixerContext, - IN HANDLE hMixer, - IN ULONG NodeId, - IN ULONG bSet, - IN ULONG PropertyId, - IN ULONG Channel, - IN PLONG InputValue); - -LPMIXER_DATA -MMixerGetDataByDeviceId( - IN PMIXER_LIST MixerList, - IN ULONG DeviceId); - -LPMIXER_DATA -MMixerGetDataByDeviceName( - IN PMIXER_LIST MixerList, - IN LPWSTR DeviceName); - -MIXER_STATUS -MMixerCreateMixerData( - IN PMIXER_CONTEXT MixerContext, - IN PMIXER_LIST MixerList, - IN ULONG DeviceId, - IN LPWSTR DeviceName, - IN HANDLE hDevice, - IN HANDLE hKey); - -MIXER_STATUS -MMixerInitializeWaveInfo( - IN PMIXER_CONTEXT MixerContext, - IN PMIXER_LIST MixerList, - IN LPMIXER_DATA MixerData, - IN LPWSTR DeviceName, - IN ULONG bWaveIn, - IN ULONG PinCount, - IN PULONG Pins); - -MIXER_STATUS -MMixerAddEvent( - IN PMIXER_CONTEXT MixerContext, - IN OUT LPMIXER_INFO MixerInfo, - IN PVOID MixerEvent, - IN PMIXER_EVENT MixerEventRoutine); - -MIXER_STATUS -MMixerGetDeviceName( - IN PMIXER_CONTEXT MixerContext, - OUT LPWSTR DeviceName, - IN HANDLE hKey); - -VOID -MMixerInitializePinConnect( - IN OUT PKSPIN_CONNECT PinConnect, - IN ULONG PinId); - -MIXER_STATUS -MMixerGetPinDataFlowAndCommunication( - IN PMIXER_CONTEXT MixerContext, - IN HANDLE hDevice, - IN ULONG PinId, - OUT PKSPIN_DATAFLOW DataFlow, - OUT PKSPIN_COMMUNICATION Communication); - -VOID -MMixerHandleAlternativeMixers( - IN PMIXER_CONTEXT MixerContext, - IN PMIXER_LIST MixerList, - IN LPMIXER_DATA MixerData, - IN PTOPOLOGY Topology); - -MIXER_STATUS -MMixerGetMixerByName( - IN PMIXER_LIST MixerList, - IN LPWSTR MixerName, - OUT LPMIXER_INFO *MixerInfo); - -/* topology.c */ - -MIXER_STATUS -MMixerCreateTopology( - IN PMIXER_CONTEXT MixerContext, - IN ULONG PinCount, - IN PKSMULTIPLE_ITEM NodeConnections, - IN PKSMULTIPLE_ITEM NodeTypes, - OUT PTOPOLOGY *OutTopology); - -VOID -MMixerGetAllUpOrDownstreamPinsFromNodeIndex( - IN PMIXER_CONTEXT MixerContext, - IN PTOPOLOGY Topology, - IN ULONG NodeIndex, - IN ULONG bUpStream, - OUT PULONG OutPinsCount, - OUT PULONG OutPins); - -MIXER_STATUS -MMixerGetAllUpOrDownstreamPinsFromPinIndex( - IN PMIXER_CONTEXT MixerContext, - IN PTOPOLOGY Topology, - IN ULONG PinIndex, - IN ULONG bUpStream, - OUT PULONG OutPinsCount, - OUT PULONG OutPins); - -VOID -MMixerGetNextNodesFromPinIndex( - IN PMIXER_CONTEXT MixerContext, - IN PTOPOLOGY Topology, - IN ULONG PinIndex, - IN ULONG bUpStream, - OUT PULONG OutNodesCount, - OUT PULONG OutNodes); - -MIXER_STATUS -MMixerAllocateTopologyPinArray( - IN PMIXER_CONTEXT MixerContext, - IN PTOPOLOGY Topology, - OUT PULONG * OutPins); - -MIXER_STATUS -MMixerAllocateTopologyNodeArray( - IN PMIXER_CONTEXT MixerContext, - IN PTOPOLOGY Topology, - OUT PULONG * OutPins); - -VOID -MMixerGetAllUpOrDownstreamNodesFromPinIndex( - IN PMIXER_CONTEXT MixerContext, - IN PTOPOLOGY Topology, - IN ULONG PinIndex, - IN ULONG bUpStream, - OUT PULONG OutNodesCount, - OUT PULONG OutNodes); - -VOID -MMixerIsNodeTerminator( - IN PTOPOLOGY Topology, - IN ULONG NodeIndex, - OUT ULONG * bTerminator); - -VOID -MMixerGetNextNodesFromNodeIndex( - IN PMIXER_CONTEXT MixerContext, - IN PTOPOLOGY Topology, - IN ULONG NodeIndex, - IN ULONG bUpStream, - OUT PULONG OutNodesCount, - OUT PULONG OutNodes); - -LPGUID -MMixerGetNodeTypeFromTopology( - IN PTOPOLOGY Topology, - IN ULONG NodeIndex); - -MIXER_STATUS -MMixerGetAllUpOrDownstreamNodesFromNodeIndex( - IN PMIXER_CONTEXT MixerContext, - IN PTOPOLOGY Topology, - IN ULONG NodeIndex, - IN ULONG bUpStream, - OUT PULONG OutNodesCount, - OUT PULONG OutNodes); - -MIXER_STATUS -MMixerIsNodeConnectedToPin( - IN PMIXER_CONTEXT MixerContext, - IN PTOPOLOGY Topology, - IN ULONG NodeIndex, - IN ULONG PinId, - IN ULONG bUpStream, - OUT PULONG bConnected); - -ULONG -MMixerGetNodeIndexFromGuid( - IN PTOPOLOGY Topology, - IN const GUID *NodeType); - -VOID -MMixerSetTopologyNodeReserved( - IN PTOPOLOGY Topology, - IN ULONG NodeIndex); - -VOID -MMixerIsTopologyNodeReserved( - IN PTOPOLOGY Topology, - IN ULONG NodeIndex, - OUT PULONG bReserved); - -VOID -MMixerSetTopologyPinReserved( - IN PTOPOLOGY Topology, - IN ULONG PinId); - -VOID -MMixerIsTopologyPinReserved( - IN PTOPOLOGY Topology, - IN ULONG PinId, - OUT PULONG bReserved); - -VOID -MMixerGetTopologyPinCount( - IN PTOPOLOGY Topology, - OUT PULONG PinCount); - -VOID -MMixerGetConnectedFromLogicalTopologyPins( - IN PTOPOLOGY Topology, - IN ULONG NodeIndex, - OUT PULONG OutPinCount, - OUT PULONG OutPins); - -VOID -MMixerPrintTopology(); Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Tue Feb 4 10:36:20 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define YDEBUG #include <debug.h> @@ -865,4 +865,3 @@ PinConnect->Priority.PriorityClass = KSPRIORITY_NORMAL; PinConnect->Priority.PrioritySubClass = 1; } - Modified: trunk/reactos/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/t… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/topology.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/topology.c [iso-8859-1] Tue Feb 4 10:36:20 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define YDEBUG #include <debug.h> @@ -1289,8 +1289,3 @@ /* done */ return MM_STATUS_SUCCESS; } - - - - - Modified: trunk/reactos/lib/drivers/sound/mmixer/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/w… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/wave.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/wave.c [iso-8859-1] Tue Feb 4 10:36:20 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */ -#include "priv.h" +#include "precomp.h" #define YDEBUG #include <debug.h> @@ -711,4 +711,3 @@ /* done */ return MM_STATUS_SUCCESS; } -

1 0

[dreimer] 61969: [RAPPS] Dedicated to Amine: Add MS Word/Excel and PowerPoint Viewer to RApps.
by dreimer＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: dreimer Date: Mon Feb 3 22:49:26 2014 New Revision: 61969 URL: http://svn.reactos.org/svn/reactos?rev=61969&view=rev Log: [RAPPS] Dedicated to Amine: Add MS Word/Excel and PowerPoint Viewer to RApps. Added: trunk/reactos/base/applications/rapps/rapps/excelview.txt (with props) trunk/reactos/base/applications/rapps/rapps/pptview.txt (with props) trunk/reactos/base/applications/rapps/rapps/wordview.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/excelview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/excelview.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/excelview.txt [iso-8859-1] Mon Feb 3 22:49:26 2014 @@ -0,0 +1,62 @@ +ï»¿; UTF-8 + +[Section] +Name = Excel Viewer +Version = 2010 +Licence = Unknown +Description = Microsoft Excel Viewer +Size = 74.14 MB +Category = 6 +URLSite = http://support.microsoft.com/kb/180071/ +URLDownload = http://download.microsoft.com/download/e/a/9/ea913c8b-51a7-41b7-8697-9f0d0a… +CDPath = none + +[Section.0407] +Licence = Unbekannt +Size = 51.15 MB +URLDownload = http://download.microsoft.com/download/F/8/8/F88CB355-ECAA-4B74-87D6-C05C81… + +[Section.040a] +Licence = Desconocida +Size = 51.11 MB +URLDownload = http://download.microsoft.com/download/5/D/9/5D9E41A4-22CE-4497-BD7D-368883… + +[Section.040c] +Licence = Inconnue +Size = 51,13 Mo +URLDownload = http://download.microsoft.com/download/0/0/E/00EE9DCF-7BCA-4414-837E-BC3AA2… + +[Section.0410] +Licence = Sconosciuta +Size = 51.1 MB +URLDownload = http://download.microsoft.com/download/0/C/2/0C2ED9D9-6961-47F3-91E0-916E19… + +[Section.0413] +Licence = Ongekend +Size = 50.97 MB +URLDownload = http://download.microsoft.com/download/C/C/6/CC663715-AB58-4CDE-90F1-5A8CF7… + +[Section.0415] +Licence = Nieznana +Size = 51.15 MB +URLDownload = http://download.microsoft.com/download/5/B/A/5BAB0B5A-706D-444C-B90A-1D97DB… + +[Section.0418] +Licence = NecunoscutÄ +Size = 51,14 Mo +URLDownload = http://download.microsoft.com/download/D/D/2/DD28D077-97F3-47C0-9389-0B9879… + +[Section.041f] +Licence = Bilinmiyor +Size = 51.1 MB +URLDownload = http://download.microsoft.com/download/8/5/D/85DCDD24-8237-4334-866D-417F74… + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Size = 51.15 MB +URLDownload = http://download.microsoft.com/download/7/4/9/749A8D59-A2D5-4A64-99CF-5FF4DD… + +[Section.0813] +Licence = Ongekend +Size = 50.97 MB +URLDownload = http://download.microsoft.com/download/C/C/6/CC663715-AB58-4CDE-90F1-5A8CF7… Propchange: trunk/reactos/base/applications/rapps/rapps/excelview.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/pptview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/pptview.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/pptview.txt [iso-8859-1] Mon Feb 3 22:49:26 2014 @@ -0,0 +1,62 @@ +ï»¿; UTF-8 + +[Section] +Name = Powerpoint Viewer +Version = 2010 +Licence = Unknown +Description = Microsoft Powerpoint Viewer +Size = 60.28 MB +Category = 6 +URLSite = http://support.microsoft.com/kb/180071/ +URLDownload = http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8… +CDPath = none + +[Section.0407] +Licence = Unbekannt +Size = 60.43 MB +URLDownload = http://download.microsoft.com/download/9/F/7/9F742C8F-8C70-4498-B4D1-539BE3… + +[Section.040a] +Licence = Desconocida +Size = 60.48 MB +URLDownload = http://download.microsoft.com/download/C/1/A/C1AAD042-4407-4470-97CB-863B86… + +[Section.040c] +Licence = Inconnue +Size = 60,41 Mo +URLDownload = http://download.microsoft.com/download/6/B/4/6B4CA627-C0CD-4B27-BE31-0B87AE… + +[Section.0410] +Licence = Sconosciuta +Size = 60.38 MB +URLDownload = http://download.microsoft.com/download/3/F/A/3FA9171A-B310-4F0D-A33A-B16827… + +[Section.0413] +Licence = Ongekend +Size = 60.33 MB +URLDownload = http://download.microsoft.com/download/9/A/8/9A89B545-E4F4-498C-B265-D74CBB… + +[Section.0415] +Licence = Nieznana +Size = 60.43 MB +URLDownload = http://download.microsoft.com/download/9/E/4/9E4A5F9A-210D-44B7-ADA2-F47CE0… + +[Section.0418] +Licence = NecunoscutÄ +Size = 60,4 Mo +URLDownload = http://download.microsoft.com/download/5/6/E/56E4DBA3-D725-43EA-B1E5-DC1480… + +[Section.041f] +Licence = Bilinmiyor +Size = 60.4 MB +URLDownload = http://download.microsoft.com/download/4/6/4/4641DACB-5DE8-4E3A-B8F4-39A1C7… + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Size = 60.52 MB +URLDownload = http://download.microsoft.com/download/C/E/8/CE879E6E-D3F3-4234-A968-9651A3… + +[Section.0813] +Licence = Ongekend +Size = 60.33 MB +URLDownload = http://download.microsoft.com/download/9/A/8/9A89B545-E4F4-498C-B265-D74CBB… Propchange: trunk/reactos/base/applications/rapps/rapps/pptview.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/wordview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/wordview.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/wordview.txt [iso-8859-1] Mon Feb 3 22:49:26 2014 @@ -0,0 +1,62 @@ +ï»¿; UTF-8 + +[Section] +Name = Word Viewer +Version = 2010 +Licence = Unknown +Description = Microsoft Word Viewer +Size = 24.5 MB +Category = 6 +URLSite = http://support.microsoft.com/kb/180071/ +URLDownload = http://download.microsoft.com/download/6/a/6/6a689355-b155-4fa7-ad8a-dfe150… +CDPath = none + +[Section.0407] +Licence = Unbekannt +Size = 24.56 MB +URLDownload = http://download.microsoft.com/download/d/4/b/d4b23f0e-c8b6-4383-878d-1a8184… + +[Section.040a] +Licence = Desconocida +Size = 24.53 MB +URLDownload = http://download.microsoft.com/download/4/4/c/44c2d552-8b40-464f-8470-b4976d… + +[Section.040c] +Licence = Inconnue +Size = 24,55 Mo +URLDownload = http://download.microsoft.com/download/b/f/3/bf36c75d-2e93-4db1-ace2-1425e5… + +[Section.0410] +Licence = Sconosciuta +Size = 24.52 MB +URLDownload = http://download.microsoft.com/download/f/8/e/f8e9dadd-70bd-4317-a7fe-25d7bf… + +[Section.0413] +Licence = Ongekend +Size = 24.54 MB +URLDownload = http://download.microsoft.com/download/c/1/0/c10e009e-61e2-4b54-8d21-aff378… + +[Section.0415] +Licence = Nieznana +Size = 24.58 MB +URLDownload = http://download.microsoft.com/download/c/e/1/ce1e1286-67a2-4069-a8c4-b3552f… + +[Section.0418] +Licence = NecunoscutÄ +Size = 24,56 Mo +URLDownload = http://download.microsoft.com/download/1/2/3/123d3dc8-6f3f-473f-ac1d-3e3896… + +[Section.041f] +Licence = Bilinmiyor +Size = 24.55 MB +URLDownload = http://download.microsoft.com/download/7/6/e/76efefb4-9575-4903-ac2a-180c28… + +[Section.0422] +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Size = 24.56 MB +URLDownload = http://download.microsoft.com/download/2/b/d/2bd08f27-822b-4c20-936a-0f1d91… + +[Section.0813] +Licence = Ongekend +Size = 24.54 MB +URLDownload = http://download.microsoft.com/download/c/1/0/c10e009e-61e2-4b54-8d21-aff378… Propchange: trunk/reactos/base/applications/rapps/rapps/wordview.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 61968: [mplay32] Media Player error handling by Ricardo Hanke CORE-7800 #resolve #comment Committed in r61968. Thx for help.
by dreimer＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: dreimer Date: Mon Feb 3 20:32:25 2014 New Revision: 61968 URL: http://svn.reactos.org/svn/reactos?rev=61968&view=rev Log: [mplay32] Media Player error handling by Ricardo Hanke CORE-7800 #resolve #comment Committed in r61968. Thx for help. Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc trunk/reactos/base/applications/mplay32/lang/de-DE.rc trunk/reactos/base/applications/mplay32/lang/en-US.rc trunk/reactos/base/applications/mplay32/lang/es-ES.rc trunk/reactos/base/applications/mplay32/lang/fr-FR.rc trunk/reactos/base/applications/mplay32/lang/he-IL.rc trunk/reactos/base/applications/mplay32/lang/it-IT.rc trunk/reactos/base/applications/mplay32/lang/ja-JP.rc trunk/reactos/base/applications/mplay32/lang/nl-NL.rc trunk/reactos/base/applications/mplay32/lang/no-NO.rc trunk/reactos/base/applications/mplay32/lang/pl-PL.rc trunk/reactos/base/applications/mplay32/lang/pt-BR.rc trunk/reactos/base/applications/mplay32/lang/ro-RO.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/sk-SK.rc trunk/reactos/base/applications/mplay32/lang/sq-AL.rc trunk/reactos/base/applications/mplay32/lang/sv-SE.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/lang/uk-UA.rc trunk/reactos/base/applications/mplay32/lang/zh-CN.rc trunk/reactos/base/applications/mplay32/lang/zh-TW.rc trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/mplay32/resource.h Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -38,4 +38,5 @@ IDS_APPTITLE "ÐÑÐ»ÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½Ð¸ÑÑ Ð²ÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ» Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" IDS_PLAY "ÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -39,4 +39,5 @@ IDS_APPTITLE "ReactOS PÅehrÃ¡vaÄ multimÃ©diÃ" IDS_PLAY "PÅehrÃ¡t" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -34,4 +34,5 @@ IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Abspielen" IDS_DEFAULTMCIERRMSG "FÃ¼r diesen Fehler steht keine Beschreibung zur VerfÃ¼gung" + IDS_UNKNOWNFILEEXT "Kann keinen GerÃ¤tetyp aus der angegebenen Dateinamenerweiterung ermitteln." END Modified: trunk/reactos/base/applications/mplay32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -34,4 +34,5 @@ IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Play" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -34,4 +34,5 @@ IDS_APPTITLE "Reproductor Multimedia de ReactOS" IDS_PLAY "Reproducir" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -34,4 +34,5 @@ IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Lire" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -34,4 +34,5 @@ IDS_APPTITLE "× ×× ×××××××××× ×©× ReactOS" IDS_PLAY "× ××" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -34,4 +34,5 @@ IDS_APPTITLE "Riproduttore multimediale ReactOS" IDS_PLAY "Riproduci" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -34,4 +34,5 @@ IDS_APPTITLE "ReactOS ãã«ãã¡ãã£ã¢ ãã¬ã¼ã¤ã¼" IDS_PLAY "åç" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -34,4 +34,5 @@ IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Play" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -34,4 +34,5 @@ IDS_APPTITLE "ReactOS Multimedia avspiller" IDS_PLAY "Spill" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -41,4 +41,5 @@ IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "OdtwÃ³rz" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -36,4 +36,5 @@ IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Executar" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -40,4 +40,5 @@ IDS_APPTITLE "Lector multimedia" IDS_PLAY "Lecturare" IDS_DEFAULTMCIERRMSG "Nu existÄ descriere pentru aceastÄ eroare" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -34,4 +34,5 @@ IDS_APPTITLE "ÐÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ ReactOS" IDS_PLAY "ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÑÑÐ¸" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -39,4 +39,5 @@ IDS_APPTITLE "MultimediÃ¡lny prehrÃ¡vaÄ systÃ©mu ReactOS" IDS_PLAY "PrehraÅ¥" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -38,4 +38,5 @@ IDS_APPTITLE "Programi muzikor i ReactOS" IDS_PLAY "Fillo" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -41,4 +41,5 @@ IDS_APPTITLE "ReactOS Multimediaspelare" IDS_PLAY "Play" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -36,4 +36,5 @@ IDS_APPTITLE "Ortam OynatÄ±cÄ±sÄ±" IDS_PLAY "Ãal" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END 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] Mon Feb 3 20:32:25 2014 @@ -42,4 +42,5 @@ IDS_APPTITLE "ÐÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ ReactOS" IDS_PLAY "ÐÑÐ´ÑÐ²Ð¾ÑÐ¸ÑÐ¸" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -36,4 +36,5 @@ IDS_APPTITLE "ReactOS å¤åªä½ææ¾å¨" IDS_PLAY "ææ¾" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -42,4 +42,5 @@ IDS_APPTITLE "ReactOS å¤åªé«ææ¾å¨" IDS_PLAY "ææ¾" IDS_DEFAULTMCIERRMSG "No description is available for this error" + IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -216,7 +216,7 @@ DisableMenuItems(); - return TRUE; + return 0; } static DWORD @@ -241,7 +241,6 @@ dwError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT | MCI_WAIT, (DWORD_PTR)&mciOpen); if (dwError != 0) { - ShowMCIError(hwnd, dwError); return dwError; } @@ -250,7 +249,6 @@ dwError = mciSendCommand(mciOpen.wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR)&mciStatus); if (dwError != 0) { - ShowMCIError(hwnd, dwError); return dwError; } @@ -287,7 +285,7 @@ EnableMenuItems(); - return TRUE; + return 0; } static VOID @@ -415,7 +413,7 @@ dwError = mciSendCommand(wDeviceId, MCI_CONFIGURE, MCI_WAIT, (DWORD_PTR)&mciGeneric); if (dwError != 0) { - MessageBox(0, _T("Can't display the device properties!"), NULL, MB_OK); + ShowMCIError(hwnd, dwError); } } @@ -448,7 +446,6 @@ TCHAR szLocalFileName[MAX_PATH]; TCHAR szDeviceName[MAX_PATH]; DWORD dwSize; - BOOL IsSupported; MCIERROR mciError; if (lpFileName == NULL) @@ -470,11 +467,21 @@ dwSize = sizeof(szDeviceName) - 2; _tcsnset(szDeviceName, _T('\0'), dwSize / sizeof(TCHAR)); - IsSupported = IsSupportedFileExtension(szLocalFileName, szDeviceName, &dwSize); - - if (IsSupported == TRUE) - { - OpenMciDevice(hwnd, szDeviceName, szLocalFileName); + + if (!IsSupportedFileExtension(szLocalFileName, szDeviceName, &dwSize)) + { + TCHAR szErrorMessage[256]; + + LoadString(hInstance, IDS_UNKNOWNFILEEXT, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR)); + MessageBox(hwnd, szErrorMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION); + return; + } + + mciError = OpenMciDevice(hwnd, szDeviceName, szLocalFileName); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); + return; } SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC) PlayTimerProc); @@ -540,7 +547,7 @@ TCHAR droppedfile[MAX_PATH]; drophandle = (HDROP)wParam; - DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile)); + DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile) / sizeof(TCHAR)); DragFinish(drophandle); PlayFile(hwnd, droppedfile); break; Modified: trunk/reactos/base/applications/mplay32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] Mon Feb 3 20:32:25 2014 @@ -25,6 +25,7 @@ #define IDS_ALL_TYPES_FILTER 108 #define IDS_PLAY 109 #define IDS_DEFAULTMCIERRMSG 110 +#define IDS_UNKNOWNFILEEXT 111 /* Menu */ #define IDR_MAINMENU 500

1 0

[dreimer] 61967: Fix my german translation a bit.
by dreimer＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: dreimer Date: Mon Feb 3 20:28:31 2014 New Revision: 61967 URL: http://svn.reactos.org/svn/reactos?rev=61967&view=rev Log: Fix my german translation a bit. Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] Mon Feb 3 20:28:31 2014 @@ -198,8 +198,8 @@ IDS_ERROR_SYMBOL_SEPARATE "Das eingegebene kurze Datumstrennzeichen enthÃ¤lt falsche Symbole" IDS_ERROR_SYMBOL_FORMAT_SHORT "Das eingegebene kurze Datumsformat enthÃ¤lt falsche Symbole" IDS_ERROR_SYMBOL_FORMAT_LONG "Das eingegebene lange Datumsformat enthÃ¤lt falsche Symbole" - IDS_ERROR_OEM_CODE_PAGE "OEM-Codepage konnte nicht gelesen werden" - IDS_ERROR_ANSI_CODE_PAGE "ANSI-Codepage konnte nicht gelesen werden" + IDS_ERROR_OEM_CODE_PAGE "Die OEM-Codepage konnte nicht gelesen werden" + IDS_ERROR_ANSI_CODE_PAGE "Die ANSI-Codepage konnte nicht gelesen werden" IDS_ERROR_INT_KEY_REG "Der SchlÃ¼ssel HKCU\\Control Panel\\International konnte nicht geÃ¶ffnet werden" IDS_ERROR_DEF_INT_KEY_REG "Der SchlÃ¼ssel HKU\\.DEFAULT\\Control Panel\\International konnte nicht geÃ¶ffnet werden" IDS_ERROR_NLS_KEY_REG "Der SchlÃ¼ssel HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language konnte nicht geÃ¶ffnet werden"

1 0

[akhaldi] 61966: [INTL] * Fix both IDS_ERROR_NLS_KEY_REG and IDS_ERROR_NLS_CODE_REG to reflect the registry keys they are actually representing. * Update the error message box strings to match ones...
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 20:18:11 2014 New Revision: 61966 URL: http://svn.reactos.org/svn/reactos?rev=61966&view=rev Log: [INTL] * Fix both IDS_ERROR_NLS_KEY_REG and IDS_ERROR_NLS_CODE_REG to reflect the registry keys they are actually representing. * Update the error message box strings to match ones in the English Language File except for the German Language File. This is mostly done to keep better consistency until the strings are translated later on. * By Lee Schroeder. CORE-7843 #resolve #comment Committed in r61966. Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/es-ES.rc trunk/reactos/dll/cpl/intl/lang/fr-FR.rc trunk/reactos/dll/cpl/intl/lang/he-IL.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/no-NO.rc trunk/reactos/dll/cpl/intl/lang/pl-PL.rc trunk/reactos/dll/cpl/intl/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/sk-SK.rc trunk/reactos/dll/cpl/intl/lang/tr-TR.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/intl/lang/zh-CN.rc Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/bg-BG.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -195,14 +195,15 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END + Modified: trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -200,14 +200,14 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -202,7 +202,7 @@ IDS_ERROR_ANSI_CODE_PAGE "ANSI-Codepage konnte nicht gelesen werden" IDS_ERROR_INT_KEY_REG "Der SchlÃ¼ssel HKCU\\Control Panel\\International konnte nicht geÃ¶ffnet werden" IDS_ERROR_DEF_INT_KEY_REG "Der SchlÃ¼ssel HKU\\.DEFAULT\\Control Panel\\International konnte nicht geÃ¶ffnet werden" - IDS_ERROR_NLS_KEY_REG "Der SchlÃ¼ssel HKU\\.DEFAULT\\Control Panel\\International konnte nicht geÃ¶ffnet werden" - IDS_ERROR_NLS_CODE_REG "Der SchlÃ¼ssel HKU\\.DEFAULT\\Control Panel\\International konnte nicht geÃ¶ffnet werden" + IDS_ERROR_NLS_KEY_REG "Der SchlÃ¼ssel HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language konnte nicht geÃ¶ffnet werden" + IDS_ERROR_NLS_CODE_REG "Der SchlÃ¼ssel HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage konnte nicht geÃ¶ffnet werden" IDS_ERROR_INPUT_DLL "input.dll konnte nicht geladen werden" END Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -202,7 +202,7 @@ IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" - IDS_ERROR_NLS_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" - IDS_ERROR_NLS_CODE_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Unable to start input.dll" END Modified: trunk/reactos/dll/cpl/intl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/es-ES.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -197,14 +197,15 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END + Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/fr-FR.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -197,14 +197,15 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END + Modified: trunk/reactos/dll/cpl/intl/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/he-IL.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/he-IL.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -197,14 +197,15 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END + Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -197,14 +197,15 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END + Modified: trunk/reactos/dll/cpl/intl/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/no-NO.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -195,14 +195,15 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END + Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/pl-PL.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -203,14 +203,14 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -197,14 +197,15 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END + Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -197,14 +197,15 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END + Modified: trunk/reactos/dll/cpl/intl/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -201,14 +201,15 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END + Modified: trunk/reactos/dll/cpl/intl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/tr-TR.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/tr-TR.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -197,14 +197,14 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/uk-UA.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -203,14 +203,14 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END Modified: trunk/reactos/dll/cpl/intl/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/zh-CN.rc [iso-8859-1] Mon Feb 3 20:18:11 2014 @@ -199,14 +199,15 @@ STRINGTABLE BEGIN IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" - IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" - IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" - IDS_ERROR_INPUT_DLL "Can't start input.dll" -END + IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" + IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" + IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" + IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" + IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" + IDS_ERROR_INPUT_DLL "Unable to start input.dll" +END +

1 0

[dreimer] 61965: [rapps] rapps: (for database) Many Improvements and Many Fixes by Erdem Ersoy #resolve #comment Committed in r61963. Thx for help. Btw, stop marking other patches as duplicate of y...
by dreimer＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: dreimer Date: Mon Feb 3 20:04:09 2014 New Revision: 61965 URL: http://svn.reactos.org/svn/reactos?rev=61965&view=rev Log: [rapps] rapps: (for database) Many Improvements and Many Fixes by Erdem Ersoy #resolve #comment Committed in r61963. Thx for help. Btw, stop marking other patches as duplicate of yours! The first one is the Original, not your's and you make YOUR'S the duplicate. Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/alreader.txt trunk/reactos/base/applications/rapps/rapps/chromium.txt trunk/reactos/base/applications/rapps/rapps/fira.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/stamina.txt trunk/reactos/base/applications/rapps/rapps/supertux.txt trunk/reactos/base/applications/rapps/rapps/zaz.txt Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Mon Feb 3 20:04:09 2014 @@ -4,7 +4,7 @@ Name = 7-Zip Version = 9.32a Licence = LGPL -Description = Utility to create and open 7zip, zip, tar, rar and other archive files. +Description = A file archiving utility with support for 7zip, zip, tar, rar and many other archive formats. Size = 1.1 MB Category = 12 URLSite = http://www.7-zip.org/ @@ -12,34 +12,34 @@ CDPath = none [Section.0407] -Description = Tool zum Erstellen und Ãffnen von 7zip, zip, tar, rar und andrern Archiven. +Description = Ein Dateiarchivierungswerkzeug zum Erstellen und Ãffnen von 7zip, zip, tar, rar und vielen anderen Archivformaten. [Section.040a] -Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos. +Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos. (FIXME) [Section.040c] -Description = Utilitaire pour crÃ©er et ouvrir les fichiers 7zip, zip, tar, rar et autres archives. +Description = Utilitaire pour crÃ©er et ouvrir les fichiers 7zip, zip, tar, rar et autres archives. (FIXME) Size = 1,1 Mo [Section.0410] -Description = UtilitÃ per creare e aprire 7zip, zip, tar, rar e altri file archivio. +Description = UtilitÃ per creare e aprire 7zip, zip, tar, rar e altri file archivio. (FIXME) [Section.0413] -Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden. +Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden. (FIXME) [Section.0415] -Description = NarzÄdzie do tworzenia i otwierania plikÃ³w typu 7zip, zip, tar, i innych plikÃ³w archiwizacyjnych. +Description = NarzÄdzie do tworzenia i otwierania plikÃ³w typu 7zip, zip, tar, i innych plikÃ³w archiwizacyjnych. (FIXME) [Section.0418] -Description = Utilitar pentru crearea Èi deschiderea arhivelor 7zip, zip, tar, rar Èi altele. +Description = Utilitar pentru crearea Èi deschiderea arhivelor 7zip, zip, tar, rar Èi altele. (FIXME) Size = 1,1 Mo [Section.041f] -Description = 7z, zip, tar, rar ve diÄer birÃ§ok sÄ±kÄ±ÅtÄ±rma biÃ§imini destekleyen bir araÃ§. +Description = 7zip, zip, tar, rar ve diÄer birÃ§ok tÃ¼rdeki belgelikleri destekleyen bir belgelikleme aracÄ±dÄ±r. Size = 1,1 MB [Section.0422] -Description = Ð£ÑÐ¸Ð»ÑÑÐ° Ð´Ð»Ñ ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÐ° Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ 7zip, zip, tar, rar ÑÐ° ÑÐ½ÑÐ¸Ñ Ð°ÑÑÑÐ²Ð½Ð¸Ñ ÑÐ°Ð¹Ð»ÑÐ². +Description = Ð£ÑÐ¸Ð»ÑÑÐ° Ð´Ð»Ñ ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÐ° Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ 7zip, zip, tar, rar ÑÐ° ÑÐ½ÑÐ¸Ñ Ð°ÑÑÑÐ²Ð½Ð¸Ñ ÑÐ°Ð¹Ð»ÑÐ². (FIXME) [Section.0813] -Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden. +Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden. (FIXME) Modified: trunk/reactos/base/applications/rapps/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/alreader.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/alreader.txt [iso-8859-1] Mon Feb 3 20:04:09 2014 @@ -2,6 +2,7 @@ [Section] Name = AlReader +Version = 110502 Description = A FB2 eBook Reader. URLSite = http://www.alreader.com Size = 4.6 MB Modified: trunk/reactos/base/applications/rapps/rapps/chromium.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/chromium.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/chromium.txt [iso-8859-1] Mon Feb 3 20:04:09 2014 @@ -8,7 +8,7 @@ Size = 2.3 MB Category = 4 URLSite = http://chromium-bsu.sourceforge.net -URLDownload = http://files1.freesoft.ru/rep/701665/chromium-0.9.13.2.exe +URLDownload = http://download.sourceforge.net/project/chromium-bsu/Chromium%20B.S.U.%20Wi… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/fira.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/fira.txt [iso-8859-1] Mon Feb 3 20:04:09 2014 @@ -23,5 +23,5 @@ [Section.041f] Name = Mozilla Fira YazÄ± TÃ¼rÃ¼ Licence = Bilinmiyor -Description = Mozilla Fira YazÄ± TÃ¼rÃ¼ Paketi, Mono ve Sans yazÄ± tÃ¼rlerini kapsar. ReactOS'un "Fonts" dizinine Ã§Ä±kartÄ±nÄ±z. +Description = Mozilla Fira YazÄ± TÃ¼rÃ¼ Paketi, Mono ve Sans yazÄ± tÃ¼rlerini kapsar. ReactOS dizinine Ã§Ä±kartÄ±nÄ±z. Size = 543 KB Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Mon Feb 3 20:04:09 2014 @@ -16,8 +16,8 @@ URLSite = http://smplayer.sourceforge.net/de/info [Section.040a] +Description = Interfaz grÃ¡fico para Mplayer (reproductor multimedia). URLSite = http://smplayer.sourceforge.net/es/info -Description = Interfaz grÃ¡fico para Mplayer (reproductor multimedia). [Section.040c] Size = 16,98 Mo @@ -30,8 +30,8 @@ Description = Mediaspeler, grafische interface voor MPlayer. [Section.0415] +Description = Graficzna nakÅadka na MPlayer, otwarty odtwarzacz filmÃ³w. URLSite = http://smplayer.sourceforge.net/pl/info -Description = Graficzna nakÅadka na MPlayer, otwarty odtwarzacz filmÃ³w. [Section.0418] Description = Lector multimedia (interfaÈÄ pentru MPlayer). @@ -43,8 +43,8 @@ URLSite = http://smplayer.sourceforge.net/tr/info [Section.0422] +Description = ÐÑÐ°ÑÑÑÐ½Ð¸Ð¹ ÑÐ½ÑÐµÑÑÐµÐ¹Ñ Ð´Ð»Ñ MPlayer (Ð¼ÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¸Ð¹ Ð¿Ð»ÐµÑÑ). URLSite = http://smplayer.sourceforge.net/uk/info -Description = ÐÑÐ°ÑÑÑÐ½Ð¸Ð¹ ÑÐ½ÑÐµÑÑÐµÐ¹Ñ Ð´Ð»Ñ MPlayer (Ð¼ÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¸Ð¹ Ð¿Ð»ÐµÑÑ). [Section.0813] Description = Mediaspeler, grafische interface voor MPlayer. Modified: trunk/reactos/base/applications/rapps/rapps/stamina.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/stamina.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/stamina.txt [iso-8859-1] Mon Feb 3 20:04:09 2014 @@ -2,7 +2,7 @@ [Section] Name = Stamina 2.5 -Description = Free typing tutor. +Description = Free typing tutor. To run this program, please install the Microsoft Visual C++ 6 Redistributable Package. URLSite = http://stamina.ru Size = 4.7 MB Category = 8 @@ -10,12 +10,12 @@ CDPath = none [Section.0407] -Description = Ein freies Schreiblernprogramm. +Description = Ein freies Schreiblernprogramm. Um dieses Programm nutzen zu kÃ¶nnen, mÃ¼ssen Sie das Microsoft Visual C++ 6 Redistributable Package installieren. [Section.0418] -Description = Tutor gratuit pentru dactilografiere. +Description = Tutor gratuit pentru dactilografiere. (FIXME) Size = 4,7 Mo [Section.041f] -Description = Ãcretsiz bir dÃ¼Äme takÄ±mÄ±nda yazma Ã¶Äreticisi. +Description = Ãcretsiz bir dÃ¼Äme takÄ±mÄ±nda yazma Ã¶Äreticisi. YazÄ±lÄ±mÄ± Ã§alÄ±ÅtÄ±rmk iÃ§in MikroyazÄ±lÄ±m BasarÃ® C++ 6 Yeniden DaÄÄ±tÄ±labilir Paket'i kurunuz. Size = 4,7 MB Modified: trunk/reactos/base/applications/rapps/rapps/supertux.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/supertux.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/supertux.txt [iso-8859-1] Mon Feb 3 20:04:09 2014 @@ -8,7 +8,7 @@ Size = 7.3 MB Category = 4 URLSite = http://www.supertux.lethargik.org -URLDownload = http://files1.freesoft.ru/rep/694851/supertux-0.1.3-setup.exe +URLDownload = http://download.sourceforge.net/project/supertux.berlios/supertux-0.1.3-set… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/zaz.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/zaz.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/zaz.txt [iso-8859-1] Mon Feb 3 20:04:09 2014 @@ -8,7 +8,7 @@ Size = 21.0 MB Category = 4 URLSite = http://zaz.sourceforge.net -URLDownload = http://files1.freesoft.ru/rep/704321/Zaz-1.0.0-Setup.exe +URLDownload = http://download.sourceforge.net/project/zaz/Zaz-1.0.0-Setup.exe CDPath = none [Section.0407]

1 0

[aandrejevic] 61964: [KERNEL32] Halfplement BaseCheckVDM.
by aandrejevic＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: aandrejevic Date: Mon Feb 3 19:00:58 2014 New Revision: 61964 URL: http://svn.reactos.org/svn/reactos?rev=61964&view=rev Log: [KERNEL32] Halfplement BaseCheckVDM. Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] Mon Feb 3 19:00:58 2014 @@ -77,9 +77,354 @@ IN LPSTARTUPINFOW StartupInfo, IN HANDLE hUserToken OPTIONAL) { - /* This is not supported */ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PBASE_CHECK_VDM CheckVdm = &ApiMessage->Data.CheckVDMRequest; + PCSR_CAPTURE_BUFFER CaptureBuffer; + PWCHAR CurrentDir = NULL; + PWCHAR ShortAppName = NULL; + PWCHAR ShortCurrentDir = NULL; + ULONG Length; + PCHAR AnsiCmdLine = NULL; + PCHAR AnsiAppName = NULL; + PCHAR AnsiCurDirectory = NULL; + PCHAR AnsiDesktop = NULL; + PCHAR AnsiTitle = NULL; + PCHAR AnsiReserved = NULL; + STARTUPINFOA AnsiStartupInfo; + ULONG NumStrings = 5; + + if (CurrentDirectory == NULL) + { + /* Allocate memory for the current directory path */ + Length = GetCurrentDirectoryW(0, NULL); + CurrentDir = (PWCHAR)RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + Length * sizeof(WCHAR)); + if (CurrentDir == NULL) + { + Status = STATUS_NO_MEMORY; + goto Cleanup; + } + + /* Get the current directory */ + GetCurrentDirectoryW(Length, CurrentDir); + CurrentDirectory = CurrentDir; + } + + /* Calculate the size of the short application name */ + Length = GetShortPathNameW(ApplicationName, NULL, 0); + + /* Allocate memory for the short application name */ + ShortAppName = (PWCHAR)RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + Length * sizeof(WCHAR)); + if (!ShortAppName) + { + Status = STATUS_NO_MEMORY; + goto Cleanup; + } + + /* Get the short application name */ + if (!GetShortPathNameW(ApplicationName, ShortAppName, Length)) + { + /* Try to determine which error occurred */ + switch (GetLastError()) + { + case ERROR_NOT_ENOUGH_MEMORY: + { + Status = STATUS_NO_MEMORY; + break; + } + + case ERROR_INVALID_PARAMETER: + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + default: + { + Status = STATUS_OBJECT_PATH_INVALID; + } + } + + goto Cleanup; + } + + /* Calculate the size of the short current directory path */ + Length = GetShortPathNameW(CurrentDirectory, NULL, 0); + + /* Allocate memory for the short current directory path */ + ShortCurrentDir = (PWCHAR)RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + Length * sizeof(WCHAR)); + if (!ShortCurrentDir) + { + Status = STATUS_NO_MEMORY; + goto Cleanup; + } + + /* Get the short current directory path */ + if (!GetShortPathNameW(CurrentDirectory, ShortCurrentDir, Length)) + { + /* Try to determine which error occurred */ + switch (GetLastError()) + { + case ERROR_NOT_ENOUGH_MEMORY: + { + Status = STATUS_NO_MEMORY; + break; + } + + case ERROR_INVALID_PARAMETER: + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + default: + { + Status = STATUS_OBJECT_PATH_INVALID; + } + } + goto Cleanup; + } + + /* Setup the input parameters */ + CheckVdm->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + CheckVdm->BinaryType = BinaryType; + CheckVdm->CodePage = CP_ACP; + CheckVdm->dwCreationFlags = CreationFlags; + CheckVdm->CurDrive = CurrentDirectory[0] - L'A'; + CheckVdm->CmdLen = wcslen(CommandLine) + 1; + CheckVdm->AppLen = wcslen(ShortAppName) + 1; + CheckVdm->PifLen = 0; // TODO: PIF file support! + CheckVdm->CurDirectoryLen = wcslen(ShortCurrentDir) + 1; + CheckVdm->EnvLen = AnsiEnvironment->Length; + CheckVdm->DesktopLen = (StartupInfo->lpDesktop != NULL) ? (wcslen(StartupInfo->lpDesktop) + 1) : 0; + CheckVdm->TitleLen = (StartupInfo->lpTitle != NULL) ? (wcslen(StartupInfo->lpTitle) + 1) : 0; + CheckVdm->ReservedLen = (StartupInfo->lpReserved != NULL) ? (wcslen(StartupInfo->lpReserved) + 1) : 0; + + if (StartupInfo->dwFlags & STARTF_USESTDHANDLES) + { + /* Set the standard handles */ + CheckVdm->StdIn = StartupInfo->hStdInput; + CheckVdm->StdOut = StartupInfo->hStdOutput; + CheckVdm->StdErr = StartupInfo->hStdError; + } + + /* Allocate memory for the ANSI strings */ + AnsiCmdLine = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CheckVdm->CmdLen); + AnsiAppName = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CheckVdm->AppLen); + AnsiCurDirectory = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CheckVdm->CurDirectoryLen); + if (StartupInfo->lpDesktop) AnsiDesktop = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + CheckVdm->DesktopLen); + if (StartupInfo->lpTitle) AnsiTitle = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + CheckVdm->TitleLen); + if (StartupInfo->lpReserved) AnsiReserved = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + CheckVdm->ReservedLen); + + if (!AnsiCmdLine + || !AnsiAppName + || !AnsiCurDirectory + || (StartupInfo->lpDesktop && !AnsiDesktop) + || (StartupInfo->lpTitle && !AnsiTitle) + || (StartupInfo->lpReserved && !AnsiReserved)) + { + Status = STATUS_NO_MEMORY; + goto Cleanup; + } + + /* Convert the command line into an ANSI string */ + WideCharToMultiByte(CP_ACP, + 0, + CommandLine, + CheckVdm->CmdLen, + AnsiCmdLine, + CheckVdm->CmdLen, + NULL, + NULL); + + /* Convert the short application name into an ANSI string */ + WideCharToMultiByte(CP_ACP, + 0, + ShortAppName, + CheckVdm->AppLen, + AnsiAppName, + CheckVdm->AppLen, + NULL, + NULL); + + /* Convert the short current directory path into an ANSI string */ + WideCharToMultiByte(CP_ACP, + 0, + ShortCurrentDir, + CheckVdm->CurDirectoryLen, + AnsiCurDirectory, + CheckVdm->CurDirectoryLen, + NULL, + NULL); + + if (StartupInfo->lpDesktop) + { + /* Convert the desktop name into an ANSI string */ + WideCharToMultiByte(CP_ACP, + 0, + StartupInfo->lpDesktop, + CheckVdm->DesktopLen, + AnsiDesktop, + CheckVdm->DesktopLen, + NULL, + NULL); + NumStrings++; + } + + if (StartupInfo->lpTitle) + { + /* Convert the title into an ANSI string */ + WideCharToMultiByte(CP_ACP, + 0, + StartupInfo->lpTitle, + CheckVdm->TitleLen, + AnsiTitle, + CheckVdm->TitleLen, + NULL, + NULL); + NumStrings++; + } + + if (StartupInfo->lpReserved) + { + /* Convert the reserved value into an ANSI string */ + WideCharToMultiByte(CP_ACP, + 0, + StartupInfo->lpReserved, + CheckVdm->ReservedLen, + AnsiReserved, + CheckVdm->ReservedLen, + NULL, + NULL); + NumStrings++; + } + + /* Fill the ANSI startup info structure */ + RtlCopyMemory(&AnsiStartupInfo, StartupInfo, sizeof(STARTUPINFO)); + AnsiStartupInfo.lpReserved = AnsiReserved; + AnsiStartupInfo.lpDesktop = AnsiDesktop; + AnsiStartupInfo.lpTitle = AnsiTitle; + + /* Allocate the capture buffer */ + CaptureBuffer = CsrAllocateCaptureBuffer(NumStrings, + CheckVdm->CmdLen + + CheckVdm->AppLen + + CheckVdm->PifLen + + CheckVdm->CurDirectoryLen + + CheckVdm->DesktopLen + + CheckVdm->TitleLen + + CheckVdm->ReservedLen + + CheckVdm->EnvLen + + sizeof(STARTUPINFOA)); + if (CaptureBuffer == NULL) + { + Status = STATUS_NO_MEMORY; + goto Cleanup; + } + + /* Capture the command line */ + CsrCaptureMessageBuffer(CaptureBuffer, + AnsiCmdLine, + CheckVdm->CmdLen, + (PVOID*)&CheckVdm->CmdLine); + + /* Capture the application name */ + CsrCaptureMessageBuffer(CaptureBuffer, + AnsiAppName, + CheckVdm->AppLen, + (PVOID*)&CheckVdm->AppName); + + CheckVdm->PifFile = NULL; // TODO: PIF file support! + + /* Capture the current directory */ + CsrCaptureMessageBuffer(CaptureBuffer, + AnsiCurDirectory, + CheckVdm->CurDirectoryLen, + (PVOID*)&CheckVdm->CurDirectory); + + /* Capture the environment */ + CsrCaptureMessageBuffer(CaptureBuffer, + AnsiEnvironment->Buffer, + CheckVdm->EnvLen, + (PVOID*)&CheckVdm->Env); + + /* Capture the startup info structure */ + CsrCaptureMessageBuffer(CaptureBuffer, + &AnsiStartupInfo, + sizeof(STARTUPINFOA), + (PVOID*)&CheckVdm->StartupInfo); + + if (StartupInfo->lpDesktop) + { + /* Capture the desktop name */ + CsrCaptureMessageBuffer(CaptureBuffer, + AnsiDesktop, + CheckVdm->DesktopLen, + (PVOID*)&CheckVdm->Desktop); + } + else CheckVdm->Desktop = NULL; + + if (StartupInfo->lpTitle) + { + /* Capture the title */ + CsrCaptureMessageBuffer(CaptureBuffer, + AnsiTitle, + CheckVdm->TitleLen, + (PVOID*)&CheckVdm->Title); + } + else CheckVdm->Title = NULL; + + if (StartupInfo->lpReserved) + { + /* Capture the reserved parameter */ + CsrCaptureMessageBuffer(CaptureBuffer, + AnsiReserved, + CheckVdm->ReservedLen, + (PVOID*)&CheckVdm->Reserved); + } + else CheckVdm->Reserved = NULL; + + /* Send the message to CSRSS */ + Status = CsrClientCallServer((PCSR_API_MESSAGE)ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepCheckVDM), + sizeof(BASE_CHECK_VDM)); + + /* Write back the task ID */ + *iTask = CheckVdm->iTask; + +Cleanup: + + /* Free the ANSI strings */ + if (AnsiCmdLine) RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiCmdLine); + if (AnsiAppName) RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiAppName); + if (AnsiCurDirectory) RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiCurDirectory); + if (AnsiDesktop) RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiDesktop); + if (AnsiTitle) RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiTitle); + if (AnsiReserved) RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiReserved); + + /* Free the capture buffer */ + CsrFreeCaptureBuffer(CaptureBuffer); + + /* Free the short paths */ + if (ShortAppName) RtlFreeHeap(RtlGetProcessHeap(), 0, ShortAppName); + if (ShortCurrentDir) RtlFreeHeap(RtlGetProcessHeap(), 0, ShortCurrentDir); + + /* Free the current directory, if it was allocated here */ + if (CurrentDir) RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentDir); + + return Status; } BOOL

1 0

[akhaldi] 61963: [HIDPARSER] * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 17:32:34 2014 New Revision: 61963 URL: http://svn.reactos.org/svn/reactos?rev=61963&view=rev Log: [HIDPARSER] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/lib/drivers/hidparser/hidparser.h trunk/reactos/lib/drivers/hidparser/parser.h Modified: trunk/reactos/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/hidp… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/hidparser.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/hidparser.h [iso-8859-1] Mon Feb 3 17:32:34 2014 @@ -9,12 +9,6 @@ */ #pragma once - -#define _HIDPI_ -#define _HIDPI_NO_FUNCTION_MACROS_ -#include <ntddk.h> -#include <hidpddi.h> -#include <hidpi.h> // // function prototypes Modified: trunk/reactos/lib/drivers/hidparser/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/pars… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/parser.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/parser.h [iso-8859-1] Mon Feb 3 17:32:34 2014 @@ -1,10 +1,12 @@ - #pragma once -#include <ntddk.h> -#include <assert.h> + +#include <wdm.h> #include <pshpack1.h> +#define _HIDPI_ +#define _HIDPI_NO_FUNCTION_MACROS_ +#include <hidpddi.h> + #include "hidparser.h" -#include <ntddkbd.h> /* * Copyright 2007, Haiku, Inc. All Rights Reserved.

1 0

[akhaldi] 61962: [STRMBASE] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 17:28:51 2014 New Revision: 61962 URL: http://svn.reactos.org/svn/reactos?rev=61962&view=rev Log: [STRMBASE] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/lib/3rdparty/strmbase/dispatch.c trunk/reactos/lib/3rdparty/strmbase/outputqueue.c trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h Modified: trunk/reactos/lib/3rdparty/strmbase/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/disp… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/dispatch.c [iso-8859-1] Mon Feb 3 17:28:51 2014 @@ -19,6 +19,8 @@ */ #include "strmbase_private.h" + +#include <oleauto.h> HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) { Modified: trunk/reactos/lib/3rdparty/strmbase/outputqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/outp… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/outputqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/outputqueue.c [iso-8859-1] Mon Feb 3 17:28:51 2014 @@ -19,6 +19,8 @@ */ #include "strmbase_private.h" + +#include <wine/list.h> enum {SAMPLE_PACKET, EOS_PACKET}; Modified: trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/strm… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h [iso-8859-1] Mon Feb 3 17:28:51 2014 @@ -18,24 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> +#include <wine/config.h> #include <assert.h> +#include <stdarg.h> #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define WIN32_LEAN_AND_MEAN #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION +#include <windef.h> +#include <winbase.h> +#include <objbase.h> #include <dshow.h> -#include <wine/list.h> +#include <wine/debug.h> #include <wine/strmbase.h> #include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(strmbase); /* Quality Control */

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