Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[cwittich] 42465: stub bdasup
by cwittich＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: cwittich Date: Fri Aug 7 15:23:35 2009 New Revision: 42465 URL: http://svn.reactos.org/svn/reactos?rev=42465&view=rev Log: stub bdasup Added: trunk/reactos/drivers/multimedia/bdasup/ (with props) trunk/reactos/drivers/multimedia/bdasup/bdasup.c (with props) trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild (with props) trunk/reactos/drivers/multimedia/bdasup/bdasup.spec (with props) trunk/reactos/include/dxsdk/bdamedia.h (with props) Modified: trunk/reactos/drivers/multimedia/directory.rbuild trunk/reactos/include/ddk/bdasup.h Propchange: trunk/reactos/drivers/multimedia/bdasup/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Aug 7 15:23:35 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/drivers/multimedia/bdasup/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/drivers/multimedia/bdasup/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/drivers/multimedia/bdasup/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c (added) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Fri Aug 7 15:23:35 2009 @@ -1,0 +1,223 @@ + +#include <ntddk.h> +#include <ks.h> + +/* FIXME */ +typedef unsigned long DWORD; +typedef UCHAR BYTE; + +#include <bdatypes.h> +#include <bdamedia.h> +#include <bdasup.h> + +#define NDEBUG +#include <debug.h> + +STDMETHODIMP_(NTSTATUS) BdaCheckChanges(IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaCommitChanges(IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaCreateFilterFactory( + IN PKSDEVICE pKSDevice, + IN const KSFILTER_DESCRIPTOR *pFilterDescriptor, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaCreateFilterFactoryEx( + IN PKSDEVICE pKSDevice, + IN const KSFILTER_DESCRIPTOR *pFilterDescriptor, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate, + OUT PKSFILTERFACTORY *ppKSFilterFactory) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaCreatePin( + IN PKSFILTER pKSFilter, + IN ULONG ulPinType, + OUT ULONG *pulPinId) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaCreateTopology( + IN PKSFILTER pKSFilter, + IN ULONG InputPinId, + IN ULONG OutputPinId) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaDeletePin( + IN PKSFILTER pKSFilter, + IN ULONG *pulPinId) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaFilterFactoryUpdateCacheData( + IN PKSFILTERFACTORY pFilterFactory, + IN const KSFILTER_DESCRIPTOR *pFilterDescriptor OPTIONAL) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaGetChangeState( + IN PIRP Irp, + OUT BDA_CHANGE_STATE *pChangeState) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaInitFilter( + IN PKSFILTER pKSFilter, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaMethodCreatePin( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OUT ULONG *pulPinFactoryID) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaMethodCreateTopology( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OPTIONAL PVOID pvIgnored) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaMethodDeletePin( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OPTIONAL PVOID pvIgnored) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyGetControllingPinId( + IN PIRP Irp, + IN KSP_BDA_NODE_PIN *pProperty, + OUT ULONG *pulControllingPinId) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyGetPinControl( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT ULONG *pulProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeDescriptors( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeEvents( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeMethods( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeProperties( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeTypes( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT ULONG *pulProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyPinTypes( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT ULONG *pulProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaPropertyTemplateConnections( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT KSTOPOLOGY_CONNECTION *pConnectionProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaStartChanges(IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaUninitFilter(IN PKSFILTER pKSFilter) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +STDMETHODIMP_(NTSTATUS) BdaValidateNodeProperty( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} Propchange: trunk/reactos/drivers/multimedia/bdasup/bdasup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild (added) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild [iso-8859-1] Fri Aug 7 15:23:35 2009 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="bdasup" type="kernelmodedriver" installbase="system32/drivers" installname="bdasup.sys" entrypoint="0"> + <importlibrary definition="bdasup.spec" /> + <library>ntoskrnl</library> + <library>ks</library> + <library>pseh</library> + <file>bdasup.c</file> +</module> Propchange: trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/multimedia/bdasup/bdasup.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.spec (added) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.spec [iso-8859-1] Fri Aug 7 15:23:35 2009 @@ -1,0 +1,25 @@ +@ stdcall BdaCheckChanges(ptr) +@ stdcall BdaCommitChanges(ptr) +@ stdcall BdaCreateFilterFactory(ptr ptr ptr) +@ stdcall BdaCreateFilterFactoryEx(ptr ptr ptr ptr) +@ stdcall BdaCreatePin(ptr long ptr) +@ stdcall BdaCreateTopology(ptr long long) +@ stdcall BdaDeletePin(ptr long) +@ stdcall BdaFilterFactoryUpdateCacheData(ptr ptr) +@ stdcall BdaGetChangeState(ptr ptr) +@ stdcall BdaInitFilter(ptr ptr) +@ stdcall BdaMethodCreatePin(ptr ptr ptr) +@ stdcall BdaMethodCreateTopology(ptr ptr ptr) +@ stdcall BdaMethodDeletePin(ptr ptr ptr) +@ stdcall BdaPropertyGetControllingPinId(ptr ptr ptr) +@ stdcall BdaPropertyGetPinControl(ptr ptr ptr) +@ stdcall BdaPropertyNodeDescriptors(ptr ptr ptr) +@ stdcall BdaPropertyNodeEvents(ptr ptr ptr) +@ stdcall BdaPropertyNodeMethods(ptr ptr ptr) +@ stdcall BdaPropertyNodeProperties(ptr ptr ptr) +@ stdcall BdaPropertyNodeTypes(ptr ptr ptr) +@ stdcall BdaPropertyPinTypes(ptr ptr ptr) +@ stdcall BdaPropertyTemplateConnections(ptr ptr ptr) +@ stdcall BdaStartChanges(ptr) +@ stdcall BdaUninitFilter(ptr) +@ stdcall BdaValidateNodeProperty(ptr ptr) Propchange: trunk/reactos/drivers/multimedia/bdasup/bdasup.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/multimedia/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/directo… ============================================================================== --- trunk/reactos/drivers/multimedia/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/directory.rbuild [iso-8859-1] Fri Aug 7 15:23:35 2009 @@ -4,4 +4,7 @@ <directory name="audio"> <xi:include href="audio/directory.rbuild" /> </directory> + <directory name="bdasup"> + <xi:include href="bdasup/bdasup.rbuild" /> + </directory> </group> Modified: trunk/reactos/include/ddk/bdasup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/bdasup.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/bdasup.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/bdasup.h [iso-8859-1] Fri Aug 7 15:23:35 2009 @@ -137,4 +137,4 @@ #if defined(__cplusplus) } -#endif +#endif Added: trunk/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdamedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdamedia.h (added) +++ trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] Fri Aug 7 15:23:35 2009 @@ -1,0 +1,8 @@ + + +typedef struct _KSP_BDA_NODE_PIN { + KSPROPERTY Property; + ULONG ulNodeType; + ULONG ulInputPinId; + ULONG ulOutputPinId; +} KSP_BDA_NODE_PIN, *PKSP_BDA_NODE_PIN; Propchange: trunk/reactos/include/dxsdk/bdamedia.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gschneider] 42464: IntChangeDisplaySettings: set last error before leaving the function NtUserChangeDisplaySettings: copy devmode only if passed, use SEH with buffer probing over CopyFromCaller
by gschneider＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: gschneider Date: Fri Aug 7 14:10:59 2009 New Revision: 42464 URL: http://svn.reactos.org/svn/reactos?rev=42464&view=rev Log: IntChangeDisplaySettings: set last error before leaving the function NtUserChangeDisplaySettings: copy devmode only if passed, use SEH with buffer probing over CopyFromCaller Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Fri Aug 7 14:10:59 2009 @@ -121,7 +121,8 @@ DWORD dwflags, LPVOID lParam) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + LPDEVMODEW lpSafeDevMode = NULL; DEVMODEW DevMode; PUNICODE_STRING pSafeDeviceName = NULL; UNICODE_STRING SafeDeviceName; @@ -147,23 +148,32 @@ } /* Copy devmode */ - Status = MmCopyFromCaller(&DevMode.dmSize, &lpDevMode->dmSize, sizeof (DevMode.dmSize)); - if (!NT_SUCCESS(Status)) + if (lpDevMode != NULL) { - SetLastNtError(Status); - return DISP_CHANGE_BADPARAM; - } - DevMode.dmSize = min(sizeof (DevMode), DevMode.dmSize); - Status = MmCopyFromCaller(&DevMode, lpDevMode, DevMode.dmSize); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return DISP_CHANGE_BADPARAM; - } - if (DevMode.dmDriverExtra > 0) - { - DbgPrint("(%s:%i) WIN32K: %s lpDevMode->dmDriverExtra is IGNORED!\n", __FILE__, __LINE__, __FUNCTION__); - DevMode.dmDriverExtra = 0; + _SEH2_TRY + { + ProbeForRead(lpDevMode, sizeof(DevMode.dmSize), 1); + DevMode.dmSize = lpDevMode->dmSize; + DevMode.dmSize = min(sizeof(DevMode), DevMode.dmSize); + ProbeForRead(lpDevMode, DevMode.dmSize, 1); + RtlCopyMemory(&DevMode, lpDevMode, DevMode.dmSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DISP_CHANGE_BADPARAM; + } + if (DevMode.dmDriverExtra > 0) + { + DPRINT1("lpDevMode->dmDriverExtra is IGNORED!\n"); + DevMode.dmDriverExtra = 0; + } + lpSafeDevMode = &DevMode; } /* Copy the device name */ @@ -179,7 +189,7 @@ } /* Call internal function */ - Ret = IntChangeDisplaySettings(pSafeDeviceName, &DevMode, dwflags, lParam); + Ret = IntChangeDisplaySettings(pSafeDeviceName, lpSafeDevMode, dwflags, lParam); if (pSafeDeviceName != NULL) RtlFreeUnicodeString(pSafeDeviceName); Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Fri Aug 7 14:10:59 2009 @@ -1229,8 +1229,8 @@ { /* Dynamically change graphics mode */ DPRINT1("flag 0 UNIMPLEMENTED\n"); + SetLastWin32Error(ERROR_CALL_NOT_IMPLEMENTED); return DISP_CHANGE_FAILED; - SetLastWin32Error(ERROR_CALL_NOT_IMPLEMENTED); } if ((dwflags & CDS_TEST) == CDS_TEST)

1 0

[gschneider] 42463: Remove deprecated define
by gschneider＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: gschneider Date: Fri Aug 7 14:06:04 2009 New Revision: 42463 URL: http://svn.reactos.org/svn/reactos?rev=42463&view=rev Log: Remove deprecated define Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Aug 7 14:06:04 2009 @@ -76,8 +76,6 @@ return CurIcon; } - -#define COLORCURSORS_ALLOWED FALSE HCURSOR FASTCALL IntSetCursor(

1 0

[cwittich] 42462: add bdasup.h
by cwittich＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: cwittich Date: Fri Aug 7 14:04:50 2009 New Revision: 42462 URL: http://svn.reactos.org/svn/reactos?rev=42462&view=rev Log: add bdasup.h Added: trunk/reactos/include/ddk/bdasup.h (with props) Added: trunk/reactos/include/ddk/bdasup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/bdasup.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/bdasup.h (added) +++ trunk/reactos/include/ddk/bdasup.h [iso-8859-1] Fri Aug 7 14:04:50 2009 @@ -1,0 +1,140 @@ +#if defined(__cplusplus) +extern "C" { +#endif + +#define STDMETHODCALLTYPE __stdcall +typedef GUID *PGUID; + +/* Types */ + +typedef struct _BDA_PIN_PAIRING +{ + ULONG ulInputPin; + ULONG ulOutputPin; + ULONG ulcMaxInputsPerOutput; + ULONG ulcMinInputsPerOutput; + ULONG ulcMaxOutputsPerInput; + ULONG ulcMinOutputsPerInput; + ULONG ulcTopologyJoints; + const ULONG *pTopologyJoints; +} BDA_PIN_PAIRING, *PBDA_PIN_PAIRING; + +typedef struct _BDA_FILTER_TEMPLATE +{ + const KSFILTER_DESCRIPTOR *pFilterDescriptor; + ULONG ulcPinPairs; + const BDA_PIN_PAIRING *pPinPairs; +} BDA_FILTER_TEMPLATE, *PBDA_FILTER_TEMPLATE; + +/* Functions */ + +STDMETHODIMP_(NTSTATUS) BdaCheckChanges(IN PIRP Irp); +STDMETHODIMP_(NTSTATUS) BdaCommitChanges(IN PIRP Irp); + +STDMETHODIMP_(NTSTATUS) BdaCreateFilterFactory( + IN PKSDEVICE pKSDevice, + IN const KSFILTER_DESCRIPTOR *pFilterDescriptor, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate); + +STDMETHODIMP_(NTSTATUS) BdaCreateFilterFactoryEx( + IN PKSDEVICE pKSDevice, + IN const KSFILTER_DESCRIPTOR *pFilterDescriptor, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate, + OUT PKSFILTERFACTORY *ppKSFilterFactory); + +STDMETHODIMP_(NTSTATUS) BdaCreatePin( + IN PKSFILTER pKSFilter, + IN ULONG ulPinType, + OUT ULONG *pulPinId); + +STDMETHODIMP_(NTSTATUS) BdaCreateTopology( + IN PKSFILTER pKSFilter, + IN ULONG InputPinId, + IN ULONG OutputPinId); + +STDMETHODIMP_(NTSTATUS) BdaDeletePin( + IN PKSFILTER pKSFilter, + IN ULONG *pulPinId); + +STDMETHODIMP_(NTSTATUS) BdaFilterFactoryUpdateCacheData( + IN PKSFILTERFACTORY pFilterFactory, + IN const KSFILTER_DESCRIPTOR *pFilterDescriptor OPTIONAL); + +STDMETHODIMP_(NTSTATUS) BdaGetChangeState( + IN PIRP Irp, + OUT BDA_CHANGE_STATE *pChangeState); + +STDMETHODIMP_(NTSTATUS) BdaInitFilter( + IN PKSFILTER pKSFilter, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate); + +STDMETHODIMP_(NTSTATUS) BdaMethodCreatePin( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OUT ULONG *pulPinFactoryID); + +STDMETHODIMP_(NTSTATUS) BdaMethodCreateTopology( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OPTIONAL PVOID pvIgnored); + +STDMETHODIMP_(NTSTATUS) BdaMethodDeletePin( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OPTIONAL PVOID pvIgnored); + +STDMETHODIMP_(NTSTATUS) BdaPropertyGetControllingPinId( + IN PIRP Irp, + IN KSP_BDA_NODE_PIN *pProperty, + OUT ULONG *pulControllingPinId); + +STDMETHODIMP_(NTSTATUS) BdaPropertyGetPinControl( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT ULONG *pulProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeDescriptors( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeEvents( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeMethods( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeProperties( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT GUID *pguidProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyNodeTypes( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT ULONG *pulProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyPinTypes( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT ULONG *pulProperty); + +STDMETHODIMP_(NTSTATUS) BdaPropertyTemplateConnections( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty, + OUT KSTOPOLOGY_CONNECTION *pConnectionProperty); + +STDMETHODIMP_(NTSTATUS) BdaStartChanges(IN PIRP Irp); +STDMETHODIMP_(NTSTATUS) BdaUninitFilter(IN PKSFILTER pKSFilter); + +STDMETHODIMP_(NTSTATUS) BdaValidateNodeProperty( + IN PIRP Irp, + IN KSPROPERTY *pKSProperty); + +#if defined(__cplusplus) +} +#endif Propchange: trunk/reactos/include/ddk/bdasup.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 42461: - winddk.h: Don't define NTSYSAPI and NTSYSCALLAPI -- this is defined in ntdef.h. Use NTSYSAPI for HalDispatchTable instead of DECLSPEC_IMPORT (see below). - wdm.h: Properly define NTKERNELAPI. - ntifs.h: Properly define NTKERNELAPI, and don't redefine NTSYSAPI. - ntoskrnl: Apply the WDK hack for our headers (and gcc) too. Also redefine NTHALAPI for NDK so we don't auto-import KdComPortInUse -- ld complains about this. - Apply this for cmlib, csq and rossym too. - Use this in
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 12:45:59 2009 New Revision: 42461 URL: http://svn.reactos.org/svn/reactos?rev=42461&view=rev Log: - winddk.h: Don't define NTSYSAPI and NTSYSCALLAPI -- this is defined in ntdef.h. Use NTSYSAPI for HalDispatchTable instead of DECLSPEC_IMPORT (see below). - wdm.h: Properly define NTKERNELAPI. - ntifs.h: Properly define NTKERNELAPI, and don't redefine NTSYSAPI. - ntoskrnl: Apply the WDK hack for our headers (and gcc) too. Also redefine NTHALAPI for NDK so we don't auto-import KdComPortInUse -- ld complains about this. - Apply this for cmlib, csq and rossym too. - Use this in HAL too, and redefine NTSYSAPI so we don't auto import some structures from the kernel. Also, don't define __declspec(dllimport) to nothing -- this doesn't work with gcc, and doesn't seem to be necessary. I tried building HAL with the WDK and this wasn't an issue. Modified: trunk/reactos/hal/halarm/include/hal.h trunk/reactos/hal/halppc/include/hal.h trunk/reactos/hal/halx86/include/hal.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ddk/winddk.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/drivers/csq/csq.c trunk/reactos/lib/rossym/initkm.c trunk/reactos/ntoskrnl/include/precomp.h Modified: trunk/reactos/hal/halarm/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halarm/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/include/hal.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -12,14 +12,13 @@ #include <stdio.h> /* WDK HAL Compilation hack */ -#ifdef _MSC_VER #include <excpt.h> #include <ntdef.h> #undef _NTHAL_ #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT -#define __declspec(dllimport) -#endif +#undef NTSYSAPI +#define NTSYSAPI __declspec(dllimport) /* IFS/DDK/NDK Headers */ #include <ntifs.h> Modified: trunk/reactos/hal/halppc/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halppc/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/include/hal.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -12,14 +12,13 @@ #include <stdio.h> /* WDK HAL Compilation hack */ -#ifdef _MSC_VER #include <excpt.h> #include <ntdef.h> #undef _NTHAL_ #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT -#define __declspec(dllimport) -#endif +#undef NTSYSAPI +#define NTSYSAPI __declspec(dllimport) /* IFS/DDK/NDK Headers */ #include <ntifs.h> Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -12,14 +12,13 @@ #include <stdio.h> /* WDK HAL Compilation hack */ -#ifdef _MSC_VER #include <excpt.h> #include <ntdef.h> #undef _NTHAL_ #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT -#define __declspec(dllimport) -#endif +#undef NTSYSAPI +#define NTSYSAPI __declspec(dllimport) /* IFS/DDK/NDK Headers */ #include <ntifs.h> Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -24,12 +24,7 @@ #define _NTIFS_ #define _GNU_NTIFS_ -#ifdef _NTOSKRNL_ -/* HACKHACKHACK!!! We shouldn't include this header from ntoskrnl! */ -#define NTKERNELAPI -#else #define NTKERNELAPI DECLSPEC_IMPORT -#endif #include <ntddk.h> @@ -42,10 +37,6 @@ #ifndef VER_PRODUCTBUILD #define VER_PRODUCTBUILD 10000 -#endif - -#ifndef NTSYSAPI -#define NTSYSAPI #endif #define EX_PUSH_LOCK ULONG_PTR Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4246… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -21,12 +21,7 @@ extern "C" { #endif -#ifdef _NTOSKRNL_ -/* HACKHACKHACK!!! We shouldn't include this header from ntoskrnl! */ -#define NTKERNELAPI -#else #define NTKERNELAPI DECLSPEC_IMPORT -#endif #ifdef _WIN64 #define PORT_MAXIMUM_MESSAGE_LENGTH 512 Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -65,18 +65,6 @@ #else # define _DDK_DUMMYUNION_MEMBER(name) name # define _DDK_DUMMYUNION_N_MEMBER(n, name) name -#endif - -#if !defined(_NTSYSTEM_) -#define NTSYSAPI DECLSPEC_IMPORT -#define NTSYSCALLAPI DECLSPEC_IMPORT -#else -#define NTSYSAPI -#if defined(_NTDLLBUILD_) -#define NTSYSCALLAPI -#else -#define NTSYSCALLAPI DECLSPEC_ADDRSAFE -#endif #endif /* @@ -2866,7 +2854,7 @@ } HAL_DISPATCH, *PHAL_DISPATCH; #if defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTHAL_) -extern DECLSPEC_IMPORT PHAL_DISPATCH HalDispatchTable; +extern NTSYSAPI PHAL_DISPATCH HalDispatchTable; #define HALDISPATCH ((PHAL_DISPATCH)&HalDispatchTable) #else extern DECLSPEC_EXPORT HAL_DISPATCH HalDispatchTable; Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=4246… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -88,7 +88,9 @@ #define CMLTRACE(x, ...) DPRINT(__VA_ARGS__) #endif - + #include <ntdef.h> + #undef DECLSPEC_IMPORT + #define DECLSPEC_IMPORT #include <ntddk.h> #endif Modified: trunk/reactos/lib/drivers/csq/csq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/csq/csq.c?rev=… ============================================================================== --- trunk/reactos/lib/drivers/csq/csq.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/csq/csq.c [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -25,11 +25,9 @@ */ /* $Id$ */ -#ifdef _MSC_VER #include <ntdef.h> #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT -#endif #include <ntifs.h> Modified: trunk/reactos/lib/rossym/initkm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/initkm.c?rev=42… ============================================================================== --- trunk/reactos/lib/rossym/initkm.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/initkm.c [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -7,7 +7,9 @@ * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) */ -#define _NTOSKRNL_ +#include <ntdef.h> +#undef DECLSPEC_IMPORT +#define DECLSPEC_IMPORT #include <ntddk.h> #include <reactos/rossym.h> #include "rossympriv.h" Modified: trunk/reactos/ntoskrnl/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/precomp.h… ============================================================================== --- trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] Fri Aug 7 12:45:59 2009 @@ -14,15 +14,15 @@ /* DDK/IFS/NDK Headers */ #define _REALLY_GET_CALLERS_CALLER -#ifdef _MSC_VER #include <excpt.h> #include <ntdef.h> #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT -#endif #include <ntifs.h> #include <wdmguid.h> #include <arc/arc.h> +#undef NTHALAPI +#define NTHALAPI __declspec(dllimport) #include <ntndk.h> #undef TEXT #define TEXT(s) L##s

1 0

[janderwald] 42460: - Remove hack of starting stream automatically when first IRP has arrived
by janderwald＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: janderwald Date: Fri Aug 7 12:16:25 2009 New Revision: 42460 URL: http://svn.reactos.org/svn/reactos?rev=42460&view=rev Log: - Remove hack of starting stream automatically when first IRP has arrived Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c [iso-8859-1] Fri Aug 7 12:16:25 2009 @@ -946,12 +946,7 @@ if (!NT_SUCCESS(Status)) return FALSE; - if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) - { - /* some should initiate a state request but didnt do it */ - DPRINT1("Starting stream with %lu mappings\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)); - SetStreamState(This, KSSTATE_RUN); - } + StatusBlock->Status = STATUS_PENDING; return TRUE; } @@ -1004,13 +999,7 @@ if (!NT_SUCCESS(Status)) return FALSE; - if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) - { - SetStreamState(This, KSSTATE_RUN); - /* some should initiate a state request but didnt do it */ - DPRINT1("Starting stream with %lu mappings Status %x\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status); - } - + StatusBlock->Status = STATUS_PENDING; return TRUE; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Fri Aug 7 12:16:25 2009 @@ -949,14 +949,8 @@ if (!NT_SUCCESS(Status)) return FALSE; - if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) - { - /* some should initiate a state request but didnt do it */ - DPRINT1("Starting stream with %lu mappings\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)); - - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN); - This->State = KSSTATE_RUN; - } + StatusBlock->Status = STATUS_PENDING; + return TRUE; } @@ -994,13 +988,6 @@ if (!NT_SUCCESS(Status)) return FALSE; - - if (This->State != KSSTATE_RUN) - { - SetStreamState(This, KSSTATE_RUN); - /* some should initiate a state request but didnt do it */ - DPRINT1("Starting stream with %lu mappings Status %x\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status); - } StatusBlock->Status = STATUS_PENDING; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] Fri Aug 7 12:16:25 2009 @@ -888,14 +888,8 @@ if (!NT_SUCCESS(Status)) return FALSE; - if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) - { - /* some should initiate a state request but didnt do it */ - DPRINT1("Starting stream with %lu mappings\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)); - - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN); - This->State = KSSTATE_RUN; - } + /* set pending status as result */ + StatusBlock->Status = STATUS_PENDING; return TRUE; } @@ -948,12 +942,7 @@ if (!NT_SUCCESS(Status)) return FALSE; - if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) - { - SetStreamState(This, KSSTATE_RUN); - /* some should initiate a state request but didnt do it */ - DPRINT1("Starting stream with %lu mappings Status %x\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status); - } + StatusBlock->Status = STATUS_PENDING; if (This->IrpQueue->lpVtbl->HasLastMappingFailed(This->IrpQueue)) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] Fri Aug 7 12:16:25 2009 @@ -878,14 +878,7 @@ if (!NT_SUCCESS(Status)) return FALSE; - if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) - { - /* some should initiate a state request but didnt do it */ - DPRINT1("Starting stream with %lu mappings\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)); - - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN); - This->State = KSSTATE_RUN; - } + StatusBlock->Status = STATUS_PENDING; return TRUE; } @@ -938,13 +931,7 @@ if (!NT_SUCCESS(Status)) return FALSE; - if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) - { - SetStreamState(This, KSSTATE_RUN); - /* some should initiate a state request but didnt do it */ - DPRINT1("Starting stream with %lu mappings Status %x\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status); - } - + StatusBlock->Status = STATUS_PENDING; return TRUE; }

1 0

[janderwald] 42459: - Set the stream state to run when opening the device - Set the stream state to stop when closing the device
by janderwald＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: janderwald Date: Fri Aug 7 12:11:24 2009 New Revision: 42459 URL: http://svn.reactos.org/svn/reactos?rev=42459&view=rev Log: - Set the stream state to run when opening the device - Set the stream state to stop when closing the device Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Fri Aug 7 12:11:24 2009 @@ -205,6 +205,16 @@ DeviceInfo.DeviceType = DeviceType; DeviceInfo.hDevice = SoundDeviceInstance->Handle; + /* First stop the stream */ + DeviceInfo.u.State = KSSTATE_STOP; + SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_SETDEVICE_STATE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + SyncOverlappedDeviceIoControl(KernelHandle, IOCTL_CLOSE_WDMAUD, (LPVOID) &DeviceInfo, @@ -318,6 +328,15 @@ } } + /* Now start the stream */ + DeviceInfo.u.State = KSSTATE_RUN; + SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_SETDEVICE_STATE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); return MMSYSERR_NOERROR; }

1 0

[sginsberg] 42458: - Add inlined assembly for MSVC to _clearfp, _control87, _fpreset, _logb and _statusfp, move fpreset into arch-specific directory and remove x86 #ifdefs from the code. - Disable warning C4733 for __wine_push_frame and __wine_pop_frame
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 11:36:53 2009 New Revision: 42458 URL: http://svn.reactos.org/svn/reactos?rev=42458&view=rev Log: - Add inlined assembly for MSVC to _clearfp, _control87, _fpreset, _logb and _statusfp, move fpreset into arch-specific directory and remove x86 #ifdefs from the code. - Disable warning C4733 for __wine_push_frame and __wine_pop_frame Added: trunk/reactos/lib/sdk/crt/float/i386/fpreset.c (with props) Removed: trunk/reactos/lib/sdk/crt/float/fpreset.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/float/i386/clearfp.c trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c trunk/reactos/lib/sdk/crt/float/i386/logb.c trunk/reactos/lib/sdk/crt/float/i386/statfp.c trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Fri Aug 7 11:36:53 2009 @@ -81,7 +81,6 @@ <file>copysign.c</file> <file>fpclass.c</file> <file>fpecode.c</file> - <file>fpreset.c</file> <file>isnan.c</file> <file>nafter.c</file> <file>scalb.c</file> @@ -89,6 +88,7 @@ <directory name="i386"> <file>clearfp.c</file> <file>cntrlfp.c</file> + <file>fpreset.c</file> <file>logb.c</file> <file>statfp.c</file> </directory> @@ -97,6 +97,7 @@ <directory name="i386"> <file>clearfp.c</file> <file>cntrlfp.c</file> + <file>fpreset.c</file> <file>logb.c</file> <file>statfp.c</file> </directory> Removed: trunk/reactos/lib/sdk/crt/float/fpreset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/fpreset.… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/fpreset.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/fpreset.c (removed) @@ -1,23 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/crt/?????? - * PURPOSE: Unknown - * PROGRAMER: Unknown - * UPDATE HISTORY: - * 25/11/05: Added license header - */ - -#include <precomp.h> - -/********************************************************************* - * _fpreset (MSVCRT.@) - */ -void CDECL _fpreset(void) -{ -#if defined(__GNUC__) && defined(__i386__) - __asm__ __volatile__( "fninit" ); -#else - FIXME(":Not Implemented!\n"); -#endif -} Modified: trunk/reactos/lib/sdk/crt/float/i386/clearfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/cle… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/clearfp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/clearfp.c [iso-8859-1] Fri Aug 7 11:36:53 2009 @@ -18,10 +18,10 @@ unsigned int CDECL _clearfp(void) { unsigned int retVal = _statusfp(); -#if defined(__GNUC__) && defined(__i386__) +#if defined(__GNUC__) __asm__ __volatile__( "fnclex" ); #else - FIXME(":Not Implemented\n"); + __asm fnclex; #endif return retVal; } Modified: trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/cnt… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c [iso-8859-1] Fri Aug 7 11:36:53 2009 @@ -29,12 +29,7 @@ unsigned int CDECL _controlfp(unsigned int newval, unsigned int mask) { -#ifdef __i386__ return _control87( newval, mask & ~_EM_DENORMAL ); -#else - FIXME(":Not Implemented!\n"); - return 0; -#endif } /********************************************************************* @@ -42,14 +37,17 @@ */ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) { -#if defined(__GNUC__) && defined(__i386__) unsigned int fpword = 0; unsigned int flags = 0; TRACE("(%08x, %08x): Called\n", newval, mask); /* Get fp control word */ +#if defined(__GNUC__) __asm__ __volatile__( "fstcw %0" : "=m" (fpword) : ); +#else + __asm fstcw [fpword]; +#endif TRACE("Control word before : %08x\n", fpword); @@ -98,11 +96,11 @@ TRACE("Control word after : %08x\n", fpword); /* Put fp control word */ +#if defined(__GNUC__) __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); +#else + __asm fldcw [fpword]; +#endif return flags; -#else - FIXME(":Not Implemented!\n"); - return 0; -#endif } Added: trunk/reactos/lib/sdk/crt/float/i386/fpreset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/fpr… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/fpreset.c (added) +++ trunk/reactos/lib/sdk/crt/float/i386/fpreset.c [iso-8859-1] Fri Aug 7 11:36:53 2009 @@ -1,0 +1,23 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown + * UPDATE HISTORY: + * 25/11/05: Added license header + */ + +#include <precomp.h> + +/********************************************************************* + * _fpreset (MSVCRT.@) + */ +void CDECL _fpreset(void) +{ +#if defined(__GNUC__) + __asm__ __volatile__( "fninit" ); +#else + __asm fninit; +#endif +} Propchange: trunk/reactos/lib/sdk/crt/float/i386/fpreset.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/float/i386/logb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/log… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/logb.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/logb.c [iso-8859-1] Fri Aug 7 11:36:53 2009 @@ -29,6 +29,10 @@ ("fxtract\n\t" : "=t" (__junk), "=u" (__val) : "0" (__x)); #else + __asm fld [__x]; + __asm fxtract; + __asm fstp st(0); + __asm fstp [__val]; #endif /*__GNUC__*/ return __val; } Modified: trunk/reactos/lib/sdk/crt/float/i386/statfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/sta… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/statfp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/statfp.c [iso-8859-1] Fri Aug 7 11:36:53 2009 @@ -24,19 +24,18 @@ */ unsigned int CDECL _statusfp(void) { - unsigned int retVal = 0; -#if defined(__GNUC__) && defined(__i386__) + unsigned int retVal = 0; unsigned int fpword; - +#if defined(__GNUC__) __asm__ __volatile__( "fstsw %0" : "=m" (fpword) : ); +#else + __asm fstsw [fpword]; +#endif if (fpword & 0x1) retVal |= _SW_INVALID; if (fpword & 0x2) retVal |= _SW_DENORMAL; if (fpword & 0x4) retVal |= _SW_ZERODIVIDE; if (fpword & 0x8) retVal |= _SW_OVERFLOW; if (fpword & 0x10) retVal |= _SW_UNDERFLOW; if (fpword & 0x20) retVal |= _SW_INEXACT; -#else - FIXME(":Not implemented!\n"); -#endif return retVal; } Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Fri Aug 7 11:36:53 2009 @@ -53,6 +53,12 @@ #define EH_NESTED_CALL 0x10 #ifndef _M_ARM + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4733) +#endif + static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { frame->Next = (struct _EXCEPTION_REGISTRATION_RECORD *)__readfsdword(0); @@ -65,6 +71,11 @@ __writefsdword(0, (unsigned long)frame->Next); return frame->Next; } + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #endif #define __TRY _SEH2_TRY

1 0

[janderwald] 42457: [KS] - Remove a hack for sysaudio + kmixer [PORTCLS] - Disable assert untill stream allocator is in place - Remove dead code - Implement IPortPinWaveCyclic_HandleKsStream [KMIXER] - Remove unused code - Implement creating the allocator - Properly implement openening the device [STREAM] - Use GLOBAL as the reference string - Setup a pin create item [SYSAUDIO] - Use reference string GLOBAL to open kmixer - Use reference string GLOBAL for opening sysaudio. Will be removed once b
by janderwald＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: janderwald Date: Fri Aug 7 11:34:52 2009 New Revision: 42457 URL: http://svn.reactos.org/svn/reactos?rev=42457&view=rev Log: [KS] - Remove a hack for sysaudio + kmixer [PORTCLS] - Disable assert untill stream allocator is in place - Remove dead code - Implement IPortPinWaveCyclic_HandleKsStream [KMIXER] - Remove unused code - Implement creating the allocator - Properly implement openening the device [STREAM] - Use GLOBAL as the reference string - Setup a pin create item [SYSAUDIO] - Use reference string GLOBAL to open kmixer - Use reference string GLOBAL for opening sysaudio. Will be removed once bug 4566 is resolved Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Fri Aug 7 11:34:52 2009 @@ -1403,41 +1403,6 @@ /* get device header */ DeviceHeader = DeviceExtension->DeviceHeader; - if (IoStack->FileObject->FileName.Buffer == NULL && DeviceHeader->ItemListCount == 1) - { - /* hack for bug 4566 */ - ASSERT(!IsListEmpty(&DeviceHeader->ItemList)); - /* get create item entry */ - CreateItemEntry = (PCREATE_ITEM_ENTRY)CONTAINING_RECORD(DeviceHeader->ItemList.Flink, CREATE_ITEM_ENTRY, Entry); - - ASSERT(CreateItemEntry->CreateItem); - - if (!CreateItemEntry->CreateItem->Create) - { - /* no valid create item */ - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* return status */ - return STATUS_UNSUCCESSFUL; - } - - /* set object create item */ - KSCREATE_ITEM_IRP_STORAGE(Irp) = CreateItemEntry->CreateItem; - - /* call create function */ - Status = CreateItemEntry->CreateItem->Create(DeviceObject, Irp); - - if (NT_SUCCESS(Status)) - { - /* increment create item reference count */ - InterlockedIncrement(&CreateItemEntry->ReferenceCount); - } - /* return result */ - return Status; - } - - /* hack for bug 4566 */ if (IoStack->FileObject->FileName.Buffer == NULL) { @@ -1448,7 +1413,6 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } - if (IoStack->FileObject->RelatedFileObject != NULL) { Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Fri Aug 7 11:34:52 2009 @@ -124,5 +124,14 @@ IN PKSPIN_CONNECT Connect, IN KSPIN_DESCRIPTOR_EX* Descriptor); +NTSTATUS +KspAddCreateItemToList( + OUT PLIST_ENTRY ListHead, + IN ULONG ItemsCount, + IN PKSOBJECT_CREATE_ITEM ItemsList); + +VOID +KspFreeCreateItems( + IN PLIST_ENTRY ListHead); #endif Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Fri Aug 7 11:34:52 2009 @@ -118,20 +118,30 @@ IN PIRP Irp) { PKSSTREAM_HEADER Header; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - - /* FIXME - * irp should contain the stream header... - */ + //PIO_STACK_LOCATION IoStack; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + +#if 0 + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + ASSERT(IoStack->Parameters.DeviceIoControl.InputBufferLength >= sizeof(KSSTREAM_HEADER)); /* get stream header */ + Header = (KSSTREAM_HEADER*)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; +#else + /* HACK get stream header */ Header = (KSSTREAM_HEADER*)Buffer; + /* HACK untill stream probing is ready */ + Irp->Tail.Overlay.DriverContext[2] = (PVOID)Header; +#endif + + /* sanity check */ + ASSERT(Header); + /* dont exceed max frame size */ - ASSERT(This->MaxFrameSize >= Header->DataUsed); - - /* hack untill stream probing is ready */ - Irp->Tail.Overlay.DriverContext[2] = (PVOID)Header; + //ASSERT(This->MaxFrameSize >= Header->DataUsed); /* increment num mappings */ InterlockedIncrement(&This->NumMappings); @@ -158,6 +168,7 @@ { PIRP Irp; ULONG Offset; + //PIO_STACK_LOCATION IoStack; PKSSTREAM_HEADER StreamHeader; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; @@ -197,8 +208,16 @@ return STATUS_SUCCESS; } +#if 0 + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* get stream header */ + StreamHeader = (PKSSTREAM_HEADER)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; +#else /* HACK get stream header */ StreamHeader = (PKSSTREAM_HEADER)Irp->Tail.Overlay.DriverContext[2]; +#endif /* sanity check */ ASSERT(StreamHeader); @@ -221,6 +240,7 @@ IN IIrpQueue *iface, IN ULONG BytesWritten) { + //PIO_STACK_LOCATION IoStack; PKSSTREAM_HEADER StreamHeader; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; @@ -230,8 +250,19 @@ return; } +#if 0 + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(This->Irp); + + /* get stream header */ + StreamHeader = (PKSSTREAM_HEADER)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; +#else /* HACK get stream header */ StreamHeader = (PKSSTREAM_HEADER)This->Irp->Tail.Overlay.DriverContext[2]; +#endif + + /* sanity check */ + ASSERT(StreamHeader); /* add to current offset */ This->CurrentOffset += BytesWritten; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Fri Aug 7 11:34:52 2009 @@ -35,8 +35,6 @@ BOOL Capture; ULONG TotalPackets; - ULONG PreCompleted; - ULONG PostCompleted; ULONG StopCount; ULONG Delay; @@ -267,11 +265,11 @@ /* store minimum data threshold */ This->IrpQueue->lpVtbl->SetMinimumDataThreshold(This->IrpQueue, MinimumDataThreshold); - DPRINT1("Stopping PreCompleted %u PostCompleted %u StopCount %u MinimumDataThreshold %u\n", This->PreCompleted, This->PostCompleted, This->StopCount, MinimumDataThreshold); + DPRINT1("Stopping TotalPackets %u StopCount %u\n", This->TotalPackets, This->StopCount); } if (This->State == KSSTATE_RUN) { - DPRINT1("State RUN %x MinAvailable %u\n", State, This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue)); + DPRINT1("State RUN %x MinAvailable %u CommonBufferSize %u Offset %u\n", State, This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue), This->CommonBufferSize, This->CommonBufferOffset); } } } @@ -339,7 +337,7 @@ Status = This->IrpQueue->lpVtbl->GetMapping(This->IrpQueue, &Buffer, &BufferSize); if (!NT_SUCCESS(Status)) { - SetStreamState(This, KSSTATE_STOP); + //SetStreamState(This, KSSTATE_STOP); return; } @@ -633,11 +631,24 @@ IN IPortPinWaveCyclic * iface, IN PIRP Irp) { + NTSTATUS Status; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; - DPRINT("IPortPinWaveCyclic_HandleKsStream entered State %u Stream %p\n", This->State, This->Stream); - - return STATUS_PENDING; + InterlockedIncrement((PLONG)&This->TotalPackets); + + DPRINT("IPortPinWaveCyclic_HandleKsStream entered Total %u Pre %u Post %u State %x MinData %u\n", This->TotalPackets, This->State, This->IrpQueue->lpVtbl->NumData(This->IrpQueue)); + + Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, NULL, 0, Irp); + + /* check if pin is in run state */ + if (This->State != KSSTATE_RUN) + { + /* HACK set pin into run state if caller forgot it */ + SetStreamState(This, KSSTATE_RUN); + DPRINT1("Starting stream with %lu mappings Status %x\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status); + } + + return Status; } /* @@ -900,7 +911,6 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - //UNIMPLEMENTED return FALSE; } @@ -925,6 +935,8 @@ PIRP Irp; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; + /* HACK to be removed */ + DPRINT("IPortPinWaveCyclic_fnFastRead entered\n"); Packet = (PCONTEXT_WRITE)Buffer; @@ -967,16 +979,13 @@ NTSTATUS Status; PCONTEXT_WRITE Packet; PIRP Irp; - ULONG PrePostRatio; - ULONG MinData; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; + /* HACK to be removed */ + InterlockedIncrement((PLONG)&This->TotalPackets); - PrePostRatio = (This->PreCompleted * 100) / This->TotalPackets; - MinData = This->IrpQueue->lpVtbl->NumData(This->IrpQueue); - - DPRINT("IPortPinWaveCyclic_fnFastWrite entered Total %u Pre %u Post %u State %x MinData %u Ratio %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted, This->State, This->IrpQueue->lpVtbl->NumData(This->IrpQueue), PrePostRatio); + DPRINT("IPortPinWaveCyclic_fnFastWrite entered Total %u State %x MinData %u\n", This->TotalPackets, This->State, This->IrpQueue->lpVtbl->NumData(This->IrpQueue)); Packet = (PCONTEXT_WRITE)Buffer; Irp = Packet->Irp; @@ -999,7 +1008,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] Fri Aug 7 11:34:52 2009 @@ -28,47 +28,6 @@ NTSTATUS NTAPI -Dispatch_fnRead( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - UNIMPLEMENTED - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -Dispatch_fnWrite( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - UNIMPLEMENTED - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -Dispatch_fnFlush( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - UNIMPLEMENTED - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI Dispatch_fnClose( PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -81,102 +40,18 @@ return STATUS_SUCCESS; } -NTSTATUS -NTAPI -Dispatch_fnQuerySecurity( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - UNIMPLEMENTED - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -Dispatch_fnSetSecurity( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - - UNIMPLEMENTED - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -BOOLEAN -NTAPI -Dispatch_fnFastDeviceIoControl( - PFILE_OBJECT FileObject, - BOOLEAN Wait, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength, - ULONG IoControlCode, - PIO_STATUS_BLOCK IoStatus, - PDEVICE_OBJECT DeviceObject) -{ - UNIMPLEMENTED - - - return FALSE; -} - - -BOOLEAN -NTAPI -Dispatch_fnFastRead( - PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - BOOLEAN Wait, - ULONG LockKey, - PVOID Buffer, - PIO_STATUS_BLOCK IoStatus, - PDEVICE_OBJECT DeviceObject) -{ - UNIMPLEMENTED - - return FALSE; - -} - -BOOLEAN -NTAPI -Dispatch_fnFastWrite( - PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - BOOLEAN Wait, - ULONG LockKey, - PVOID Buffer, - PIO_STATUS_BLOCK IoStatus, - PDEVICE_OBJECT DeviceObject) -{ - UNIMPLEMENTED - - return FALSE; -} - static KSDISPATCH_TABLE DispatchTable = { Dispatch_fnDeviceIoControl, - Dispatch_fnRead, - Dispatch_fnWrite, - Dispatch_fnFlush, + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, Dispatch_fnClose, - Dispatch_fnQuerySecurity, - Dispatch_fnSetSecurity, - Dispatch_fnFastDeviceIoControl, - Dispatch_fnFastRead, - Dispatch_fnFastWrite, + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, + KsDispatchFastIoDeviceControlFailure, + KsDispatchFastWriteFailure, + KsDispatchFastWriteFailure, }; NTSTATUS @@ -192,9 +67,30 @@ /* create the pin */ Status = CreatePin(Irp); - Irp->IoStatus.Information = 0; + /* save result */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + /* complete the request */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + /* done */ + return Status; +} + +NTSTATUS +NTAPI +DispatchCreateKMixAllocator( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + + /* create the allocator */ + Status = KsCreateDefaultAllocator(Irp); + + /* save result */ + Irp->IoStatus.Status = Status; + /* complete the request */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + /* done */ return Status; } @@ -207,15 +103,42 @@ NTSTATUS Status; KSOBJECT_HEADER ObjectHeader; PKSOBJECT_CREATE_ITEM CreateItem; - - static LPWSTR KS_NAME_PIN = L"{146F1A80-4791-11D0-A5D6-28DB04C10000}"; + PKMIXER_DEVICE_EXT DeviceExtension; DPRINT("DispatchCreateKMix entered\n"); + /* check if the request was from usermode */ + if (Irp->RequestorMode == UserMode) + { + /* deny access from usermode */ + Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_DEVICE_REQUEST; + } + + /* get device extension */ + DeviceExtension = (PKMIXER_DEVICE_EXT)DeviceObject->DeviceExtension; + +#if 0 + /* reference the software bus object */ + Status = KsReferenceSoftwareBusObject(DeviceExtension->KsDeviceHeader); + + if (!NT_SUCCESS(Status)) + { + /* failed to reference bus object */ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } +#endif + /* allocate create item */ - CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); + CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM) * 2); if (!CreateItem) { + /* not enough memory */ Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -223,15 +146,23 @@ } /* zero create struct */ - RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); + RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM) * 2); /* initialize pin create item */ - CreateItem->Create = DispatchCreateKMixPin; - RtlInitUnicodeString(&CreateItem->ObjectClass, KS_NAME_PIN); - + CreateItem[0].Create = DispatchCreateKMixPin; + RtlInitUnicodeString(&CreateItem[0].ObjectClass, KSSTRING_Pin); + CreateItem[1].Create = DispatchCreateKMixAllocator; + RtlInitUnicodeString(&CreateItem[1].ObjectClass, KSSTRING_Allocator); /* allocate object header */ - Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &DispatchTable); + Status = KsAllocateObjectHeader(&ObjectHeader, 2, CreateItem, Irp, &DispatchTable); + + if (!NT_SUCCESS(Status)) + { + /* failed to allocate object header */ + ExFreePool(CreateItem); + KsDereferenceSoftwareBusObject(DeviceExtension->KsDeviceHeader); + } DPRINT("KsAllocateObjectHeader result %x\n", Status); /* complete the irp */ @@ -250,18 +181,19 @@ PKSOBJECT_CREATE_ITEM CreateItem; /* allocate create item */ - CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); + CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM) * 2); if (!CreateItem) return STATUS_INSUFFICIENT_RESOURCES; /* initialize create item struct */ - RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); - CreateItem->Create = DispatchCreateKMix; - CreateItem->Flags = KSCREATE_ITEM_WILDCARD; - RtlInitUnicodeString(&CreateItem->ObjectClass, L"KMixer"); + RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM) * 2); + CreateItem[0].Create = DispatchCreateKMix; + RtlInitUnicodeString(&CreateItem[0].ObjectClass, L"GLOBAL"); + CreateItem[1].Create = DispatchCreateKMix; + RtlInitUnicodeString(&CreateItem[1].ObjectClass, KSSTRING_Filter); Status = KsAllocateDeviceHeader(&DeviceExtension->KsDeviceHeader, - 1, + 2, CreateItem); return Status; } Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h [iso-8859-1] Fri Aug 7 11:34:52 2009 @@ -5,6 +5,7 @@ #include <portcls.h> #include <ks.h> #include <ksmedia.h> +#include <swenum.h> #define YDEBUG #include <debug.h> Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] Fri Aug 7 11:34:52 2009 @@ -56,7 +56,7 @@ /* Zero Create item */ RtlZeroMemory(ItemList, sizeof(KSOBJECT_CREATE_ITEM)); /* Setup object class */ - RtlInitUnicodeString(&ItemList->ObjectClass, L"STREAMCLASS"); + RtlInitUnicodeString(&ItemList->ObjectClass, L"GLOBAL"); /* Setup CreateDispatch routine */ ItemList->Create = StreamClassCreateFilter; Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c [iso-8859-1] Fri Aug 7 11:34:52 2009 @@ -9,6 +9,22 @@ #include "stream.h" + +NTSTATUS +NTAPI +StreamClassCreatePin( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; +} + + NTSTATUS NTAPI FilterDispatch_fnDeviceIoControl( @@ -203,10 +219,13 @@ /* not enough memory */ return STATUS_INSUFFICIENT_RESOURCES; } + /* Zero create item */ RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); - /* Set item class */ - RtlInitUnicodeString(&CreateItem->ObjectClass, L"STREAMCLASS"); + /* Initialize createitem */ + RtlInitUnicodeString(&CreateItem->ObjectClass, KSSTRING_Pin); + CreateItem->Create = StreamClassCreatePin; + /* Get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); /* Create Ks streaming object header */ @@ -246,7 +265,6 @@ NTSTATUS Status; DPRINT1("StreamClassCreateFilter Called\n"); - /* FIXME Support Pins/Clocks */ /* Init filter */ Status = InitializeFilterWithKs(DeviceObject, Irp); Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c [iso-8859-1] Fri Aug 7 11:34:52 2009 @@ -96,7 +96,7 @@ ULONG Length; HANDLE hSysAudio; PFILE_OBJECT FileObject; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\sysaudio"); + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\sysaudio\\GLOBAL"); if (DeviceExtension->DeviceInterfaceSupport) { Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] Fri Aug 7 11:34:52 2009 @@ -255,7 +255,11 @@ /* initialize create item struct */ RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); CreateItem->Create = DispatchCreateSysAudio; - RtlInitUnicodeString(&CreateItem->ObjectClass, L"SysAudio"); + + /* FIXME Sysaudio doesnt need a named create item because it installs itself + * via the device interface + */ + RtlInitUnicodeString(&CreateItem->ObjectClass, L"GLOBAL"); CreateItem->Flags = KSCREATE_ITEM_WILDCARD; Status = KsAllocateDeviceHeader(&DeviceExtension->KsDeviceHeader, @@ -269,14 +273,14 @@ IN SYSAUDIODEVEXT *DeviceExtension) { NTSTATUS Status; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\kmixer"); + UNICODE_STRING DeviceInstanceName = RTL_CONSTANT_STRING(L"\\Device\\kmixer\\GLOBAL"); UNICODE_STRING DevicePath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\kmixer"); Status = ZwLoadDriver(&DevicePath); if (NT_SUCCESS(Status)) { - Status = OpenDevice(&DeviceName, &DeviceExtension->KMixerHandle, &DeviceExtension->KMixerFileObject); + Status = OpenDevice(&DeviceInstanceName, &DeviceExtension->KMixerHandle, &DeviceExtension->KMixerFileObject); if (!NT_SUCCESS(Status)) { DeviceExtension->KMixerHandle = NULL; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] Fri Aug 7 11:34:52 2009 @@ -89,6 +89,13 @@ PKSAUDIO_DEVICE_ENTRY DeviceEntry; }FILTER_WORKER_CONTEXT, *PFILTER_WORKER_CONTEXT; +typedef struct +{ + PIRP Irp; + IO_STATUS_BLOCK StatusBlock; +}COMPLETION_CONTEXT, *PCOMPLETION_CONTEXT; + + NTSTATUS SysAudioAllocateDeviceHeader(

1 0

[dreimer] 42456: Bug 4700: Translation patch, Dutch, for explorer-new by Jan Roeloffzen Bug 4733: Japanese translation for explorer-new and winemine by Tomoya Kitagawa Bug 4738: Brazilian Portuguese translation for User Environment by Wagner Leandro Bueno Angelo Bug 4749: Czech translation update by Radek Liska Bug 4761: Norwegian translate by Lars Martin Hambro
by dreimer＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: dreimer Date: Fri Aug 7 10:56:06 2009 New Revision: 42456 URL: http://svn.reactos.org/svn/reactos?rev=42456&view=rev Log: Bug 4700: Translation patch, Dutch, for explorer-new by Jan Roeloffzen Bug 4733: Japanese translation for explorer-new and winemine by Tomoya Kitagawa Bug 4738: Brazilian Portuguese translation for User Environment by Wagner Leandro Bueno Angelo Bug 4749: Czech translation update by Radek Liska Bug 4761: Norwegian translate by Lars Martin Hambro Added: trunk/reactos/base/applications/games/winemine/lang/ja-JP.rc (with props) trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/rapps/lang/no-NO.rc (with props) trunk/reactos/dll/win32/userenv/lang/pt-BR.rc (with props) Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/mplay32/rsrc.rc trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc trunk/reactos/base/applications/notepad/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/rsrc.rc trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/userenv/userenv.rc Added: trunk/reactos/base/applications/games/winemine/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/games/winemine/lang/ja-JP.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -1,0 +1,77 @@ +#include "resource.h" + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_SECONDS, "b" + IDS_NOBODY, "¼OÈµ" + IDS_ABOUT, "Joshua ThielenÆReactOS developersæè" +END + +IDM_WINEMINE MENU DISCARDABLE +BEGIN + POPUP "Q[(&G)" + BEGIN + MENUITEM "VKQ[(&N)\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "?}[N(&M)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "SÒ(&B)", IDM_BEGINNER + MENUITEM "Ò(&I)", IDM_ADVANCED + MENUITEM "ºl(&E)", IDM_EXPERT + MENUITEM "JX^(&C)...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "xXg^C(&B)...", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "I¹(&X)", IDM_EXIT + END + POPUP "wv(&H)" + BEGIN + MENUITEM "WineMineÉÂ¢Ä(&A)", IDM_ABOUT + END +END + +IDD_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Å¬^C" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "Å¬^C", IDNONE, 10, 10, 182, 45 + LTEXT "SÒ:", IDNONE, 20, 20, 58, 8 + LTEXT "Ò:", IDNONE, 20, 30, 58, 8 + LTEXT "ºl:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "XRAÌZbg(&R)", IDRESET, 18, 57, 67, 15 +END + +IDD_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "¨ßÅÆ¤!" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "¨¼OðüÍµÄ¾³¢", IDIGNORE, 25, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 +END + +IDD_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "JX^Q[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "³:", IDNONE, 5, 15, 43, 10 + LTEXT ":", IDNONE, 5, 35, 43, 10 + LTEXT "nÌ:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "LZ", IDCANCEL, 86, 52, 45, 15 +END Propchange: trunk/reactos/base/applications/games/winemine/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/rsrc.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -27,6 +27,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" Added: 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 (added) +++ trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -1,0 +1,34 @@ +/* FILE: base/applications/mplay32/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2009-08-03 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&Soubor" + BEGIN + MENUITEM "&Otevøít...", IDM_OPEN_FILE + MENUITEM "&Zavøít", IDM_CLOSE_FILE + MENUITEM SEPARATOR + MENUITEM "&Ukonèit", IDM_EXIT + END + POPUP "&Nápovìda" + BEGIN + MENUITEM "&O programu...", IDM_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ALL_TYPES_FILTER "Vechny podporované (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_TOOLTIP_PLAY "Pøehrát" + IDS_TOOLTIP_STOP "Zastavit" + IDS_TOOLTIP_EJECT "Vysunout" + IDS_TOOLTIP_BACKWARD "Pøeskoèit zpìt" + IDS_TOOLTIP_SEEKBACK "Posunout zpìt" + IDS_TOOLTIP_SEEKFORW "Posunout vpøed" + IDS_TOOLTIP_FORWARD "Pøeskoèit vpøed" + IDS_APPTITLE "ReactOS Pøehrávaè multimédií" +END Propchange: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -2,6 +2,7 @@ #include "resource.h" #include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" Modified: trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -1,3 +1,9 @@ +/* FILE: base/applications/msconfig/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2009-08-03 + * THANKS TO: Kamil Hornicek, who translated major part of this file + */ + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_MSCONFIG_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 220 @@ -28,18 +34,18 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148 - PUSHBUTTON "Move &Up", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 - PUSHBUTTON "Move &Down", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 + PUSHBUTTON "Na&horu", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 + PUSHBUTTON "&Dolù", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 - PUSHBUTTON "&Enable", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 - PUSHBUTTON "D&isable", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 + PUSHBUTTON "Povoli&t", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 + PUSHBUTTON "&Zakázat", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 - PUSHBUTTON "&Find", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 - PUSHBUTTON "&New", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 - PUSHBUTTON "Edi&t", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 + PUSHBUTTON "&Najít", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 + PUSHBUTTON "No&vý", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 + PUSHBUTTON "&Upravit", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 - PUSHBUTTON "Ena&ble All", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 - PUSHBUTTON "Disable A&ll",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 + PUSHBUTTON "&Povolit ve", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "Z&akázat ve",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 END IDD_TOOLS_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/cs-CZ.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -74,7 +74,7 @@ MENUITEM "Vybrat v&e\tCtrl+A", CMD_SELECT_ALL MENUITEM "È&as/Datum\tF5", CMD_TIME_DATE END - POPUP "F&ormat" + POPUP "F&ormát" BEGIN MENUITEM "Zalo&mit dlouhé øádky", CMD_WRAP MENUITEM "&Písmo...", CMD_FONT @@ -155,7 +155,7 @@ -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 CONTROL " ", -1,"Static",0x50000000,8,48,272,11 - DEFPUSHBUTTON "Close",IDOK,114,149,44,15,WS_GROUP + DEFPUSHBUTTON "Zavøít",IDOK,114,149,44,15,WS_GROUP ICON IDI_NPICON,-1,12,9,20,30 EDITTEXT IDC_LICENSE,8,64,272,81,ES_MULTILINE | ES_READONLY | WS_VSCROLL @@ -205,5 +205,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -STRING_LINE_COLUMN, "Line %d, column %d" -END +STRING_LINE_COLUMN, "Øádek %d, sloupec %d" +END Added: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/no-NO.rc (added) +++ trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -1,0 +1,167 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Innstillinger", ID_SETTINGS, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&vslutt", ID_EXIT + END + POPUP "&Programmer" + BEGIN + MENUITEM "&Installere", ID_INSTALL + MENUITEM "&Avinstallere",ID_UNINSTALL + MENUITEM "&Endre", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Oppdatere", ID_REFRESH + END + POPUP "Hjelp" + BEGIN + MENUITEM "Hjelp", ID_HELP, GRAYED + MENUITEM "Om", ID_ABOUT + END +END + +IDR_LINKMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Åpne lenke i en nettleser", ID_OPEN_LINK + MENUITEM "&Kopier lenke til utklipptavlen", ID_COPY_LINK + END +END + +IDR_APPLICATIONMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Installere", ID_INSTALL + MENUITEM "&Avinstallere", ID_UNINSTALL + MENUITEM "&Endre", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Oppdater", ID_REFRESH + END +END + +IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Innstillinger" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 320, 212, 60, 14 +END + +IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Last ned og installere" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 320, 212, 60, 14 +END + +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "Lastet ned..." +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Avbryt", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Om" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS Programbehandler\nEnerett (C) 2009\nav Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + PUSHBUTTON "Lukk", IDOK, 133, 46, 50, 14 + ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_INSTALL "Installere" + IDS_TOOLTIP_UNINSTALL "Avinstallere" + IDS_TOOLTIP_MODIFY "Rediger" + IDS_TOOLTIP_SETTINGS "Innstillinger" + IDS_TOOLTIP_REFRESH "Oppdatere" + IDS_TOOLTIP_EXIT "Avslutt" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_NAME "Navn" + IDS_APP_INST_VERSION "Versjon" + IDS_APP_DESCRIPTION "Beskrivelse" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INFO_VERSION "\nVersjon: " + IDS_INFO_DESCRIPTION "\nBeskrivelse: " + IDS_INFO_PUBLISHER "\nUtgiver: " + IDS_INFO_HELPLINK "\nHjelpelenke: " + IDS_INFO_HELPPHONE "\nHjelptelefon: " + IDS_INFO_README "\nLes meg: " + IDS_INFO_REGOWNER "\nRegistert eier: " + IDS_INFO_PRODUCTID "\nProdukt ID: " + IDS_INFO_CONTACT "\nKontakt: " + IDS_INFO_UPDATEINFO "\nOppdatert informasjon: " + IDS_INFO_INFOABOUT "\nInformasjon om: " + IDS_INFO_COMMENTS "\nKomentarer: " + IDS_INFO_INSTLOCATION "\nInstallering plassering: " + IDS_INFO_INSTALLSRC "\nInstallering kilde: " + IDS_INFO_UNINSTALLSTR "\nAvinstallering plassering: " + IDS_INFO_MODIFYPATH "\nEndret mappe: " + IDS_INFO_INSTALLDATE "\nInstallert dato: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_AINFO_VERSION "\nVersjon: " + IDS_AINFO_DESCRIPTION "\nBeskrivelse: " + IDS_AINFO_SIZE "\nStørrelse: " + IDS_AINFO_URLSITE "\nHjemmeside: " + IDS_AINFO_LICENCE "\nLisens: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAT_AUDIO "Lyd" + IDS_CAT_DEVEL "Utvikling" + IDS_CAT_DRIVERS "Drivere" + IDS_CAT_EDU "Edutainment" + IDS_CAT_ENGINEER "Engineering" + IDS_CAT_FINANCE "Finans" + IDS_CAT_GAMES "Spill & morro" + IDS_CAT_GRAPHICS "Grafikk" + IDS_CAT_INTERNET "Internett & Nettverk" + IDS_CAT_LIBS "Biblioteker" + IDS_CAT_OFFICE "Kontor" + IDS_CAT_OTHER "Andre" + IDS_CAT_SCIENCE "Vitenskap" + IDS_CAT_TOOLS "Verktøy" + IDS_CAT_VIDEO "Filmer" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS programbehandler" + IDS_SEARCH_TEXT "Søk..." + IDS_INSTALL "Installere" + IDS_UNINSTALL "Avinstallere" + IDS_MODIFY "Endre" + IDS_APPS_COUNT "Program oppsummering: %d" + IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!\n\n" + IDS_WELCOME_TEXT "Velg en kategori til venstre, og velg et program for installere eller avinstallere programvaren.\nReactOS internettside: " + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "Installert" + IDS_AVAILABLEFORINST "Tilgjengelig for installasjon" + IDS_UPDATES "P\Oppdateringer" + IDS_APPLICATIONS "Programmer" + IDS_DOWNLOAD_FOLDER "Nedlastinger" +END Propchange: trunk/reactos/base/applications/rapps/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -1,2 +1,3 @@ #include "lang/en-US.rc" +#include "lang/no-NO.rc" //#include "lang/ru-RU.rc" Modified: trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -5,7 +5,7 @@ POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "Task Manager", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM "^XN }l[W", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR MENUITEM "^XN o[ðÅè·é(&L)", ID_LOCKTASKBAR MENUITEM "vpeB(R)", ID_SHELL_CMD_PROPERTIES @@ -19,15 +19,15 @@ MENUITEM "", -1, MFT_SEPARATOR POPUP "vO(&P)", IDM_PROGRAMS BEGIN - MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(Èµ)", -1, MFT_STRING, MFS_GRAYED END POPUP "¨CÉüè(F&)", IDM_FAVORITES BEGIN - MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(Èµ)", -1, MFT_STRING, MFS_GRAYED END POPUP "ÅßgÁ½t@C(&D)", IDM_DOCUMENTS BEGIN - MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(Èµ)", -1, MFT_STRING, MFS_GRAYED END POPUP "Ýè(&S)", IDM_SETTINGS BEGIN @@ -53,6 +53,67 @@ END END + +IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "^XNo[" +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + GROUPBOX "^XNo[ÌOÏ", IDC_STATIC, 6,6,240,121 + CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 + AUTOCHECKBOX "^XNo[ðÅè·é(&L)", IDC_TASKBARPROP_LOCK, 13,45,200,10 + AUTOCHECKBOX "^XNo[ð©®IÉB·(&U)", IDC_TASKBARPROP_HIDE, 13,58,200,10 + AUTOCHECKBOX "^XNo[ð¼ÌEChEãÉÛÂ(&T)", IDC_TASKBARPROP_ONTOP, 13,71,200,10 + AUTOCHECKBOX "Þ·é^XNo[{^ðO[v»·é(&G)", IDC_TASKBARPROP_GROUP, 13,84,200,10 + AUTOCHECKBOX "NCbNN®Ì\¦(&Q)", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 + AUTOCHECKBOX "EChEÌvr[ð\¦·é(TlC)(&S)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 +END + +IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "X^[gj[" +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + AUTORADIOBUTTON "X^[gj[(&S)", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 + LTEXT "±Ìj[X^CÍtH_A¨CÉüèÌvOAõÖÌÈPÈANZXðñµÜ·B", IDC_STATIC, 20,17,150,24, WS_DISABLED + PUSHBUTTON "JX^}CY(&C)...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED + AUTORADIOBUTTON "NVbN X^[gj[(&M)", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED + LTEXT "±Ìj[X^CÍNVbNÈOÏA@\«ðñµÜ·",-1,20,57,150,24, WS_DISABLED + PUSHBUTTON "JX^}CY(&C)...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED + GROUPBOX "vCoV[",IDC_STATIC, 7,100,238,42 + AUTOCHECKBOX "ÅßJ¢½t@CÌXgðL¯µÄ\¦·é(&F)", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED + AUTOCHECKBOX "ÅßJ¢½vOÌXgðL¯µÄ\¦·é(&P)",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED +END + +IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÊmÌæ" +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED + GROUPBOX "ACR", IDC_STATIC, 6,33,240,58, WS_DISABLED + LTEXT "ÅßNbNµÄ¢È¢ACRðBµÄÊmÌæð·Á«è³¹é±ÆªÅ«Ü·B", IDC_STATIC, 13,48,223,16, WS_DISABLED + AUTOCHECKBOX "ANeBuÅÈ¢ACRðB·(&H)", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED + PUSHBUTTON "JX^}CY(&C)...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED + GROUPBOX "VXe ACR", IDC_STATIC, 6,97,240,84, WS_DISABLED + LTEXT "íÉ\¦³¹éVXeACRðIðµÄ¾³¢B", IDC_STATIC, 13,112,223,16, WS_DISABLED + AUTOCHECKBOX "v(&K)", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED + AUTOCHECKBOX "¹Ê(&V)", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED + AUTOCHECKBOX "lbg[N(&N)", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED + AUTOCHECKBOX "d¹(&P)", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED + +END + +IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "c[o[" +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + LTEXT "^XNo[ÉÇÁ·éc[o[ðIðµÄ¾³¢B", IDC_STATIC, 7,7,223,12, WS_DISABLED + CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE +END + + STRINGTABLE DISCARDABLE BEGIN IDS_START "X^[g" @@ -61,68 +122,7 @@ IDS_EXPLORE_ALL_USERS "GNXv[ - All Users(&E)" END - -IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Taskbar" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121, WS_DISABLED - CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21, WS_DISABLED - AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10, WS_DISABLED - AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10, WS_DISABLED - AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13,71,200,10, WS_DISABLED - AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10, WS_DISABLED - AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10, WS_DISABLED - AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10, WS_DISABLED -END - -IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Start Menu" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 - LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20,17,150,24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED - AUTORADIOBUTTON "Classic Start &menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED - LTEXT "This menu style gives you the classic look and functionality",-1,20,57,150,24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED - GROUPBOX "Privacy",IDC_STATIC, 7,100,238,42 - AUTOCHECKBOX "Store and display a list of recently opened &files", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED - AUTOCHECKBOX "Store and display a list of recently opened &programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED -END - -IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Notification Area" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED - GROUPBOX "Icons", IDC_STATIC, 6,33,240,58, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,48,223,16, WS_DISABLED - AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED - GROUPBOX "System icons", IDC_STATIC, 6,97,240,84, WS_DISABLED - LTEXT "Select which system icons to always show.", IDC_STATIC, 13,112,223,16, WS_DISABLED - AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED - AUTOCHECKBOX "&Volume", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED - AUTOCHECKBOX "&Network", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED - AUTOCHECKBOX "&Power", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED - -END - -IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Toolbars" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - LTEXT "Select which toolbars to add to the taskbar.", IDC_STATIC, 7,7,223,12, WS_DISABLED - CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE -END - - STRINGTABLE DISCARDABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu Properties" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "^XNo[ÆX^[gj[ÌvpeB" END Modified: trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -5,9 +5,9 @@ POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "Task Manager", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM "Taakbeheer", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR - MENUITEM "&Takenbalk vergrendelen", ID_LOCKTASKBAR + MENUITEM "&Taakbalk vergrendelen", ID_LOCKTASKBAR MENUITEM "&Eigenschappen", ID_SHELL_CMD_PROPERTIES END END @@ -19,15 +19,15 @@ MENUITEM "", -1, MFT_SEPARATOR POPUP "&Programma's", IDM_PROGRAMS BEGIN - MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(Leeg)", -1, MFT_STRING, MFS_GRAYED END POPUP "F&avorieten", IDM_FAVORITES BEGIN - MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(Leeg)", -1, MFT_STRING, MFS_GRAYED END POPUP "&Documenten", IDM_DOCUMENTS BEGIN - MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(Leeg)", -1, MFT_STRING, MFS_GRAYED END POPUP "&Instellingen", IDM_SETTINGS BEGIN @@ -36,7 +36,7 @@ MENUITEM "&Beveiliging...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Netwerkverbindingen", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Printers en Faxapparaten", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED - MENUITEM "&Takenbalk en het Start-Menu", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + MENUITEM "&Taakbalk en het menu Start", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END POPUP "&Zoeken", IDM_SEARCH BEGIN @@ -46,7 +46,7 @@ MENUITEM "&Uitvoeren...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED MENUITEM "&Synchroniseren", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED - MENUITEM "&Afloggen %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "&Afmelden %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED MENUITEM "&Verbinding Verbreken...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED MENUITEM "&Computer Ontkoppelen", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED MENUITEM "A&fsluiten...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED @@ -57,72 +57,72 @@ BEGIN IDS_START "&Start" IDS_PROPERTIES "&Eigenschappen" - IDS_OPEN_ALL_USERS "&Open Alle Gebruikers" - IDS_EXPLORE_ALL_USERS "&Alle Gebruikers V&erkennen" + IDS_OPEN_ALL_USERS "&Alle Gebruikers weergeven" + IDS_EXPLORE_ALL_USERS "Alle Gebruikers V&erkennen" END IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Taskbar" +CAPTION "Taakbalk" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121, WS_DISABLED + GROUPBOX "Taakbalkweergave", IDC_STATIC, 6,6,240,121, WS_DISABLED CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21, WS_DISABLED - AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10, WS_DISABLED - AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10, WS_DISABLED - AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13,71,200,10, WS_DISABLED - AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10, WS_DISABLED - AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10, WS_DISABLED - AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10, WS_DISABLED + AUTOCHECKBOX "Taakbalk &vergrendelen", IDC_TASKBARPROP_LOCK, 13,45,200,10, WS_DISABLED + AUTOCHECKBOX "Taakbalk a&utomatisch verbergen", IDC_TASKBARPROP_HIDE, 13,58,200,10, WS_DISABLED + AUTOCHECKBOX "Taakbalk altijd o&p voorgrond weergeven", IDC_TASKBARPROP_ONTOP, 13,71,200,10, WS_DISABLED + AUTOCHECKBOX "&Gelijksoortige knoppen gegroepeerd weergeven", IDC_TASKBARPROP_GROUP, 13,84,200,10, WS_DISABLED + AUTOCHECKBOX "Werkbalk &Snel starten weergeven", IDC_TASKBARPROP_SHOWQL, 13,97,200,10, WS_DISABLED + AUTOCHECKBOX "Venstervoorbeelden (miniatuurweergaven) &weergeven", IDC_TASKBARPROP_WNDPREV, 13,110,200,10, WS_DISABLED END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Start Menu" +CAPTION "Menu Start" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 - LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20,17,150,24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED - AUTORADIOBUTTON "Classic Start &menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED - LTEXT "This menu style gives you the classic look and functionality",-1,20,57,150,24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED + AUTORADIOBUTTON "&Menu Start", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 + LTEXT "Deze menustijl biedt u eenvoudige toegang tot uw mappen, favoriete programma's en zoekopdrachten.", IDC_STATIC, 20,17,150,24, WS_DISABLED + PUSHBUTTON "Aan&passen...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED + AUTORADIOBUTTON "&Klassiek menu Start", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED + LTEXT "Deze menustijl biedt u de weergave en functionaliteit van vorige versies van Windows.",-1,20,57,150,24, WS_DISABLED + PUSHBUTTON "&Aanpassen...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED GROUPBOX "Privacy",IDC_STATIC, 7,100,238,42 - AUTOCHECKBOX "Store and display a list of recently opened &files", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED - AUTOCHECKBOX "Store and display a list of recently opened &programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED + AUTOCHECKBOX "Een lijst met onlangs geopende &bestanden opslaan en weergeven", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED + AUTOCHECKBOX "Een lijst met onlangs geopende &programma's opslaan en weergeven",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED END IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Notification Area" +CAPTION "Systeemvak" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED - GROUPBOX "Icons", IDC_STATIC, 6,33,240,58, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,48,223,16, WS_DISABLED - AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED - GROUPBOX "System icons", IDC_STATIC, 6,97,240,84, WS_DISABLED - LTEXT "Select which system icons to always show.", IDC_STATIC, 13,112,223,16, WS_DISABLED - AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED + GROUPBOX "Pictogrammen", IDC_STATIC, 6,33,240,58, WS_DISABLED + LTEXT "U kunt het systeemvak opruimen door pictogrammen te verbergen waarop u recentelijk niet hebt geklikt.", IDC_STATIC, 13,48,223,16, WS_DISABLED + AUTOCHECKBOX "&Inactieve pictogrammen verbergen", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED + PUSHBUTTON "&Aanpassen...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED + GROUPBOX "Systeempictogrammen", IDC_STATIC, 6,97,240,84, WS_DISABLED + LTEXT "Selecteer welke systeempictogrammen altijd worden weergegeven.", IDC_STATIC, 13,112,223,16, WS_DISABLED + AUTOCHECKBOX "&Klok", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED AUTOCHECKBOX "&Volume", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED - AUTOCHECKBOX "&Network", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED - AUTOCHECKBOX "&Power", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED + AUTOCHECKBOX "&Netwerk", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED + AUTOCHECKBOX "&Energie", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED END IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Toolbars" +CAPTION "Werkbalken" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Select which toolbars to add to the taskbar.", IDC_STATIC, 7,7,223,12, WS_DISABLED + LTEXT "Selecteert u de werkbalken welke aan de taakbalk toegevoegd moeten worden.", IDC_STATIC, 7,7,223,12, WS_DISABLED CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END STRINGTABLE DISCARDABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu Properties" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taakbalk en menu Start eigenschappen" END Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -1,21 +1,7 @@ -/* - * Copyright (C) 2004 Filip Navara - * 2007 Kamil Hornicek - * 2008 Radek Liska - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +/* FILE: dll/win32/syssetup/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2009-08-02 + * THANKS TO: Filip Navara and Kamil Hornicek, who translated major part of this file */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -100,13 +86,13 @@ LTEXT "Lokalizace systému by mìla souhlasit s jazykem aplikací, "\ "které chcete pouívat. Localizace urèí jak budou zobrazena "\ "èísla, mìny a kalendáøní data.", IDC_STATIC, 53, 7, 253, 20 - LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Pro zmìnu lokalizace systému kliknìte na Zmìnit.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Zmìnit...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "Rozloení kláves urèí znaky, které se zobrazí, kdy píete.", IDC_STATIC, 53, 86, 253, 8 - LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Pro zmìnu rozloení kláves, kliknìte na Zmìnit.", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "Z&mìnit...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 @@ -203,101 +189,101 @@ IDS_ACCESSORIES "Pøísluenství" IDS_CMT_CALC "Spustit Kalkulaèku" IDS_CMT_CMD "Otevøít Pøíkazový øádek" - IDS_CMT_EXPLORER "Spustit Explorer" + IDS_CMT_DEVMGMT "Spustit Správce zaøízení" + IDS_CMT_EVENTVIEW "Spustit Prohlíeè událostí" + IDS_CMT_EXPLORER "Spustit Prùzkumníka" + IDS_CMT_MSCONFIG "Spustit Nástroj pro konfiguraci systému" IDS_CMT_NOTEPAD "Spustit Textový editor" + IDS_CMT_PAINT "Spustit Malování" + IDS_CMT_RDESKTOP "Spustit Vzdálenou plochu" IDS_CMT_REGEDIT "Spustit Editor registru" - IDS_CMT_WORDPAD "Spustit Editor dokumentù" IDS_CMT_SCREENSHOT "Sejmout obrazovku" - IDS_CMT_DEVMGMT "Spustit Správce zaøízení" IDS_CMT_SERVMAN "Spustit Správce slueb" - IDS_CMT_RDESKTOP "Spustit Vzdálenou plochu" - IDS_CMT_EVENTVIEW "Launch Event Viewer" - IDS_CMT_MSCONFIG "Launch System Configuration program" - IDS_CMT_PAINT "Launch Paint" -END - -STRINGTABLE -BEGIN - IDS_GAMES "Hry" - IDS_CMT_SOLITAIRE "Solitaire" - IDS_CMT_WINEMINE "WineMine" -END - -STRINGTABLE -BEGIN - IDS_SYS_TOOLS "Systémové nástroje" - IDS_CMT_CHARMAP "Mapa znakù" - IDS_CMT_KBSWITCH "Pøepínaè rozloení klávesnice" - IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" -END - - -STRINGTABLE -BEGIN - IDS_SYS_ACCESSIBILITY "Usnadnìní" - IDS_CMT_MAGNIFY "Lupa" -END - -STRINGTABLE -BEGIN - IDS_SYS_ENTERTAINMENT "Entertainment" - IDS_CMT_MPLAY32 "Launch Multimedia Player" - IDS_CMT_SNDVOL32 "Launch Volume Control" -END - -STRINGTABLE -BEGIN - IDS_REACTOS_SETUP "ReactOS Instalátor" + IDS_CMT_WORDPAD "Spustit WordPad" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Hry" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "Systémové nástroje" + IDS_CMT_CHARMAP "Mapa znakù" + IDS_CMT_KBSWITCH "Pøepínaè rozloení klávesnice" + IDS_CMT_DXDIAG "Spustit Nástroj pro diagnostiku ReactX" +END + + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Usnadnìní" + IDS_CMT_MAGNIFY "Lupa" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Zábava" + IDS_CMT_MPLAY32 "Spustit Pøehrávaè multimédií" + IDS_CMT_SNDVOL32 "Spustit Ovládání hlasitosti" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "ReactOS Instalátor" IDS_UNKNOWN_ERROR "Neznámá chyba" IDS_REGISTERING_COMPONENTS "Registruji souèásti..." - IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " - IDS_GETPROCADDR_FAILED "GetProcAddr failed: " + IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " + IDS_GETPROCADDR_FAILED "GetProcAddr failed: " IDS_REGSVR_FAILED "DllRegisterServer failed: " - IDS_DLLINSTALL_FAILED "DllInstall failed: " - IDS_TIMEOUT "Vyprel èasový limit registrace" + IDS_DLLINSTALL_FAILED "DllInstall failed: " + IDS_TIMEOUT "Vyprel èasový limit registrace" IDS_REASON_UNKNOWN "" END STRINGTABLE BEGIN + IDS_SHORT_CALC "Kalkulaèka.lnk" + IDS_SHORT_CHARMAP "Mapa znakù.lnk" IDS_SHORT_CMD "Pøíkazový øádek.lnk" + IDS_SHORT_DEVICE "Správce zaøízení.lnk" + IDS_SHORT_DOWNLOADER "Download!.lnk" + IDS_SHORT_DXDIAG "Diagnostika ReactX.lnk" + IDS_SHORT_EVENTVIEW "Prohlíeè událostí.lnk" IDS_SHORT_EXPLORER "ReactOS Prùzkumník.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_KBSWITCH "Pøepínaè rozloení klávesnice.lnk" + IDS_SHORT_MAGNIFY "Lupa.lnk" + IDS_SHORT_MPLAY32 "Pøehrávaè multimédií.lnk" + IDS_SHORT_MSCONFIG "Nastavení systému.lnk" + IDS_SHORT_NOTEPAD "Poznámkový blok.lnk" + IDS_SHORT_PAINT "Malování.lnk" + IDS_SHORT_RDESKTOP "Vzdálená plocha.lnk" + IDS_SHORT_REGEDIT "Editor registru.lnk" IDS_SHORT_SERVICE "Správce slueb.lnk" - IDS_SHORT_DEVICE "Správce zaøízení.lnk" - IDS_SHORT_CALC "Kalkulaèka.lnk" - IDS_SHORT_REGEDIT "Regedit.lnk" - IDS_SHORT_NOTEPAD "Poznámkový blok.lnk" - IDS_SHORT_WORDPAD "WordPad.lnk" - IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SNAP "Sejmout obrazovku.lnk" + IDS_SHORT_SNDVOL32 "Ovládání hlasitosti.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "Mapa znakù.lnk" - IDS_SHORT_MAGNIFY "Lupa.lnk" - IDS_SHORT_RDESKTOP "Vzdálená plocha.lnk" - IDS_SHORT_KBSWITCH "Pøepínaè rozloení klávesnice.lnk" - IDS_SHORT_EVENTVIEW "Event Viewer.lnk" - IDS_SHORT_MSCONFIG "System Configuration.lnk" - IDS_SHORT_MPLAY32 "Multimedia Player.lnk" - IDS_SHORT_SNDVOL32 "Volume Control.lnk" - IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" - IDS_SHORT_PAINT "Paint.lnk" -END - -STRINGTABLE -BEGIN - IDS_WZD_NAME "Instalace nemùe pokraèovat, dokud nezadáte své jméno." + IDS_SHORT_WORDPAD "WordPad.lnk" +END + +STRINGTABLE +BEGIN + IDS_WZD_NAME "Instalace nemùe pokraèovat, dokud nezadáte své jméno." IDS_WZD_SETCOMPUTERNAME "Instalátor nedokázal nastavit jméno poèítaèe." - IDS_WZD_COMPUTERNAME "Instalace nemùe pokraèovat, dokud nezadáte jméno poèítaèe." - IDS_WZD_PASSWORDEMPTY "Musíte zadat heslo!" - IDS_WZD_PASSWORDMATCH "Zadaná hesla nesouhlasí. Zadejte poadované heslo znovu." - IDS_WZD_PASSWORDCHAR "Zadané heslo obsahuje nepovolené znaky. Zadejte upravené heslo." - IDS_WZD_LOCALTIME "Instalátor nedokázal nastavit èas." -END - -STRINGTABLE -BEGIN - IDS_STATUS_INSTALL_DEV "Instaluji zaøízení..." + IDS_WZD_COMPUTERNAME "Instalace nemùe pokraèovat, dokud nezadáte jméno poèítaèe." + IDS_WZD_PASSWORDEMPTY "Musíte zadat heslo!" + IDS_WZD_PASSWORDMATCH "Zadaná hesla nesouhlasí. Zadejte poadované heslo znovu." + IDS_WZD_PASSWORDCHAR "Zadané heslo obsahuje nepovolené znaky. Zadejte upravené heslo." + IDS_WZD_LOCALTIME "Instalátor nedokázal nastavit èas." +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Instaluji zaøízení..." END /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -228,7 +228,7 @@ BEGIN IDS_SYS_ENTERTAINMENT "Zábava" //Entertainment IDS_CMT_MPLAY32 "Spusti Multimediálny prehrávaè" - IDS_CMT_SNDVOL32 "Stusti Ovládanie hlasitosti" + IDS_CMT_SNDVOL32 "Spusti Ovládanie hlasitosti" END STRINGTABLE Added: trunk/reactos/dll/win32/userenv/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/pt-BR.rc (added) +++ trunk/reactos/dll/win32/userenv/lang/pt-BR.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -1,0 +1,48 @@ +/* + * Copyright (C) 2004 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" + IDS_APPDATA "Dados de aplicativos" + IDS_DESKTOP "Desktop" + IDS_FAVORITES "Favoritos" + IDS_STARTMENU "Menu Iniciar" + IDS_PROGRAMS "Menu Iniciar\\Programas" + IDS_ADMINTOOLS "Menu Iniciar\\Programas\\Ferramentas Administrativas" + IDS_STARTUP "Menu Iniciar\\Programas\\Inicializar" + IDS_MYDOCUMENTS "Meus Documentos" + IDS_MYPICTURES "Meus Documentos\\Minhas imagens" + IDS_MYMUSIC "Meus Documentos\\Minhas músicas" + IDS_MYVIDEOS "Meus Documentos\\Meus vídeos" + IDS_TEMPLATES "Modelos" + IDS_RECENT "Documentos recentes" + IDS_SENDTO "SendTo" + IDS_PRINTHOOD "Ambiente de impressão" + IDS_NETHOOD "Ambiente de rede" + IDS_LOCALSETTINGS "Configurações locais" + IDS_LOCALAPPDATA "Configurações locais\\Dados de aplicativos" + IDS_TEMP "Configurações locais\\Temp" + IDS_CACHE "Configurações locais\\Temporary Internet Files" + IDS_HISTORY "Configurações locais\\Histórico" + IDS_COOKIES "Cookies" + IDS_PROGRAMFILES "%SystemDrive%\\Arquivos de programas" + IDS_COMMONFILES "Arquivos comuns" +END Propchange: trunk/reactos/dll/win32/userenv/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/userenv.rc [iso-8859-1] Fri Aug 7 10:56:06 2009 @@ -53,6 +53,7 @@ #include "lang/no-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc"

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009