Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

Start a nNew thread

[arty] 14753: Misnamed this branch. Should be branches/powerpc/reactos.

by arty＠svn.reactos.com

Misnamed this branch. Should be branches/powerpc/reactos. Deleted: branches/powerpc/

19 years, 4 months

[arty] 14752: Finally creating the PowerPC branch. Time to get some local edits out of here.

by arty＠svn.reactos.com

Finally creating the PowerPC branch. Time to get some local edits out of here. Added: branches/powerpc/ _____ Copied: branches/powerpc (from rev 14751, trunk/reactos)

19 years, 4 months

[arty] 14751: Don't try to discover if we didn't find any interfaces we like. When we get

by arty＠svn.reactos.com

Don't try to discover if we didn't find any interfaces we like. When we get PnP, we'll need to do discover when the first interface appears. Modified: trunk/reactos/subsys/system/dhcp/dhclient.c _____ Modified: trunk/reactos/subsys/system/dhcp/dhclient.c --- trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-23 00:01:37 UTC (rev 14750) +++ trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-23 00:40:44 UTC (rev 14751) @@ -161,12 +161,16 @@ DH_DbgPrint(MID_TRACE,("Discover Interfaces\n")); - /* set up the interface */ - discover_interfaces(ifi); + /* If no adapters were found, just idle for now ... If any show up, + * then we'll start it later */ + if( ifi ) { + /* set up the interface */ + discover_interfaces(ifi); - DH_DbgPrint - (MID_TRACE, - ("Setting init state and restarting interface %p\n",ifi)); + DH_DbgPrint + (MID_TRACE, + ("Setting init state and restarting interface %p\n",ifi)); + } bootp_packet_handler = do_packet;

19 years, 4 months

[ekohl] 14750: advapi32.dll: Implement QueryServiceStatus.

by ekohl＠svn.reactos.com

advapi32.dll: Implement QueryServiceStatus. services.exe: Implement OpenSCManagerA, OpenServiceA, OpenServiceW and QueryServiceStatus. Modified: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/database.c Modified: trunk/reactos/subsys/system/services/rpcserver.c Modified: trunk/reactos/subsys/system/services/services.h _____ Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-04-22 19:57:03 UTC (rev 14749) +++ trunk/reactos/include/idl/svcctl.idl 2005-04-23 00:01:37 UTC (rev 14750) @@ -54,16 +54,18 @@ [out] SC_LOCK *hLock); /* Function 4 */ -// DWORD ScmrQueryServiceObjectSecurity(); + DWORD ScmrQueryServiceObjectSecurity([in] handle_t BindingHandle); /* FIXME */ /* Function 5 */ -// DWORD ScmrSetServiceObjectSecurity(); + DWORD ScmrSetServiceObjectSecurity([in] handle_t BindingHandle); /* FIXME */ /* Function 6 */ -// DWORD ScmrQueryServiceStatus(); + DWORD ScmrQueryServiceStatus([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [out] LPSERVICE_STATUS lpServiceStatus); /* Function 7 */ -// DWORD ScmrSetServiceStatus(); + DWORD ScmrSetServiceStatus([in] handle_t BindingHandle); /* FIXME */ /* Function 8 */ DWORD ScmrUnlockServiceDatabase([in] handle_t BindingHandle, @@ -75,20 +77,23 @@ /* Function 12 */ - DWORD ScmrCreateServiceW([in] handle_t BindingHandle, - [in] SC_HANDLE hSCManager, - [in, string, ref] LPCWSTR lpServiceName, - [in, string, ref] LPCWSTR lpDisplayName, - [in] DWORD dwDesiredAccess, - [in] DWORD dwServiceType, - [in] DWORD dwStartType, - [in] DWORD dwErrorControl, - [in, string, ref] LPCWSTR lpBinaryPathName, - [in, string, unique] LPCWSTR lpLoadOrderGroup, - [out] LPDWORD lpdwTagId, - [in, string, unique] LPCWSTR lpDependencies, - [in, string, unique] LPCWSTR lpServiceStartName, - [in, string, unique] LPCWSTR lpPassword); +// DWORD ScmrCreateServiceW([in] handle_t BindingHandle, +// [in] SC_HANDLE hSCManager, +// [in, string, ref] LPCWSTR lpServiceName, +// [in, string, ref] LPCWSTR lpDisplayName, +// [in] DWORD dwDesiredAccess, +// [in] DWORD dwServiceType, +// [in] DWORD dwStartType, +// [in] DWORD dwErrorControl, +// [in, string, ref] LPCWSTR lpBinaryPathName, +// [in, string, unique] LPCWSTR lpLoadOrderGroup, +// [out] LPDWORD lpdwTagId, +// [in, size_is(dwDepwndenciesLength), unique] LPCWSTR lpDependencies, +// [in] DWORD dwDependenciesLength, +// [in, string, unique] LPCWSTR lpServiceStartName, +// [in, size_is(dwPasswordLength), unique] LPCWSTR lpPassword, +// [in] DWORD dwPasswordLength, +// [out] SC_HANDLE *hService); /* Function 15 */ _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-04-22 19:57:03 UTC (rev 14749) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-04-23 00:01:37 UTC (rev 14750) @@ -835,17 +835,31 @@ /********************************************************************** * QueryServiceStatus * - * @unimplemented + * @implemented */ -BOOL -STDCALL -QueryServiceStatus( - SC_HANDLE hService, - LPSERVICE_STATUS lpServiceStatus) +BOOL STDCALL +QueryServiceStatus(SC_HANDLE hService, + LPSERVICE_STATUS lpServiceStatus) { - DPRINT1("QueryServiceStatus is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + DWORD dwError; + + DPRINT("QueryServiceStatus(%p, %p)\n", + hService, lpServiceStatus); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrQueryServiceStatus(BindingHandle, + (unsigned int)hService, + lpServiceStatus); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrQueryServiceStatus() failed (Error %lu)\n", dwError); + SetLastError(dwError); return FALSE; + } + + return TRUE; } @@ -886,8 +900,6 @@ } - - /********************************************************************** * StartServiceW * _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-04-22 19:57:03 UTC (rev 14749) +++ trunk/reactos/subsys/system/services/database.c 2005-04-23 00:01:37 UTC (rev 14750) @@ -1,4 +1,4 @@ -/* $Id$ +/* * * service control manager * @@ -53,27 +53,8 @@ } SERVICE_GROUP, *PSERVICE_GROUP; -typedef struct _SERVICE -{ - LIST_ENTRY ServiceListEntry; - UNICODE_STRING ServiceName; - UNICODE_STRING RegistryPath; - UNICODE_STRING ServiceGroup; - ULONG Start; - ULONG Type; - ULONG ErrorControl; - ULONG Tag; - BOOLEAN ServiceRunning; - BOOLEAN ServiceVisited; - - HANDLE ControlPipeHandle; - ULONG ProcessId; - ULONG ThreadId; -} SERVICE, *PSERVICE; - - /* GLOBALS *******************************************************************/ LIST_ENTRY GroupListHead; @@ -82,6 +63,35 @@ /* FUNCTIONS *****************************************************************/ +PSERVICE +ScmGetServiceEntryByName(PUNICODE_STRING ServiceName) +{ + PLIST_ENTRY ServiceEntry; + PSERVICE CurrentService; + + DPRINT("ScmGetServiceEntryByName() called\n"); + + ServiceEntry = ServiceListHead.Flink; + while (ServiceEntry != &ServiceListHead) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + if (RtlEqualUnicodeString(&CurrentService->ServiceName, ServiceName, TRUE)) + { + DPRINT("Found service: '%wZ'\n", &CurrentService->ServiceName); + return CurrentService; + } + + ServiceEntry = ServiceEntry->Flink; + } + + DPRINT("Couldn't find a matching service\n"); + + return NULL; +} + + static NTSTATUS STDCALL CreateGroupOrderListRoutine(PWSTR ValueName, ULONG ValueType, @@ -277,6 +287,13 @@ InsertTailList(&ServiceListHead, &Service->ServiceListEntry); + Service->CurrentState = SERVICE_STOPPED; + Service->ControlsAccepted = 0; + Service->Win32ExitCode = 0; + Service->ServiceSpecificExitCode = 0; + Service->CheckPoint = 0; + Service->WaitHint = 2000; /* 2 seconds */ + return STATUS_SUCCESS; } @@ -461,7 +478,7 @@ DPRINT("Found: '%wZ' '%wZ'\n", &Service->ServiceName, &DirInfo->ObjectName); /* Mark service as 'running' */ - Service->ServiceRunning = TRUE; + Service->CurrentState = SERVICE_RUNNING; /* Find the driver's group and mark it as 'running' */ if (Service->ServiceGroup.Buffer != NULL) @@ -767,7 +784,7 @@ { Group->ServicesRunning = TRUE; } - Service->ServiceRunning = TRUE; + Service->CurrentState = SERVICE_RUNNING; } #if 0 else _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-04-22 19:57:03 UTC (rev 14749) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-04-23 00:01:37 UTC (rev 14750) @@ -44,7 +44,7 @@ SCMGR_HANDLE Handle; DWORD DesiredAccess; - PVOID DatabaseEntry; /* FIXME */ + PSERVICE ServiceEntry; /* FIXME: Insert more data here */ @@ -167,10 +167,10 @@ static DWORD -ScmCreateServiceHandle(LPVOID lpDatabaseEntry, +ScmCreateServiceHandle(PSERVICE lpServiceEntry, SC_HANDLE *Handle) { - PMANAGER_HANDLE Ptr; + PSERVICE_HANDLE Ptr; Ptr = GlobalAlloc(GPTR, sizeof(SERVICE_HANDLE)); @@ -181,7 +181,7 @@ Ptr->Handle.RefCount = 1; /* FIXME: initialize more data here */ - // Ptr->DatabaseEntry = lpDatabaseEntry; + Ptr->ServiceEntry = lpServiceEntry; *Handle = (SC_HANDLE)Ptr; @@ -278,21 +278,42 @@ unsigned long dwControl, LPSERVICE_STATUS lpServiceStatus) { + PSERVICE_HANDLE hSvc; + PSERVICE lpService; + DPRINT1("ScmrControlService() called\n"); - /* FIXME: return proper service information */ + hSvc = (PSERVICE_HANDLE)hService; + if (hSvc->Handle.Tag != SERVICE_TAG) + { + DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } - /* test data */ -// #if 0 - lpServiceStatus->dwServiceType = 0x12345678; - lpServiceStatus->dwCurrentState = 0x98765432; - lpServiceStatus->dwControlsAccepted = 0xdeadbabe; - lpServiceStatus->dwWin32ExitCode = 0xbaadf00d; - lpServiceStatus->dwServiceSpecificExitCode = 0xdeadf00d; - lpServiceStatus->dwCheckPoint = 0xbaadbabe; - lpServiceStatus->dwWaitHint = 0x2468ACE1; -// #endif + /* FIXME: Check access rights */ + + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + + /* FIXME: Send control code to the service */ + + + /* Return service status information */ + lpServiceStatus->dwServiceType = lpService->Type; + lpServiceStatus->dwCurrentState = lpService->CurrentState; + lpServiceStatus->dwControlsAccepted = lpService->ControlsAccepted; + lpServiceStatus->dwWin32ExitCode = lpService->Win32ExitCode; + lpServiceStatus->dwServiceSpecificExitCode = lpService->ServiceSpecificExitCode; + lpServiceStatus->dwCheckPoint = lpService->CheckPoint; + lpServiceStatus->dwWaitHint = lpService->WaitHint; + return ERROR_SUCCESS; } @@ -303,6 +324,7 @@ unsigned int hService) { PSERVICE_HANDLE hSvc; + PSERVICE lpService; DPRINT1("ScmrDeleteService() called\n"); @@ -314,8 +336,15 @@ STANDARD_RIGHTS_REQUIRED)) return ERROR_ACCESS_DENIED; - /* FIXME: Delete the service */ + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + /* FIXME: Mark service for delete */ + return ERROR_SUCCESS; } @@ -347,13 +376,86 @@ } +/* Function 4 */ +unsigned long +ScmrQueryServiceObjectSecurity(handle_t BindingHandle) +{ + DPRINT1("ScmrQueryServiceSecurity() is unimplemented\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* Function 5 */ +unsigned long +ScmrSetServiceObjectSecurity(handle_t BindingHandle) +{ + DPRINT1("ScmrSetServiceSecurity() is unimplemented\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 6 */ +unsigned long +ScmrQueryServiceStatus(handle_t BindingHandle, + unsigned int hService, + LPSERVICE_STATUS lpServiceStatus) +{ + PSERVICE_HANDLE hSvc; + PSERVICE lpService; + + DPRINT("ScmrQueryServiceStatus() called\n"); + + hSvc = (PSERVICE_HANDLE)hService; + if (hSvc->Handle.Tag != SERVICE_TAG) + { + DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + SERVICE_QUERY_STATUS)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* Return service status information */ + lpServiceStatus->dwServiceType = lpService->Type; + lpServiceStatus->dwCurrentState = lpService->CurrentState; + lpServiceStatus->dwControlsAccepted = lpService->ControlsAccepted; + lpServiceStatus->dwWin32ExitCode = lpService->Win32ExitCode; + lpServiceStatus->dwServiceSpecificExitCode = lpService->ServiceSpecificExitCode; + lpServiceStatus->dwCheckPoint = lpService->CheckPoint; + lpServiceStatus->dwWaitHint = lpService->WaitHint; + + return ERROR_SUCCESS; +} + + +/* Function 7 */ +unsigned long +ScmrSetServiceStatus(handle_t BindingHandle) +{ + DPRINT1("ScmrSetServiceStatus() is unimplemented\n"); + /* FIXME */ + return ERROR_CALL_NOT_IMPLEMENTED; +} + + /* Function 8 */ unsigned long ScmrUnlockServiceDatabase(handle_t BindingHandle, unsigned int hLock) { DPRINT1("ScmrUnlockServiceDatabase() called\n"); + /* FIXME */ return ERROR_SUCCESS; } @@ -364,12 +466,14 @@ unsigned long BootAcceptable) { DPRINT1("ScmrNotifyBootConfigStatus() called\n"); + /* FIXME */ return ERROR_SUCCESS; } /* Function 12 */ +#if 0 unsigned long ScmrCreateServiceW(handle_t BindingHandle, unsigned int hSCManager, @@ -391,9 +495,9 @@ *lpdwTagId = 0; return ERROR_SUCCESS; } +#endif - /* Function 15 */ unsigned long ScmrOpenSCManagerW(handle_t BindingHandle, @@ -447,6 +551,8 @@ unsigned long dwDesiredAccess, unsigned int *hService) { + UNICODE_STRING ServiceName; + PSERVICE lpService; PMANAGER_HANDLE hManager; SC_HANDLE hHandle; DWORD dwError; @@ -464,12 +570,21 @@ return ERROR_INVALID_HANDLE; } - /* FIXME: Check desired access */ + /* FIXME: Lock the service list */ - /* FIXME: Get service database entry */ + /* Get service database entry */ + RtlInitUnicodeString(&ServiceName, + lpServiceName); + lpService = ScmGetServiceEntryByName(&ServiceName); + if (lpService == NULL) + { + DPRINT1("Could not find a service!\n"); + return ERROR_SERVICE_DOES_NOT_EXIST; + } + /* Create a service handle */ - dwError = ScmCreateServiceHandle(NULL, + dwError = ScmCreateServiceHandle(lpService, &hHandle); if (dwError != ERROR_SUCCESS) { @@ -505,8 +620,33 @@ unsigned long dwDesiredAccess, unsigned int *hScm) { + UNICODE_STRING MachineName; + UNICODE_STRING DatabaseName; + DWORD dwError; + DPRINT("ScmrOpenSCManagerA() called\n"); - return ERROR_SUCCESS; + + if (lpMachineName) + RtlCreateUnicodeStringFromAsciiz(&MachineName, + lpMachineName); + + if (lpDatabaseName) + RtlCreateUnicodeStringFromAsciiz(&DatabaseName, + lpDatabaseName); + + dwError = ScmrOpenSCManagerW(BindingHandle, + lpMachineName ? MachineName.Buffer : NULL, + lpDatabaseName ? DatabaseName.Buffer : NULL, + dwDesiredAccess, + hScm); + + if (lpMachineName) + RtlFreeUnicodeString(&MachineName); + + if (lpDatabaseName) + RtlFreeUnicodeString(&DatabaseName); + + return dwError; } @@ -518,8 +658,23 @@ unsigned long dwDesiredAccess, unsigned int *hService) { + UNICODE_STRING ServiceName; + DWORD dwError; + DPRINT("ScmrOpenServiceA() called\n"); - return 0; + + RtlCreateUnicodeStringFromAsciiz(&ServiceName, + lpServiceName); + + dwError = ScmrOpenServiceW(BindingHandle, + hSCManager, + ServiceName.Buffer, + dwDesiredAccess, + hService); + + RtlFreeUnicodeString(&ServiceName); + + return dwError; } _____ Modified: trunk/reactos/subsys/system/services/services.h --- trunk/reactos/subsys/system/services/services.h 2005-04-22 19:57:03 UTC (rev 14749) +++ trunk/reactos/subsys/system/services/services.h 2005-04-23 00:01:37 UTC (rev 14750) @@ -2,8 +2,33 @@ * services.h */ +typedef struct _SERVICE +{ + LIST_ENTRY ServiceListEntry; + UNICODE_STRING ServiceName; + UNICODE_STRING RegistryPath; + UNICODE_STRING ServiceGroup; + ULONG Start; + ULONG Type; + ULONG ErrorControl; + ULONG Tag; + ULONG CurrentState; + ULONG ControlsAccepted; + ULONG Win32ExitCode; + ULONG ServiceSpecificExitCode; + ULONG CheckPoint; + ULONG WaitHint; + + BOOLEAN ServiceVisited; + + HANDLE ControlPipeHandle; + ULONG ProcessId; + ULONG ThreadId; +} SERVICE, *PSERVICE; + + /* services.c */ VOID PrintString(LPCSTR fmt, ...); @@ -15,7 +40,10 @@ VOID ScmGetBootAndSystemDriverState(VOID); VOID ScmAutoStartServices(VOID); +PSERVICE +ScmGetServiceEntryByName(PUNICODE_STRING ServiceName); + /* rpcserver.c */ VOID ScmStartRpcServer(VOID);

19 years, 5 months

[hpoussin] 14749: Add Green driver, that emulates a VT100 compatible server.

by hpoussin＠svn.reactos.com

Add Green driver, that emulates a VT100 compatible server. Input won't work as long as we don't have a kdbclass driver. Added: trunk/reactos/drivers/dd/green/ Added: trunk/reactos/drivers/dd/green/createclose.c Added: trunk/reactos/drivers/dd/green/dispatch.c Added: trunk/reactos/drivers/dd/green/green.c Added: trunk/reactos/drivers/dd/green/green.h Added: trunk/reactos/drivers/dd/green/green.rc Added: trunk/reactos/drivers/dd/green/keyboard.c Added: trunk/reactos/drivers/dd/green/makefile Added: trunk/reactos/drivers/dd/green/misc.c Added: trunk/reactos/drivers/dd/green/pnp.c Added: trunk/reactos/drivers/dd/green/screen.c _____ Added: trunk/reactos/drivers/dd/green/createclose.c --- trunk/reactos/drivers/dd/green/createclose.c 2005-04-22 15:26:14 UTC (rev 14748) +++ trunk/reactos/drivers/dd/green/createclose.c 2005-04-22 19:57:03 UTC (rev 14749) @@ -0,0 +1,38 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VT100 emulator + * FILE: drivers/dd/green/createclose.c + * PURPOSE: IRP_MJ_CREATE, IRP_MJ_CLOSE and IRP_MJ_CLEANUP operations + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + */ + +//#define NDEBUG +#include "green.h" + +NTSTATUS STDCALL +GreenCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("Green: IRP_MJ_CREATE\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +GreenClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("Green: IRP_MJ_CLOSE\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} Property changes on: trunk/reactos/drivers/dd/green/createclose.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/dd/green/dispatch.c --- trunk/reactos/drivers/dd/green/dispatch.c 2005-04-22 15:26:14 UTC (rev 14748) +++ trunk/reactos/drivers/dd/green/dispatch.c 2005-04-22 19:57:03 UTC (rev 14749) @@ -0,0 +1,65 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VT100 emulator + * FILE: drivers/dd/green/dispatch.c + * PURPOSE: Dispatch routines + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + */ + +#define NDEBUG +#include "green.h" + +NTSTATUS STDCALL +GreenDispatch( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + ULONG MajorFunction; + GREEN_DEVICE_TYPE DeviceType; + ULONG_PTR Information; + NTSTATUS Status; + + MajorFunction = IoGetCurrentIrpStackLocation(Irp)->MajorFunction; + DeviceType = ((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Type; + + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; + + DPRINT("Green: Dispatching major function 0x%lx, DeviceType %d\n", + MajorFunction, DeviceType); + + if (MajorFunction == IRP_MJ_CREATE && DeviceType == Green) + return GreenCreate(DeviceObject, Irp); + else if (MajorFunction == IRP_MJ_CLOSE && DeviceType == Green) + return GreenClose(DeviceObject, Irp); + else if (MajorFunction == IRP_MJ_INTERNAL_DEVICE_CONTROL && DeviceType == Green) + { + return KeyboardInternalDeviceControl( + ((PGREEN_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Keyboard, + Irp); + } + else if (MajorFunction == IRP_MJ_INTERNAL_DEVICE_CONTROL && DeviceType == Keyboard) + return KeyboardInternalDeviceControl(DeviceObject, Irp); + else if (MajorFunction == IRP_MJ_DEVICE_CONTROL && DeviceType == Green) + { + return ScreenDeviceControl( + ((PGREEN_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Screen, + Irp); + } + else if (MajorFunction == IRP_MJ_DEVICE_CONTROL && DeviceType == Screen) + return ScreenDeviceControl(DeviceObject, Irp); + else if (MajorFunction == IRP_MJ_WRITE && DeviceType == Screen) + return ScreenWrite(DeviceObject, Irp); + else + { + DPRINT1("Green: unknown combination: MajorFunction 0x%lx, DeviceType %d\n", + MajorFunction, DeviceType); + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest (Irp, IO_NO_INCREMENT); + return Status; +} Property changes on: trunk/reactos/drivers/dd/green/dispatch.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/dd/green/green.c --- trunk/reactos/drivers/dd/green/green.c 2005-04-22 15:26:14 UTC (rev 14748) +++ trunk/reactos/drivers/dd/green/green.c 2005-04-22 19:57:03 UTC (rev 14749) @@ -0,0 +1,44 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VT100 emulator + * FILE: drivers/dd/green/green.c + * PURPOSE: Driver entry point + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + */ + +//#define NDEBUG +#include "green.h" + +VOID STDCALL +DriverUnload(IN PDRIVER_OBJECT DriverObject) +{ + // nothing to do here yet +} + +/* + * Standard DriverEntry method. + */ +NTSTATUS STDCALL +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegPath) +{ + ULONG i; + + DriverObject->DriverUnload = DriverUnload; + DriverObject->DriverExtension->AddDevice = GreenAddDevice; + + for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + DriverObject->MajorFunction[i] = GreenDispatch; + + /* keyboard only */ + //DriverObject->DriverStartIo = GreenStartIo; + + /* keyboard and screen */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = GreenCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = GreenClose; + + return STATUS_SUCCESS; +} Property changes on: trunk/reactos/drivers/dd/green/green.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/dd/green/green.h --- trunk/reactos/drivers/dd/green/green.h 2005-04-22 15:26:14 UTC (rev 14748) +++ trunk/reactos/drivers/dd/green/green.h 2005-04-22 19:57:03 UTC (rev 14749) @@ -0,0 +1,179 @@ +#if defined(__GNUC__) + #include <ddk/ntddk.h> + #include <ddk/ntddser.h> + #include <ntos/halfuncs.h> + #include <ddk/ntddblue.h> + #include <ddk/ntddkbd.h> /* should be in kbdmou.h */ + + #include <debug.h> + + /* FIXME: should be in kbdmou.h */ + typedef struct _CONNECT_DATA { + PDEVICE_OBJECT ClassDeviceObject; + PVOID ClassService; + } CONNECT_DATA, *PCONNECT_DATA; + + /* FIXME: should be in kbdmou.h */ + #define IOCTL_INTERNAL_KEYBOARD_CONNECT \ + CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0080, METHOD_NEITHER, FILE_ANY_ACCESS) + + NTSTATUS STDCALL + ObReferenceObjectByName(PUNICODE_STRING ObjectPath, + ULONG Attributes, + PACCESS_STATE PassedAccessState, + ACCESS_MASK DesiredAccess, + POBJECT_TYPE ObjectType, + KPROCESSOR_MODE AccessMode, + PVOID ParseContext, + PVOID* ObjectPtr); + + /* FIXME: should be in kbdmou.h */ + typedef VOID (*PSERVICE_CALLBACK_ROUTINE)(PDEVICE_OBJECT, PKEYBOARD_INPUT_DATA, PKEYBOARD_INPUT_DATA, PULONG); + + typedef struct _CLASS_INFORMATION + { + PDEVICE_OBJECT DeviceObject; + PVOID CallBack; + } CLASS_INFORMATION, *PCLASS_INFORMATION; + + #define KEYBOARD_BUFFER_SIZE 100 + +#elif defined(_MSC_VER) + #include <ntddk.h> + #include <ntddser.h> + #include <kbdmou.h> + + #define STDCALL + + #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint + #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) + #define DPRINT DPRINT1 + #define CHECKPOINT CHECKPOINT1 +#else + #error Unknown compiler! +#endif + +typedef enum +{ + Green, + Screen, + Keyboard +} GREEN_DEVICE_TYPE; + +typedef struct _COMMON_DEVICE_EXTENSION +{ + GREEN_DEVICE_TYPE Type; +} COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; + +typedef struct _KEYBOARD_DEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; + PDEVICE_OBJECT Green; + + CLASS_INFORMATION ClassInformation; + HANDLE WorkerThreadHandle; + KDPC KeyboardDpc; + + ULONG ActiveQueue; + ULONG InputDataCount[2]; + KEYBOARD_INPUT_DATA KeyboardInputData[2][KEYBOARD_BUFFER_SIZE]; +} KEYBOARD_DEVICE_EXTENSION, *PKEYBOARD_DEVICE_EXTENSION; + +typedef struct _SCREEN_DEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; + PDEVICE_OBJECT Green; + + PUCHAR VideoMemory; /* Pointer to video memory */ + USHORT CharAttribute; /* Current color attribute */ + ULONG Mode; + UCHAR ScanLines; /* Height of a text line */ + UCHAR Rows; /* Number of rows */ + UCHAR Columns; /* Number of columns */ + UCHAR TabWidth; + + ULONG LogicalOffset; /* Position of the cursor */ + + UCHAR SendBuffer[1024]; + ULONG SendBufferPosition; +} SCREEN_DEVICE_EXTENSION, *PSCREEN_DEVICE_EXTENSION; + +typedef struct _GREEN_DEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; + PDEVICE_OBJECT Serial; + + PDEVICE_OBJECT LowerDevice; + ULONG BaudRate; + SERIAL_LINE_CONTROL LineControl; + SERIAL_TIMEOUTS Timeouts; + + PDEVICE_OBJECT Keyboard; + PDEVICE_OBJECT Screen; +} GREEN_DEVICE_EXTENSION, *PGREEN_DEVICE_EXTENSION; + +/************************************ createclose.c */ + +NTSTATUS STDCALL +GreenCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS STDCALL +GreenClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +/************************************ dispatch.c */ + +NTSTATUS STDCALL +GreenDispatch( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +/************************************ keyboard.c */ + +NTSTATUS +KeyboardInitialize( + IN PDRIVER_OBJECT DriverObject, + OUT PDEVICE_OBJECT* KeyboardFdo); + +NTSTATUS +KeyboardInternalDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +/************************************ misc.c */ + +NTSTATUS +GreenDeviceIoControl( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG CtlCode, + IN PVOID InputBuffer OPTIONAL, + IN ULONG InputBufferSize, + IN OUT PVOID OutputBuffer OPTIONAL, + IN OUT PULONG OutputBufferSize); + +/************************************ pnp.c */ + +NTSTATUS STDCALL +GreenAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo); + +/************************************ screen.c */ + +NTSTATUS +ScreenInitialize( + IN PDRIVER_OBJECT DriverObject, + OUT PDEVICE_OBJECT* ScreenFdo); + +NTSTATUS +ScreenWrite( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +ScreenDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); Property changes on: trunk/reactos/drivers/dd/green/green.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/dd/green/green.rc --- trunk/reactos/drivers/dd/green/green.rc 2005-04-22 15:26:14 UTC (rev 14748) +++ trunk/reactos/drivers/dd/green/green.rc 2005-04-22 19:57:03 UTC (rev 14749) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "VT100 Server Driver\0" +#define REACTOS_STR_INTERNAL_NAME "green\0" +#define REACTOS_STR_ORIGINAL_FILENAME "green.sys\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/drivers/dd/green/green.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/dd/green/keyboard.c --- trunk/reactos/drivers/dd/green/keyboard.c 2005-04-22 15:26:14 UTC (rev 14748) +++ trunk/reactos/drivers/dd/green/keyboard.c 2005-04-22 19:57:03 UTC (rev 14749) @@ -0,0 +1,346 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VT100 emulator + * FILE: drivers/dd/green/keyboard.c + * PURPOSE: Keyboard part of green management + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + */ + +#define NDEBUG +#include "green.h" + +static BOOLEAN +TranslateCharToScanCodes( + IN PUCHAR InputBuffer, + IN ULONG InputBufferSize, + OUT KEYBOARD_INPUT_DATA* OutputBuffer, + OUT PULONG OutputBufferSize, + OUT PULONG BytesConsumed) +{ + BOOLEAN NormalKey = FALSE; + USHORT MakeCode; + + if (InputBufferSize == 0) + return FALSE; + + switch (*InputBuffer) + { + case 0x1b: MakeCode = 0x01; NormalKey = TRUE; break; /* ESC */ + + case '1': MakeCode = 0x02; NormalKey = TRUE; break; + case '2': MakeCode = 0x03; NormalKey = TRUE; break; + case '3': MakeCode = 0x04; NormalKey = TRUE; break; + case '4': MakeCode = 0x05; NormalKey = TRUE; break; + case '5': MakeCode = 0x06; NormalKey = TRUE; break; + case '6': MakeCode = 0x07; NormalKey = TRUE; break; + case '7': MakeCode = 0x08; NormalKey = TRUE; break; + case '8': MakeCode = 0x09; NormalKey = TRUE; break; + case '9': MakeCode = 0x0a; NormalKey = TRUE; break; + case '0': MakeCode = 0x0b; NormalKey = TRUE; break; + case '-': MakeCode = 0x0c; NormalKey = TRUE; break; + case '=': MakeCode = 0x0d; NormalKey = TRUE; break; + case '\b': MakeCode = 0x0e; NormalKey = TRUE; break; + + case '\t': MakeCode = 0x0f; NormalKey = TRUE; break; + case 'q': MakeCode = 0x10; NormalKey = TRUE; break; + case 'w': MakeCode = 0x11; NormalKey = TRUE; break; + case 'e': MakeCode = 0x12; NormalKey = TRUE; break; + case 'r': MakeCode = 0x13; NormalKey = TRUE; break; + case 't': MakeCode = 0x14; NormalKey = TRUE; break; + case 'y': MakeCode = 0x15; NormalKey = TRUE; break; + case 'u': MakeCode = 0x16; NormalKey = TRUE; break; + case 'i': MakeCode = 0x17; NormalKey = TRUE; break; + case 'o': MakeCode = 0x18; NormalKey = TRUE; break; + case 'p': MakeCode = 0x19; NormalKey = TRUE; break; + case '[': MakeCode = 0x1a; NormalKey = TRUE; break; + case ']': MakeCode = 0x1b; NormalKey = TRUE; break; + + case '\r': MakeCode = 0x1c; NormalKey = TRUE; break; + + case 'a': MakeCode = 0x1e; NormalKey = TRUE; break; + case 's': MakeCode = 0x1f; NormalKey = TRUE; break; + case 'd': MakeCode = 0x20; NormalKey = TRUE; break; + case 'f': MakeCode = 0x21; NormalKey = TRUE; break; + case 'g': MakeCode = 0x22; NormalKey = TRUE; break; + case 'h': MakeCode = 0x23; NormalKey = TRUE; break; + case 'j': MakeCode = 0x24; NormalKey = TRUE; break; + case 'k': MakeCode = 0x25; NormalKey = TRUE; break; + case 'l': MakeCode = 0x26; NormalKey = TRUE; break; + case ';': MakeCode = 0x27; NormalKey = TRUE; break; + case '\'': MakeCode = 0x28; NormalKey = TRUE; break; + + case '`': MakeCode = 0x29; NormalKey = TRUE; break; + + case '\\': MakeCode = 0x2b; NormalKey = TRUE; break; + + case 'z': MakeCode = 0x2c; NormalKey = TRUE; break; + case 'x': MakeCode = 0x2d; NormalKey = TRUE; break; + case 'c': MakeCode = 0x2e; NormalKey = TRUE; break; + case 'v': MakeCode = 0x2f; NormalKey = TRUE; break; + case 'b': MakeCode = 0x30; NormalKey = TRUE; break; + case 'n': MakeCode = 0x31; NormalKey = TRUE; break; + case 'm': MakeCode = 0x32; NormalKey = TRUE; break; + case ',': MakeCode = 0x33; NormalKey = TRUE; break; + case '.': MakeCode = 0x34; NormalKey = TRUE; break; + case '/': MakeCode = 0x35; NormalKey = TRUE; break; + + case ' ': MakeCode = 0x39; NormalKey = TRUE; break; + } + if (NormalKey && *OutputBufferSize >= 2) + { + OutputBuffer[0].MakeCode = MakeCode; + OutputBuffer[0].Flags = KEY_MAKE; + OutputBuffer[1].MakeCode = MakeCode; + OutputBuffer[1].Flags = KEY_BREAK; + *BytesConsumed = 2; + return TRUE; + } + + /* Consume strange character by ignoring it */ + DPRINT1("Green: strange byte received 0x%02x ('%c')\n", + *InputBuffer, *InputBuffer >= 32 ? *InputBuffer : '.'); + *BytesConsumed = 1; + return TRUE; +} + +NTSTATUS +KeyboardInitialize( + IN PDRIVER_OBJECT DriverObject, + OUT PDEVICE_OBJECT* KeyboardFdo) +{ + PDEVICE_OBJECT Fdo; + PKEYBOARD_DEVICE_EXTENSION DeviceExtension; + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass1"); + NTSTATUS Status; + + DPRINT("Green: KeyboardInitialize() called\n"); + + Status = IoCreateDevice(DriverObject, + sizeof(KEYBOARD_DEVICE_EXTENSION), + &DeviceName, /* FIXME: don't hardcode string */ + FILE_DEVICE_KEYBOARD, + FILE_DEVICE_SECURE_OPEN, + TRUE, + &Fdo); + if (!NT_SUCCESS(Status)) + return Status; + + DeviceExtension = (PKEYBOARD_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(KEYBOARD_DEVICE_EXTENSION)); + DeviceExtension->Common.Type = Keyboard; + Fdo->Flags |= DO_POWER_PAGABLE | DO_BUFFERED_IO; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + *KeyboardFdo = Fdo; + + return STATUS_SUCCESS; +} + +static VOID STDCALL +KeyboardDpcSendData( + IN PKDPC Dpc, + IN PVOID pDeviceExtension, /* real type PKEYBOARD_DEVICE_EXTENSION */ + IN PVOID Unused1, + IN PVOID Unused2) +{ + PKEYBOARD_DEVICE_EXTENSION DeviceExtension; + ULONG Queue; + ULONG InputDataConsumed; + + DeviceExtension = (PKEYBOARD_DEVICE_EXTENSION)pDeviceExtension; + + Queue = DeviceExtension->ActiveQueue % 2; + InterlockedIncrement((PLONG)&DeviceExtension->ActiveQueue); + (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.CallBack) ( + DeviceExtension->ClassInformation.DeviceObject, + DeviceExtension->KeyboardInputData[Queue], + &DeviceExtension->KeyboardInputData[Queue][DeviceExtension->InputDataCou nt[Queue]], + &InputDataConsumed); + + DeviceExtension->InputDataCount[Queue] = 0; +} +static VOID STDCALL +KeyboardDeviceWorker( + PVOID Context) +{ + PDEVICE_OBJECT DeviceObject; + PKEYBOARD_DEVICE_EXTENSION DeviceExtension; + PGREEN_DEVICE_EXTENSION GreenDeviceExtension; + PDEVICE_OBJECT LowerDevice; + UCHAR Buffer[16]; /* Arbitrary size */ + ULONG BufferSize; + PIRP Irp; + IO_STATUS_BLOCK ioStatus; + KEVENT event; + KIRQL OldIrql; + ULONG i, Queue; + ULONG SpaceInQueue; + ULONG BytesConsumed; + PKEYBOARD_INPUT_DATA Input; + NTSTATUS Status; + + DPRINT("Green: KeyboardDeviceWorker() called\n"); + + DeviceObject = (PDEVICE_OBJECT)Context; + DeviceExtension = (PKEYBOARD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + GreenDeviceExtension = (PGREEN_DEVICE_EXTENSION)DeviceExtension->Green->DeviceExtension; + LowerDevice = GreenDeviceExtension->Serial; + BufferSize = sizeof(Buffer); + + /* Initialize device extension */ + DeviceExtension->ActiveQueue = 0; + DeviceExtension->InputDataCount[0] = 0; + DeviceExtension->InputDataCount[1] = 0; + KeInitializeDpc(&DeviceExtension->KeyboardDpc, KeyboardDpcSendData, DeviceExtension); + RtlZeroMemory(&DeviceExtension->KeyboardInputData, sizeof(DeviceExtension->KeyboardInputData)); + + /* main read loop */ + while (TRUE) + { + KeInitializeEvent(&event, NotificationEvent, FALSE); + Irp = IoBuildSynchronousFsdRequest( + IRP_MJ_READ, + LowerDevice, + Buffer, BufferSize, + 0, + &event, + &ioStatus); + if (!Irp) + { + /* no memory actually, try later */ + CHECKPOINT; + KeStallExecutionProcessor(10); + continue; + } + + Status = IoCallDriver(LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL); + Status = ioStatus.Status; + } + if (!NT_SUCCESS(Status)) + continue; + + /* Read all available data and process */ + i = 0; + while (i < ioStatus.Information) + { + Queue = DeviceExtension->ActiveQueue % 2; + + Input = &DeviceExtension->KeyboardInputData[Queue][DeviceExtension->InputDataCou nt[Queue]]; + + /* Translate current chars to scan codes */ + SpaceInQueue = KEYBOARD_BUFFER_SIZE - DeviceExtension->InputDataCount[Queue]; + if (TranslateCharToScanCodes( + &Buffer[i], /* input buffer */ + ioStatus.Information - i, /* input buffer size */ + Input, /* output buffer */ + &SpaceInQueue, /* output buffer size */ + &BytesConsumed)) /* bytes consumed in input buffer */ + { + DPRINT1("Green: got char 0x%02x (%c)\n", Buffer[i], Buffer[i] >= 32 ? Buffer[i] : ' '); + DeviceExtension->InputDataCount[Queue] += BytesConsumed; + + /* Send the data to the keyboard class driver */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + KeInsertQueueDpc(&DeviceExtension->KeyboardDpc, NULL, NULL); + KeLowerIrql(OldIrql); + i += BytesConsumed; + } + else + { + /* TranslateCharToScanCodes failed. Possible reasons: + * - not enough bytes in input buffer (escape control code; wait next received bytes) + * - not enough room in output buffer (wait for the Dpc to empty it) + * + * The best way to resolve this is to try later. + */ + i++; + } + } + } + + PsTerminateSystemThread(STATUS_SUCCESS); +} + +NTSTATUS +KeyboardInternalDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + PKEYBOARD_DEVICE_EXTENSION DeviceExtension; + PGREEN_DEVICE_EXTENSION GreenDeviceExtension; + OBJECT_ATTRIBUTES objectAttributes; + PDEVICE_OBJECT LowerDevice; + NTSTATUS Status; + + Stack = IoGetCurrentIrpStackLocation(Irp); + Irp->IoStatus.Information = 0; + DeviceExtension = (PKEYBOARD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + GreenDeviceExtension = (PGREEN_DEVICE_EXTENSION)DeviceExtension->Green->DeviceExtension; + LowerDevice = GreenDeviceExtension->Serial; + DPRINT1("Green: LowerDevice %p\n", LowerDevice); + + switch (Stack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_INTERNAL_KEYBOARD_CONNECT: + { + ULONG Fcr; + + DPRINT("Green: IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_KEYBOARD_CONNECT\n"); + if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + DeviceExtension->ClassInformation = + *((PCLASS_INFORMATION)Stack->Parameters.DeviceIoControl.Type3InputBuffer ); + + /* Initialize serial port */ + Fcr = 0; + Status = GreenDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_FIFO_CONTROL, + &Fcr, sizeof(Fcr), NULL, NULL); + if (!NT_SUCCESS(Status)) break; + /* Set serial port speed */ + Status = GreenDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, + &GreenDeviceExtension->BaudRate, sizeof(GreenDeviceExtension->BaudRate), NULL, NULL); + if (!NT_SUCCESS(Status)) break; + /* Set LCR */ + Status = GreenDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, + &GreenDeviceExtension->LineControl, sizeof(GreenDeviceExtension->LineControl), NULL, NULL); + if (!NT_SUCCESS(Status)) break; + + /* Set timeouts */ + Status = GreenDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS, + &GreenDeviceExtension->Timeouts, sizeof(GreenDeviceExtension->Timeouts), NULL, NULL); + if (!NT_SUCCESS(Status)) break; + + /* Start read loop */ + InitializeObjectAttributes(&objectAttributes, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); + Status = PsCreateSystemThread( + &DeviceExtension->WorkerThreadHandle, + (ACCESS_MASK)0L, + &objectAttributes, + NULL, + NULL, + KeyboardDeviceWorker, + DeviceObject); + break; + } + default: + { + DPRINT("Green: IRP_MJ_INTERNAL_DEVICE_CONTROL / unknown ioctl code 0x%lx\n", + Stack->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_INVALID_DEVICE_REQUEST; + } + } + + Irp->IoStatus.Status = Status; + IoCompleteRequest (Irp, IO_NO_INCREMENT); + return Status; +} Property changes on: trunk/reactos/drivers/dd/green/keyboard.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/dd/green/makefile --- trunk/reactos/drivers/dd/green/makefile 2005-04-22 15:26:14 UTC (rev 14748) +++ trunk/reactos/drivers/dd/green/makefile 2005-04-22 19:57:03 UTC (rev 14749) @@ -0,0 +1,24 @@ +# $Id: + +PATH_TO_TOP = ../../.. + +TARGET_BOOTSTRAP = yes + +TARGET_TYPE = driver + +TARGET_NAME = green + +TARGET_CFLAGS = -Wall -Werror -D__USE_W32API + +TARGET_OBJECTS = \ + $(TARGET_NAME).o \ + createclose.o \ + dispatch.o \ + keyboard.o \ + misc.o \ + pnp.o \ + screen.o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk Property changes on: trunk/reactos/drivers/dd/green/makefile ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/dd/green/misc.c --- trunk/reactos/drivers/dd/green/misc.c 2005-04-22 15:26:14 UTC (rev 14748) +++ trunk/reactos/drivers/dd/green/misc.c 2005-04-22 19:57:03 UTC (rev 14749) @@ -0,0 +1,60 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VT100 emulator + * FILE: drivers/dd/green/misc.c + * PURPOSE: Misceallenous operations + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + */ + +//#define NDEBUG +#include "green.h" + +NTSTATUS +GreenDeviceIoControl( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG CtlCode, + IN PVOID InputBuffer OPTIONAL, + IN ULONG InputBufferSize, + IN OUT PVOID OutputBuffer OPTIONAL, + IN OUT PULONG OutputBufferSize) +{ + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + + KeInitializeEvent (&Event, NotificationEvent, FALSE); + + Irp = IoBuildDeviceIoControlRequest(CtlCode, + DeviceObject, + InputBuffer, + InputBufferSize, + OutputBuffer, + (OutputBufferSize) ? *OutputBufferSize : 0, + FALSE, + &Event, + &IoStatus); + if (Irp == NULL) + { + DPRINT("Green: IoBuildDeviceIoControlRequest() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = IoCallDriver(DeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + DPRINT("Green: Operation pending\n"); + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + if (OutputBufferSize) + { + *OutputBufferSize = IoStatus.Information; + } + + return Status; +} Property changes on: trunk/reactos/drivers/dd/green/misc.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/dd/green/pnp.c --- trunk/reactos/drivers/dd/green/pnp.c 2005-04-22 15:26:14 UTC (rev 14748) +++ trunk/reactos/drivers/dd/green/pnp.c 2005-04-22 19:57:03 UTC (rev 14749) @@ -0,0 +1,87 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VT100 emulator + * FILE: drivers/dd/green/pnp.c + * PURPOSE: IRP_MJ_PNP operations + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + */ + +#define NDEBUG +#include "green.h" + +NTSTATUS STDCALL +GreenAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo) +{ + PDEVICE_OBJECT Fdo = NULL; + PGREEN_DEVICE_EXTENSION DeviceExtension; + UNICODE_STRING serialPortName; + NTSTATUS Status; + + DPRINT("Green: AddDevice(DriverObject %p, Pdo %p)\n", DriverObject, Pdo); + + /* Create green FDO */ + Status = IoCreateDevice(DriverObject, + sizeof(GREEN_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN, + TRUE, + &Fdo); + if (!NT_SUCCESS(Status)) + return Status; + + DeviceExtension = (PGREEN_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(GREEN_DEVICE_EXTENSION)); + DeviceExtension->Common.Type = Green; + + Status = KeyboardInitialize(DriverObject, &DeviceExtension->Keyboard); + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice(Fdo); + return Status; + } + ((PKEYBOARD_DEVICE_EXTENSION)DeviceExtension->Keyboard->DeviceExtension) ->Green = Fdo; + + Status = ScreenInitialize(DriverObject, &DeviceExtension->Screen); + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice(DeviceExtension->Keyboard); + IoDeleteDevice(Fdo); + return Status; + } + ((PSCREEN_DEVICE_EXTENSION)DeviceExtension->Screen->DeviceExtension)->Gr een = Fdo; + + /* initialize green Fdo */ + DeviceExtension->LowerDevice = IoAttachDeviceToDeviceStack(Fdo, Pdo); + DeviceExtension->LineControl.WordLength = 8; + DeviceExtension->LineControl.Parity = NO_PARITY; + DeviceExtension->LineControl.StopBits = STOP_BIT_1; + DeviceExtension->BaudRate = SERIAL_BAUD_38400; + DeviceExtension->Timeouts.ReadTotalTimeoutConstant = 1; /* not null */ + DeviceExtension->Timeouts.ReadIntervalTimeout = INFINITE; + DeviceExtension->Timeouts.ReadTotalTimeoutMultiplier = INFINITE; + DeviceExtension->Timeouts.WriteTotalTimeoutMultiplier = 0; /* FIXME */ + DeviceExtension->Timeouts.WriteTotalTimeoutConstant = 0; /* FIXME */ + + /* open associated serial port */ + RtlInitUnicodeString(&serialPortName, L"\\Device\\Serial1"); /* FIXME: don't hardcode string */ + Status = ObReferenceObjectByName( + &serialPortName, + OBJ_EXCLUSIVE | OBJ_KERNEL_HANDLE, + NULL, + (ACCESS_MASK)0, + IoDeviceObjectType, + KernelMode, + NULL, + (PVOID*)&DeviceExtension->Serial); + /* FIXME: we never ObDereferenceObject */ + + Fdo->Flags |= DO_POWER_PAGABLE | DO_BUFFERED_IO; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + return Status; +} Property changes on: trunk/reactos/drivers/dd/green/pnp.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/dd/green/screen.c --- trunk/reactos/drivers/dd/green/screen.c 2005-04-22 15:26:14 UTC (rev 14748) +++ trunk/reactos/drivers/dd/green/screen.c 2005-04-22 19:57:03 UTC (rev 14749) @@ -0,0 +1,544 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VT100 emulator + * FILE: drivers/dd/green/screen.c + * PURPOSE: Screen part of green management + * + * PROGRAMMERS: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * Art Yerkes + * HervÚ Poussineau (hpoussin(a)reactos.com) + */ + +#define NDEBUG +#include "green.h" +#include <stdarg.h> + +#define ESC ((UCHAR)0x1b) + +/* Force a move of the cursor on each printer char. + * Very useful for debug, but it is very slow... + */ +//#define FORCE_POSITION + +/* UCHAR is promoted to int when passed through '...', + * so we get int with va_arg and cast them back to UCHAR. + */ +static VOID +AddToSendBuffer( + IN PSCREEN_DEVICE_EXTENSION DeviceExtension, + IN ULONG NumberOfChars, + ... /* IN int */) +{ + PIRP Irp; + IO_STATUS_BLOCK ioStatus; + va_list args; + PDEVICE_OBJECT SerialDevice; + ULONG SizeLeft; + int CurrentInt; + UCHAR CurrentChar; + NTSTATUS Status; + + SizeLeft = sizeof(DeviceExtension->SendBuffer) - DeviceExtension->SendBufferPosition; + if (SizeLeft < NumberOfChars * 2 || NumberOfChars == 0) + { + SerialDevice = ((PGREEN_DEVICE_EXTENSION)DeviceExtension->Green->DeviceExtension)->Seri al; + Irp = IoBuildSynchronousFsdRequest( + IRP_MJ_WRITE, + SerialDevice, [truncated at 1000 lines; 502 more skipped]

19 years, 5 months

[navaraf] 14748: Fix one more typo...Spotted by gasmann.

by navaraf＠svn.reactos.com

Fix one more typo...Spotted by gasmann. Modified: trunk/reactos/subsys/system/reactos/Cz.rc _____ Modified: trunk/reactos/subsys/system/reactos/Cz.rc --- trunk/reactos/subsys/system/reactos/Cz.rc 2005-04-22 15:06:58 UTC (rev 14747) +++ trunk/reactos/subsys/system/reactos/Cz.rc 2005-04-22 15:26:14 UTC (rev 14748) @@ -1,6 +1,6 @@ /* $Id: En.rc 12852 2005-01-06 13:58:04Z denzil $ */ -LANGUAGE LANG_CZECH, SUBLANG_DFAULT +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* String Tables */ STRINGTABLE DISCARDABLE

19 years, 5 months

[chorns] 14747: * Use freeldr.sys for livecd

by chorns＠svn.reactos.com

* Use freeldr.sys for livecd * Install registry hives in the right place on the livecd Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-22 15:03:28 UTC (rev 14746) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-22 15:06:58 UTC (rev 14747) @@ -2741,11 +2741,11 @@ void MingwLiveIsoModuleHandler::OutputLoaderCommands ( string& livecdDirectory ) { - string setupldr = PassThruCacheDirectory ( - NormalizeFilename ( "boot" SSEP "freeldr" SSEP "freeldr" SSEP "setupldr.sys" ), + string freeldr = PassThruCacheDirectory ( + NormalizeFilename ( "boot" SSEP "freeldr" SSEP "freeldr" SSEP "freeldr.sys" ), backend->outputDirectory ); CreateDirectory ( livecdDirectory + SSEP "loader" ); - OutputCopyCommand ( setupldr, + OutputCopyCommand ( freeldr, "setupldr.sys", livecdDirectory + SSEP + "loader" ); } @@ -2753,15 +2753,15 @@ void MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory ) { - string system32ConfigDirectory = NormalizeFilename ( + string reactosSystem32ConfigDirectory = NormalizeFilename ( MingwModuleHandler::PassThruCacheDirectory ( - livecdDirectory + SSEP "system32" SSEP "config" SSEP, + livecdDirectory + SSEP "reactos" SSEP "system32" SSEP "config" SSEP, backend->outputDirectory ) ); fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, "\t$(MKHIVE_TARGET) bootdata %s bootdata" SSEP "livecd.inf bootdata" SSEP "hiveinst.inf\n", - system32ConfigDirectory.c_str () ); + reactosSystem32ConfigDirectory.c_str () ); } void

19 years, 5 months

[chorns] 14746: Correct install name

by chorns＠svn.reactos.com

Correct install name Modified: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml --- branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml 2005-04-22 14:58:22 UTC (rev 14745) +++ branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml 2005-04-22 15:03:28 UTC (rev 14746) @@ -1,4 +1,4 @@ -<module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="debugout.sys"> +<module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys"> <bootstrap base="reactos" /> <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library>

19 years, 5 months

[navaraf] 14745: Fix a typo. Spotted by Potapnik.

by navaraf＠svn.reactos.com

Fix a typo. Spotted by Potapnik. Modified: trunk/reactos/subsys/system/reactos/Cz.rc _____ Modified: trunk/reactos/subsys/system/reactos/Cz.rc --- trunk/reactos/subsys/system/reactos/Cz.rc 2005-04-22 13:54:08 UTC (rev 14744) +++ trunk/reactos/subsys/system/reactos/Cz.rc 2005-04-22 14:58:22 UTC (rev 14745) @@ -6,7 +6,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CAPTION "Instalace ReactOS" - IDS_TEXT "ReactOS nelze instalovat p°Ýmo z tohot CD!\n\n"\ + IDS_TEXT "ReactOS nelze instalovat p°Ýmo z tohoto CD!\n\n"\ "ProsÝm restartujte poÞÝtaÞ z tohoto CD aby jste nainstalovali ReactOS." END

19 years, 5 months

[navaraf] 14744: Denzil <d3nzil@gmail.com>

by navaraf＠svn.reactos.com

Denzil <d3nzil(a)gmail.com> Czech translation of Calc, SndVol32, WineFile and Autorun applications. Added: trunk/reactos/subsys/system/calc/Cz.rc Modified: trunk/reactos/subsys/system/calc/rsrc.rc Added: trunk/reactos/subsys/system/reactos/Cz.rc Modified: trunk/reactos/subsys/system/reactos/reactos.rc Added: trunk/reactos/subsys/system/sndvol32/Cz.rc Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc Added: trunk/reactos/subsys/system/winefile/cz.rc Modified: trunk/reactos/subsys/system/winefile/winefile.rc _____ Added: trunk/reactos/subsys/system/calc/Cz.rc --- trunk/reactos/subsys/system/calc/Cz.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/calc/Cz.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -0,0 +1,157 @@ +/* + * Czech language support + * + * WineCalc (En.rc) + * + * Copyright 2005 Denzil <d3nzil(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "Kalkulßtor" + + IDS_COPYRIGHT1, "Kalkulßtor 5.0. Licencovßn pod LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Zpýt" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_ERR_INVALID_INPUT, "Neplatn² vstup pro funkci." + IDS_ERR_DIVIDE_BY_ZERO, "Nelze dýlit nulou." + IDS_ERR_UNDEFINED, "V²sledek funkce nenÝ definovßn." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&Editace" { + MENUITEM "&KopÝrovat Ctrl+C", IDM_COPY + MENUITEM "&Vlo×it Ctrl+V", IDM_PASTE + } + POPUP "&ZobrazenÝ" { + MENUITEM "StandartnÝ", IDM_MODE_STANDARD + MENUITEM "VýdeckÚ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "SeskupovßnÝ ÞÝslic", IDM_DIGIT_GROUPING + } + POPUP "&Pomoc" { + MENUITEM "TÚmata nßpovýdy", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "O Kalkulßtoru", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&Editace" { + MENUITEM "&KopÝrovat Ctrl+C", IDM_COPY + MENUITEM "&Vlo×it Ctrl+V", IDM_PASTE + } + POPUP "&ZobrazenÝ" { + MENUITEM "StandartnÝ", IDM_MODE_STANDARD + MENUITEM "VýdeckÚ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "èestnßctkovÚ\tF5", ID_CALC_NS_HEX + MENUITEM "DesÝtkovÚ\tF6", ID_CALC_NS_DEC + MENUITEM "OsmiÞkovÚ\tF7", ID_CALC_NS_OCT + MENUITEM "DvojkovÚ\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Stupný\tF2", ID_CALC_MS_DEGREES + MENUITEM "Radißny\tF3", ID_CALC_MS_RADIANS + MENUITEM "Grady\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "SeskupovßnÝ ÞÝslic", IDM_DIGIT_GROUPING + } + POPUP "&Pomoc" { + MENUITEM "TÚmata nßpovýdy", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "O Kalkulßtoru", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&Editace" { + MENUITEM "&KopÝrovat Ctrl+C", IDM_COPY + MENUITEM "&Vlo×it Ctrl+V", IDM_PASTE + } + POPUP "&ZobrazenÝ" { + MENUITEM "StandartnÝ", IDM_MODE_STANDARD + MENUITEM "VýdeckÚ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "èestnßctkovÚ\tF5", ID_CALC_NS_HEX + MENUITEM "DesÝtkovÚ\tF6", ID_CALC_NS_DEC + MENUITEM "OsmiÞkovÚ\tF7", ID_CALC_NS_OCT + MENUITEM "DvojkovÚ\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dword\tF2", ID_CALC_WS_DWORD + MENUITEM "Word\tF3", ID_CALC_WS_WORD + MENUITEM "Byte\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "SeskupovßnÝ ÞÝslic", IDM_DIGIT_GROUPING + } + POPUP "&Pomoc" { + MENUITEM "TÚmata nßpovýdy", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "O Kalkulßtoru", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "O GNU winecalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Co je toto?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Statistics Box" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END _____ Modified: trunk/reactos/subsys/system/calc/rsrc.rc --- trunk/reactos/subsys/system/calc/rsrc.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/calc/rsrc.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -22,6 +22,7 @@ #include "resource.h" #include "En.rc" +#include "Cz.rc" #include "De.rc" #include "Es.rc" #include "Fr.rc" _____ Added: trunk/reactos/subsys/system/reactos/Cz.rc --- trunk/reactos/subsys/system/reactos/Cz.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/reactos/Cz.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -0,0 +1,13 @@ +/* $Id: En.rc 12852 2005-01-06 13:58:04Z denzil $ */ + +LANGUAGE LANG_CZECH, SUBLANG_DFAULT + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION "Instalace ReactOS" + IDS_TEXT "ReactOS nelze instalovat p°Ýmo z tohot CD!\n\n"\ + "ProsÝm restartujte poÞÝtaÞ z tohoto CD aby jste nainstalovali ReactOS." +END + +/* EOF */ _____ Modified: trunk/reactos/subsys/system/reactos/reactos.rc --- trunk/reactos/subsys/system/reactos/reactos.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/reactos/reactos.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -16,8 +16,9 @@ /* Language-specific resources */ +#include "En.rc" +#include "Cz.rc" #include "De.rc" -#include "En.rc" #include "Sv.rc" /* EOF */ _____ Added: trunk/reactos/subsys/system/sndvol32/Cz.rc --- trunk/reactos/subsys/system/sndvol32/Cz.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/sndvol32/Cz.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -0,0 +1,41 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&NastavenÝ" + BEGIN + MENUITEM "&Mo×nosti", IDC_PROPERTIES + MENUITEM "&RozÜÝ°enÚ nastevenÝ", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "&Konec", IDC_EXIT + END + POPUP "&Pomoc" + BEGIN + MENUITEM "&TÚmata nßpovýdy", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&O ovlßdßnÝ hlasitosti ...", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "OvlßdßnÝ hlasitosti" + IDS_NOMIXERDEVICES "Nejsou dostupnÚ ×ßdnÚ smýÜovacÝ za°ÝzenÝ! Aplikace se nynÝ ukonÞÝ." +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Mo×nosti" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&SmýÜovacÝ za°ÝzenÝ:", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "Upravit hlasitost pro:", -1, 7,25,211,77 + PUSHBUTTON "&P°ehrßvßnÝ", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Zßznam", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&JinÚ:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + + PUSHBUTTON "OK", IDOK, 114,226,50,14 + PUSHBUTTON "ZruÜit", IDCANCEL, 168,226,50,14 +END _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc --- trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -15,5 +15,6 @@ IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico #include "En.rc" +#include "Cz.rc" #include "De.rc" #include "Sv.rc" _____ Added: trunk/reactos/subsys/system/winefile/cz.rc --- trunk/reactos/subsys/system/winefile/cz.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/winefile/cz.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -0,0 +1,211 @@ +/* + * WineFile + * Czech Language Support + * + * Copyright 2005 Denzil <d3nzil(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +#pragma code_page(1250) + + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "&Soubor" { + MENUITEM "&Otev°Ýt\tEnter" , 101 + MENUITEM "&P°esunout...\tF7" , ID_FILE_MOVE + MENUITEM "&KopÝrovat...\tF8" , 107 + MENUITEM "&Ve schrßnce...\tF9" , 118 + MENUITEM "&Smazat\tDel" , 108 + MENUITEM "P°&ejmenovat..." , 109 + MENUITEM "V&lastnosti...\tAlt+Enter" , ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "&Komprese..." , 119 + MENUITEM "&Dekomprese..." , 120 + MENUITEM SEPARATOR + MENUITEM "&Spustit..." , ID_EXECUTE + MENUITEM "&Tisknout..." , 102 + MENUITEM "Asociovat..." , 103 + MENUITEM SEPARATOR + MENUITEM "V&ytvo°it adresß°..." , 111 + MENUITEM "&Hledat..." , 104 + MENUITEM "&Zvolit voubory..." , 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "K&onec\tAlt+X" , ID_FILE_EXIT +#else + MENUITEM "K&onec", ID_FILE_EXIT +#endif + } + + POPUP "&Disk" { + MENUITEM "&KopÝrovat disk..." , 201 + MENUITEM "&Jmenovka disk..." , 202 + MENUITEM SEPARATOR + MENUITEM "&Formßtovat disk..." , 203 +#ifdef _WIN95 + MENUITEM "&Vytvo°it systemov² disk...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "P°ipojit &sÝØovÚ za°ÝzenÝ" , 252 + MENUITEM "&Odpojit &sÝØovÚ za°ÝzenÝ" , 253 + MENUITEM SEPARATOR + MENUITEM "SdÝlet jako..." , 254 + MENUITEM "&Odstranit sdÝlenÝ..." , 255 + MENUITEM SEPARATOR + MENUITEM "&Zvolit za°ÝzenÝ..." , 251 + } + + POPUP "&Adresß°e" { + MENUITEM "&DalÜÝ ·rove?\t+" , 301 + MENUITEM "Rozbalit &strom\t*" , 302 + MENUITEM "Rozbalit &vÜe\tStrg+*" , 303 + MENUITEM "Sbalit &strom\t-" , 304 + MENUITEM SEPARATOR + MENUITEM "&OznaÞit potomky" , 505 + } + + POPUP "&ZobrazenÝ" { + MENUITEM "&Strom a adresß°e" , 413 + MENUITEM "&Jen strom" , 411 + MENUITEM "Jen &adresß°e" , 412 + MENUITEM SEPARATOR + MENUITEM "&Rozdýlit" , 414 + MENUITEM SEPARATOR + MENUITEM "&JmÚno" , ID_VIEW_NAME + MENUITEM "&Detaily vÜech soubor¨" , ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "?ß&steÞnÚ detaily..." , ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&T°Ýdit podle jmÚna" , 404 + MENUITEM "T°Ýdit &podle typu" , 405 + MENUITEM "T°Ýdit podle &velikosti" , 406 + MENUITEM "T°Ýdit podle &data" , 407 + MENUITEM SEPARATOR + MENUITEM "T°Ýdit podle &..." , 409 + } + + POPUP "&NastavenÝ" { + MENUITEM "&PotvrzovßnÝ..." , -1 + MENUITEM "&PÝsmo..." , ID_SELECT_FONT + MENUITEM "Upravit panel &nßstroj¨..." , -1 + MENUITEM SEPARATOR + MENUITEM "&Panel nßstroj¨" , ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Panel za°ÝenÝ" , ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Stavov² °ßdek" , ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "&Celaß obrazovka\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Minimalizovat p°i spuÜtýnÝ" , -1 + MENUITEM "&Ulo×it nastavenÝ p°i vypnutÝ" , 511 + } + + + POPUP "&ZabezpeÞenÝ" { + MENUITEM "&P°Ýstup..." , 605 + MENUITEM "&LogovßnÝ..." , 606 + MENUITEM "&VlastnÝk..." , 607 + } + + POPUP "&Okno" { + MENUITEM "NovÚ &okno" , ID_WINDOW_NEW + MENUITEM "KaskßdovßnÝ\tCtrl+F5" , ID_WINDOW_CASCADE + MENUITEM "Uspo°ßdat &horizontßlný" , ID_WINDOW_TILE_HORZ + MENUITEM "Uspo°ßdat &vertikßlný\tCtrl+F4" , ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Zarovnat automaticky" , ID_WINDOW_AUTOSORT +#endif + MENUITEM "Zarovnat &symboly" , ID_WINDOW_ARRANGE + MENUITEM "&Aktualizovat\tF5" , ID_REFRESH + } + + POPUP "&?" { + MENUITEM "&TÚmata nßpovýdy\tF1" , ID_HELP + MENUITEM "HledßnÝ v &nßpovýdý...\tF1" , ID_HELP + MENUITEM "&Jak pou×Ývat nßpovýdu\tF1" , ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Informace o &Winefile..." , ID_ABOUT +/* POPUP "Info..." { + MENUITEM "Informace o &Wine..." , ID_ABOUT_WINE +// MENUITEM "&Licence..." ID_LICENSE +// MENUITEM "&BEZ Z?RUKY" ID_NO_WARRANTY + } */ + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Spustit" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&P°Ýkaz:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "Jako &Symbol" , 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 + PUSHBUTTON "ZruÜit" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Pomoc" , 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Zvolte cÝl" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Cesta:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 + PUSHBUTTON "ZruÜit" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Prochßzet" , 254, 158, 43, 47, 14 +} + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "AplikovßnÝ nastavenÝ pÝsma" + IDS_FONT_SEL_ERROR "Chyba p°i volbý novÚho pÝsma." +} + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Chyba" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Plocha" + IDS_SHELL "P°Ýkazov² °ßdek" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "ZatÝm neimplementovßno" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "JmÚno" + IDS_COL_SIZE "Velikost" + IDS_COL_CDATE "CDatum" + IDS_COL_ADATE "ADatum" + IDS_COL_MDATE "MDatum" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "Links" + IDS_COL_ATTR "Atributy" + IDS_COL_SEC "ZabezpeÞenÝ" +} _____ Modified: trunk/reactos/subsys/system/winefile/winefile.rc --- trunk/reactos/subsys/system/winefile/winefile.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/winefile/winefile.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -27,8 +27,9 @@ /* include localised resources */ +#include "en.rc" +#include "cz.rc" #include "de.rc" -#include "en.rc" #include "es.rc" #include "fr.rc" #include "hu.rc"

19 years, 5 months

← Newer
1
...
11
12
13
14
15
16
17
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005