Ros-diffs March 2007

ros-diffs@reactos.org

20 participants
287 discussions

[fireball] 26169: - Add a few more IOCTLs needed for storage stack - Add a couple of structs from DDK - Change ScsiPort prototype to match DDK
by fireball＠svn.reactos.org 25 Mar '07

25 Mar '07

Author: fireball Date: Sun Mar 25 22:18:51 2007 New Revision: 26169 URL: http://svn.reactos.org/svn/reactos?rev=26169&view=rev Log: - Add a few more IOCTLs needed for storage stack - Add a couple of structs from DDK - Change ScsiPort prototype to match DDK Modified: trunk/reactos/include/ddk/ntdddisk.h trunk/reactos/include/ddk/ntddstor.h trunk/reactos/include/ddk/srb.h Modified: trunk/reactos/include/ddk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdddisk.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntdddisk.h (original) +++ trunk/reactos/include/ddk/ntdddisk.h Sun Mar 25 22:18:51 2007 @@ -125,8 +125,23 @@ #define IOCTL_DISK_REQUEST_STRUCTURE \ CTL_CODE(IOCTL_DISK_BASE, 0x000f, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_MEDIA_REMOVAL \ + CTL_CODE(IOCTL_DISK_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_DISK_EJECT_MEDIA \ + CTL_CODE(IOCTL_DISK_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_DISK_LOAD_MEDIA \ + CTL_CODE(IOCTL_DISK_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) + #define IOCTL_DISK_RESERVE \ CTL_CODE(IOCTL_DISK_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_DISK_RELEASE \ + CTL_CODE(IOCTL_DISK_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_DISK_FIND_NEW_DEVICES \ + CTL_CODE(IOCTL_DISK_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_DISK_SET_CACHE_INFORMATION \ CTL_CODE(IOCTL_DISK_BASE, 0x0036, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) @@ -565,6 +580,15 @@ #define RETURN_SMART_STATUS 0xDA #define ENABLE_DISABLE_AUTO_OFFLINE 0xDB +typedef struct _MAPPED_ADDRESS { + struct _MAPPED_ADDRESS *NextMappedAddress; + PVOID MappedAddress; + ULONG NumberOfBytes; + LARGE_INTEGER IoAddress; + ULONG BusNumber; +} MAPPED_ADDRESS, *PMAPPED_ADDRESS; + + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ddk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddstor.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntddstor.h (original) +++ trunk/reactos/include/ddk/ntddstor.h Sun Mar 25 22:18:51 2007 @@ -324,6 +324,10 @@ UCHAR AdditionalParameters[1]; } STORAGE_PROPERTY_QUERY, *PSTORAGE_PROPERTY_QUERY; +typedef struct _PREVENT_MEDIA_REMOVAL { + BOOLEAN PreventMediaRemoval; +} PREVENT_MEDIA_REMOVAL, *PPREVENT_MEDIA_REMOVAL; + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=2616… ============================================================================== --- trunk/reactos/include/ddk/srb.h (original) +++ trunk/reactos/include/ddk/srb.h Sun Mar 25 22:18:51 2007 @@ -164,6 +164,11 @@ #define SRB_FLAGS_DONT_START_NEXT_PACKET 0x00800000 #define SRB_FLAGS_PORT_DRIVER_RESERVED 0x0F000000 #define SRB_FLAGS_CLASS_DRIVER_RESERVED 0xF0000000 + +/* Asynchronous events */ +#define SRBEV_BUS_RESET 0x0001 +#define SRBEV_SCSI_ASYNC_NOTIFICATION 0x0002 + typedef struct _SCSI_REQUEST_BLOCK { USHORT Length; @@ -496,7 +501,7 @@ ScsiPortIoMapTransfer( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, - IN ULONG LogicalAddress, + IN PVOID LogicalAddress, IN ULONG Length); SCSIPORTAPI

1 0

[fireball] 26168: rbuild uses TABs for indentation.
by fireball＠svn.reactos.org 25 Mar '07

25 Mar '07

Author: fireball Date: Sun Mar 25 21:24:52 2007 New Revision: 26168 URL: http://svn.reactos.org/svn/reactos?rev=26168&view=rev Log: rbuild uses TABs for indentation. Modified: trunk/reactos/hal/halx86/generic/generic.rbuild Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Sun Mar 25 21:24:52 2007 @@ -6,13 +6,13 @@ <define name="_NTHAL_" /> <file>beep.c</file> <file>bus.c</file> - <file>cmos.c</file> - <file>dma.c</file> + <file>cmos.c</file> + <file>dma.c</file> <file>drive.c</file> <file>misc.c</file> <file>pci.c</file> <file>portio.c</file> - <file>profil.c</file> + <file>profil.c</file> <file>reboot.c</file> <file>sysinfo.c</file> <file>timer.c</file> @@ -26,7 +26,7 @@ <define name="_NTHAL_" /> <define name="__USE_W32API" /> <file>irq.S</file> - <file>halinit.c</file> + <file>halinit.c</file> <file>processor.c</file> <file>spinlock.c</file> </module>

1 0

[ion] 26167: - Fixup some kernel module debugging flags/settings from leftovers. - Enable debugging during text-mode setup. - Optimize KeSynhronizeExecution into assembly so we can avoid using EBP and have the fastest possible routine, since it is performance critical. -
by ion＠svn.reactos.org 25 Mar '07

25 Mar '07

Author: ion Date: Sun Mar 25 18:33:54 2007 New Revision: 26167 URL: http://svn.reactos.org/svn/reactos?rev=26167&view=rev Log: - Fixup some kernel module debugging flags/settings from leftovers. - Enable debugging during text-mode setup. - Optimize KeSynhronizeExecution into assembly so we can avoid using EBP and have the fastest possible routine, since it is performance critical. - Modified: trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/spinlock.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Sun Mar 25 18:33:54 2007 @@ -40,7 +40,7 @@ [SetupData] DefaultPath = \ReactOS ;OsLoadOptions = "/NOGUIBOOT /NODEBUG" -OsLoadOptions = "/NOGUIBOOT" +OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Sun Mar 25 18:33:54 2007 @@ -14,7 +14,7 @@ POBJECT_TYPE DbgkDebugObjectType; FAST_MUTEX DbgkpProcessDebugPortMutex; -ULONG DbgkpTraceLevel = 0; //-1; +ULONG DbgkpTraceLevel = 0; GENERIC_MAPPING DbgkDebugObjectMapping = { Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Sun Mar 25 18:33:54 2007 @@ -9,7 +9,7 @@ // // Define this if you want debugging support // -#define _OB_DEBUG_ 0x00 +#define _OB_DEBUG_ 0x01 // // These define the Debug Masks Supported Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Sun Mar 25 18:33:54 2007 @@ -13,7 +13,7 @@ #define NDEBUG #include <internal/debug.h> -ULONG IopTraceLevel = 0; //IO_API_DEBUG | IO_FILE_DEBUG; +ULONG IopTraceLevel = 0; // should go into a proper header VOID Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Sun Mar 25 18:33:54 2007 @@ -2379,3 +2379,31 @@ /* Cleanup verification */ VERIFY_INT_END kid, 0 .endfunc + +.globl _KeSynchronizeExecution@12 +.func KeSynchronizeExecution@12 +_KeSynchronizeExecution@12: + + /* Save EBX and put the interrupt object in it */ + push ebx + mov ebx, [esp+8] + + /* Go to DIRQL */ + mov cl, [ebx+KINTERRUPT_SYNCHRONIZE_IRQL] + call @KfRaiseIrql@4 + + /* Call the routine */ + push eax + push [esp+20] + call [esp+20] + + /* Lower IRQL */ + mov ebx, eax + pop ecx + call @KfLowerIrql@4 + + /* Return status */ + mov eax, ebx + pop ebx + ret 12 +.endfunc Modified: trunk/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/spinlock.c (original) +++ trunk/reactos/ntoskrnl/ke/spinlock.c Sun Mar 25 18:33:54 2007 @@ -250,31 +250,6 @@ /* * @implemented */ -BOOLEAN -NTAPI -KeSynchronizeExecution(IN PKINTERRUPT Interrupt, - IN PKSYNCHRONIZE_ROUTINE SynchronizeRoutine, - IN PVOID SynchronizeContext) -{ - KIRQL OldIrql; - BOOLEAN Status; - - /* Raise IRQL and acquire lock on MP */ - OldIrql = KeAcquireInterruptSpinLock(Interrupt); - - /* Call the routine */ - Status = SynchronizeRoutine(SynchronizeContext); - - /* Release lock and lower IRQL */ - KeReleaseInterruptSpinLock(Interrupt, OldIrql); - - /* Return routine status */ - return Status; -} - -/* - * @implemented - */ VOID NTAPI KeReleaseInterruptSpinLock(IN PKINTERRUPT Interrupt, Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Sun Mar 25 18:33:54 2007 @@ -44,7 +44,7 @@ }; PDEVICE_MAP ObSystemDeviceMap = NULL; -ULONG ObpTraceLevel = OB_HANDLE_DEBUG | OB_REFERENCE_DEBUG; +ULONG ObpTraceLevel = 0; VOID NTAPI Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=26… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Sun Mar 25 18:33:54 2007 @@ -17,7 +17,7 @@ #include "internal/ps_i.h" /* Debugging Level */ -ULONG PspTraceLevel = 0;//PS_KILL_DEBUG | PS_REF_DEBUG; +ULONG PspTraceLevel = 0; /* PRIVATE FUNCTIONS *********************************************************/

1 0

[fireball] 26166: More 26160-style fixes (mandatory addressing of PCR via FS register). Alex & Dmitry - please check this, just in case.
by fireball＠svn.reactos.org 25 Mar '07

25 Mar '07

Author: fireball Date: Sun Mar 25 18:31:03 2007 New Revision: 26166 URL: http://svn.reactos.org/svn/reactos?rev=26166&view=rev Log: More 26160-style fixes (mandatory addressing of PCR via FS register). Alex & Dmitry - please check this, just in case. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Sun Mar 25 18:31:03 2007 @@ -263,7 +263,7 @@ mov dr7, ebx /* Get the PRCB */ - mov edi, PCR[KPCR_PRCB] + mov edi, fs:[KPCR_PRCB] /* Get DR0, 1 */ mov ebx, [edi+KPRCB_DR0] @@ -563,10 +563,10 @@ 1: /* Get the previous exception list */ - mov ebx, PCR[KPCR_EXCEPTION_LIST] + mov ebx, fs:[KPCR_EXCEPTION_LIST] /* Set the exception handler chain terminator */ - mov dword ptr PCR[KPCR_EXCEPTION_LIST], -1 + mov dword ptr fs:[KPCR_EXCEPTION_LIST], -1 /* Save the previous exception list */ mov [esp+KTRAP_FRAME_EXCEPTION_LIST], ebx @@ -838,7 +838,7 @@ cld /* Save the exception list */ - mov eax, PCR[KPCR_EXCEPTION_LIST] + mov eax, fs:[KPCR_EXCEPTION_LIST] mov [esp+KTRAP_FRAME_EXCEPTION_LIST], eax /* Check if we need debugging */

1 0

[fireball] 26165: - Fix (and optimize) KeRemoveByKeyDeviceQueue() routine. - Add DPRINTs for easier testing/debugging.
by fireball＠svn.reactos.org 25 Mar '07

25 Mar '07

Author: fireball Date: Sun Mar 25 17:23:30 2007 New Revision: 26165 URL: http://svn.reactos.org/svn/reactos?rev=26165&view=rev Log: - Fix (and optimize) KeRemoveByKeyDeviceQueue() routine. - Add DPRINTs for easier testing/debugging. Modified: trunk/reactos/ntoskrnl/ke/devqueue.c Modified: trunk/reactos/ntoskrnl/ke/devqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/devqueue.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/devqueue.c (original) +++ trunk/reactos/ntoskrnl/ke/devqueue.c Sun Mar 25 17:23:30 2007 @@ -45,6 +45,8 @@ BOOLEAN Inserted; ASSERT_DEVICE_QUEUE(DeviceQueue); + DPRINT("KeInsertDeviceQueue() DevQueue %p, Entry %p\n", DeviceQueue, DeviceQueueEntry); + /* Lock the queue */ KiAcquireDeviceQueueLock(DeviceQueue, &DeviceLock); @@ -85,6 +87,8 @@ KLOCK_QUEUE_HANDLE DeviceLock; BOOLEAN Inserted; ASSERT_DEVICE_QUEUE(DeviceQueue); + + DPRINT("KeInsertByKeyDeviceQueue() DevQueue %p, Entry %p, SortKey 0x%x\n", DeviceQueue, DeviceQueueEntry, SortKey); /* Lock the queue */ KiAcquireDeviceQueueLock(DeviceQueue, &DeviceLock); @@ -129,6 +133,8 @@ KLOCK_QUEUE_HANDLE DeviceLock; ASSERT_DEVICE_QUEUE(DeviceQueue); + DPRINT("KeRemoveDeviceQueue() DevQueue %p\n", DeviceQueue); + /* Lock the queue */ KiAcquireDeviceQueueLock(DeviceQueue, &DeviceLock); ASSERT(DeviceQueue->Busy); @@ -172,12 +178,92 @@ KLOCK_QUEUE_HANDLE DeviceLock; ASSERT_DEVICE_QUEUE(DeviceQueue); + DPRINT("KeRemoveByKeyDeviceQueue() DevQueue %p, SortKey 0x%x\n", DeviceQueue, SortKey); + /* Lock the queue */ KiAcquireDeviceQueueLock(DeviceQueue, &DeviceLock); ASSERT(DeviceQueue->Busy); /* Check if this is an empty queue */ if (IsListEmpty(&DeviceQueue->DeviceListHead)) + { + /* Set it to idle and return nothing*/ + DeviceQueue->Busy = FALSE; + ReturnEntry = NULL; + } + else + { + /* If SortKey is greater than the last key, then return the first entry right away */ + ListEntry = &DeviceQueue->DeviceListHead; + ReturnEntry = CONTAINING_RECORD(ListEntry->Blink, + KDEVICE_QUEUE_ENTRY, + DeviceListEntry); + + if (SortKey >= ReturnEntry->SortKey) + { + ReturnEntry = CONTAINING_RECORD(ListEntry->Flink, + KDEVICE_QUEUE_ENTRY, + DeviceListEntry); + + /* Remove it from the list */ + RemoveEntryList(&ReturnEntry->DeviceListEntry); + } + else + { + /* Find entry with SortKey greater than or equal to the passed-in SortKey */ + LIST_FOR_EACH(ReturnEntry, &DeviceQueue->DeviceListHead, KDEVICE_QUEUE_ENTRY, DeviceListEntry) + { + /* Check if keys match */ + if (ReturnEntry->SortKey >= SortKey) + { + /* We found it, so just remove it */ + RemoveEntryList(&ReturnEntry->DeviceListEntry); + break; + } + } + + /* Check if we found something */ + if (!ReturnEntry) + { + /* Not found, return the first entry */ + ListEntry = RemoveHeadList(&DeviceQueue->DeviceListHead); + ReturnEntry = CONTAINING_RECORD(ListEntry, + KDEVICE_QUEUE_ENTRY, + DeviceListEntry); + } + } + + /* Set it as non-inserted */ + ReturnEntry->Inserted = FALSE; + } + + /* Release the lock */ + KiReleaseDeviceQueueLock(&DeviceLock); + + /* Return the entry */ + return ReturnEntry; +} + +/* + * @implemented + */ +PKDEVICE_QUEUE_ENTRY +NTAPI +KeRemoveByKeyDeviceQueueIfBusy(IN PKDEVICE_QUEUE DeviceQueue, + IN ULONG SortKey) +{ + PLIST_ENTRY ListEntry; + PKDEVICE_QUEUE_ENTRY ReturnEntry; + KLOCK_QUEUE_HANDLE DeviceLock; + ASSERT_DEVICE_QUEUE(DeviceQueue); + + DPRINT("KeRemoveByKeyDeviceQueueIfBusy() DevQueue %p, SortKey 0x%x\n", DeviceQueue, SortKey); + + /* Lock the queue */ + KiAcquireDeviceQueueLock(DeviceQueue, &DeviceLock); + + /* Check if this is an empty or idle queue */ + if (!(DeviceQueue->Busy) || (IsListEmpty(&DeviceQueue->DeviceListHead))) { /* Set it to idle and return nothing*/ DeviceQueue->Busy = FALSE; @@ -221,64 +307,6 @@ /* * @implemented */ -PKDEVICE_QUEUE_ENTRY -NTAPI -KeRemoveByKeyDeviceQueueIfBusy(IN PKDEVICE_QUEUE DeviceQueue, - IN ULONG SortKey) -{ - PLIST_ENTRY ListEntry; - PKDEVICE_QUEUE_ENTRY ReturnEntry; - KLOCK_QUEUE_HANDLE DeviceLock; - ASSERT_DEVICE_QUEUE(DeviceQueue); - - /* Lock the queue */ - KiAcquireDeviceQueueLock(DeviceQueue, &DeviceLock); - - /* Check if this is an empty or idle queue */ - if (!(DeviceQueue->Busy) || (IsListEmpty(&DeviceQueue->DeviceListHead))) - { - /* Set it to idle and return nothing*/ - DeviceQueue->Busy = FALSE; - ReturnEntry = NULL; - } - else - { - /* Find entry with SortKey greater than or equal to the passed-in SortKey */ - LIST_FOR_EACH(ReturnEntry, &DeviceQueue->DeviceListHead, KDEVICE_QUEUE_ENTRY, DeviceListEntry) - { - /* Check if keys match */ - if (ReturnEntry->SortKey >= SortKey) - { - /* We found it, so just remove it */ - RemoveEntryList(&ReturnEntry->DeviceListEntry); - break; - } - } - - /* Check if we found something */ - if (!ReturnEntry) - { - /* Not found, return the first entry */ - ListEntry = RemoveHeadList(&DeviceQueue->DeviceListHead); - ReturnEntry = CONTAINING_RECORD(ListEntry, - KDEVICE_QUEUE_ENTRY, - DeviceListEntry); - } - - /* Set it as non-inserted */ - ReturnEntry->Inserted = FALSE; - } - - /* Release the lock */ - KiReleaseDeviceQueueLock(&DeviceLock); - - /* Return the entry */ - return ReturnEntry; -} - -/* - * @implemented - */ BOOLEAN NTAPI KeRemoveEntryDeviceQueue(IN PKDEVICE_QUEUE DeviceQueue, @@ -287,6 +315,8 @@ BOOLEAN OldState; KLOCK_QUEUE_HANDLE DeviceLock; ASSERT_DEVICE_QUEUE(DeviceQueue); + + DPRINT("KeRemoveEntryDeviceQueue() DevQueue %p, Entry %p\n", DeviceQueue, DeviceQueueEntry); /* Lock the queue */ KiAcquireDeviceQueueLock(DeviceQueue, &DeviceLock);

1 0

[greatlrd] 26164: Fixing smaller bugs in dx after some analyzing how vmware drv works. 1. vmware drv do not implement DrvGetDirectDrawInfo that show windows 2000/XP/2003 that mean u are not force to implement this api in the drv, only INDEX_DrvEnableDirectDraw and INDEX_DrvDisableDirectDraw are req to be implement in the driver.
by greatlrd＠svn.reactos.org 25 Mar '07

25 Mar '07

Author: greatlrd Date: Sun Mar 25 14:53:05 2007 New Revision: 26164 URL: http://svn.reactos.org/svn/reactos?rev=26164&view=rev Log: Fixing smaller bugs in dx after some analyzing how vmware drv works. 1. vmware drv do not implement DrvGetDirectDrawInfo that show windows 2000/XP/2003 that mean u are not force to implement this api in the drv, only INDEX_DrvEnableDirectDraw and INDEX_DrvDisableDirectDraw are req to be implement in the driver. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sun Mar 25 14:53:05 2007 @@ -85,99 +85,101 @@ * but we get back how many pvmList it whant we should alloc, same * with pdwFourCC. */ - success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, - &HalInfo, - &pDirectDraw->dwNumHeaps, - NULL, - &pDirectDraw->dwNumFourCC, - NULL); - if (!success) - { - DPRINT1("DrvGetDirectDrawInfo frist call fail\n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - - - /* The driver are not respnose to alloc the memory for pvmList - * but it is win32k responsible todo, Windows 9x it is gdi32.dll - */ - if (pDirectDraw->dwNumHeaps != 0) - { - pDirectDraw->pvmList = (PVIDEOMEMORY) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumHeaps * sizeof(VIDEOMEMORY), TAG_DXPVMLIST); - if (pDirectDraw->pvmList == NULL) - { - return FALSE; - } - } - - /* The driver are not respnose to alloc the memory for pdwFourCC - * but it is win32k responsible todo, Windows 9x it is gdi32.dll - */ - - if (pDirectDraw->dwNumFourCC != 0) - { - pDirectDraw->pdwFourCC = (LPDWORD) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumFourCC * sizeof(DWORD), TAG_DXFOURCC); - - if (pDirectDraw->pdwFourCC == NULL) - { - return FALSE; - } - } - - success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, - &HalInfo, - &pDirectDraw->dwNumHeaps, - pDirectDraw->pvmList, - &pDirectDraw->dwNumFourCC, - pDirectDraw->pdwFourCC); - if (!success) - { - DPRINT1("DrvGetDirectDrawInfo second call fail\n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - - /* We need now convert the DD_HALINFO we got, it can be NT4 driver we - * loading ReactOS supporting NT4 and higher to be loading.so we make - * the HALInfo compatible here so we can easy pass it to gdi32.dll - * without converting it later - */ - - if ((HalInfo.dwSize != sizeof(DD_HALINFO)) && - (HalInfo.dwSize != sizeof(DD_HALINFO_V4))) - { - DPRINT1(" Fail not vaild driver DD_HALINFO struct found\n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - if (HalInfo.dwSize != sizeof(DD_HALINFO)) - { - if (HalInfo.dwSize == sizeof(DD_HALINFO_V4)) - { - /* NT4 Compatible */ - DPRINT1("Got DD_HALINFO_V4 sturct we convert it to DD_HALINFO \n"); - HalInfo.dwSize = sizeof(DD_HALINFO); - HalInfo.lpD3DGlobalDriverData = NULL; - HalInfo.lpD3DHALCallbacks = NULL; - HalInfo.lpD3DBufCallbacks = NULL; - } - else - { - /* Unknown version found */ - DPRINT1(" Fail : did not get DD_HALINFO size \n"); - + if (pDirectDraw->DrvGetDirectDrawInfo) + { + DPRINT1("if u are using vmware driver and see this msg, please repot this\n"); + success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, + &HalInfo, + &pDirectDraw->dwNumHeaps, + NULL, + &pDirectDraw->dwNumFourCC, + NULL); + if (!success) + { + DPRINT1("DrvGetDirectDrawInfo frist call fail\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); return FALSE; } - /* Copy it to user mode pointer the data */ - RtlCopyMemory(&pDirectDraw->Hal, &HalInfo, sizeof(DD_HALINFO)); - } - + + /* The driver are not respnose to alloc the memory for pvmList + * but it is win32k responsible todo, Windows 9x it is gdi32.dll + */ + if (pDirectDraw->dwNumHeaps != 0) + { + pDirectDraw->pvmList = (PVIDEOMEMORY) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumHeaps * sizeof(VIDEOMEMORY), TAG_DXPVMLIST); + if (pDirectDraw->pvmList == NULL) + { + return FALSE; + } + } + + /* The driver are not respnose to alloc the memory for pdwFourCC + * but it is win32k responsible todo, Windows 9x it is gdi32.dll + */ + + if (pDirectDraw->dwNumFourCC != 0) + { + pDirectDraw->pdwFourCC = (LPDWORD) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumFourCC * sizeof(DWORD), TAG_DXFOURCC); + + if (pDirectDraw->pdwFourCC == NULL) + { + return FALSE; + } + } + success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, + &HalInfo, + &pDirectDraw->dwNumHeaps, + pDirectDraw->pvmList, + &pDirectDraw->dwNumFourCC, + pDirectDraw->pdwFourCC); + if (!success) + { + DPRINT1("DrvGetDirectDrawInfo second call fail\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + + /* We need now convert the DD_HALINFO we got, it can be NT4 driver we + * loading ReactOS supporting NT4 and higher to be loading.so we make + * the HALInfo compatible here so we can easy pass it to gdi32.dll + * without converting it later + */ + + if ((HalInfo.dwSize != sizeof(DD_HALINFO)) && + (HalInfo.dwSize != sizeof(DD_HALINFO_V4))) + { + DPRINT1(" Fail not vaild driver DD_HALINFO struct found\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + if (HalInfo.dwSize != sizeof(DD_HALINFO)) + { + if (HalInfo.dwSize == sizeof(DD_HALINFO_V4)) + { + /* NT4 Compatible */ + DPRINT1("Got DD_HALINFO_V4 sturct we convert it to DD_HALINFO \n"); + HalInfo.dwSize = sizeof(DD_HALINFO); + HalInfo.lpD3DGlobalDriverData = NULL; + HalInfo.lpD3DHALCallbacks = NULL; + HalInfo.lpD3DBufCallbacks = NULL; + } + else + { + /* Unknown version found */ + DPRINT1(" Fail : did not get DD_HALINFO size \n"); + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + /* Copy it to user mode pointer the data */ + RtlCopyMemory(&pDirectDraw->Hal, &HalInfo, sizeof(DD_HALINFO)); + } + } + success = pDirectDraw->EnableDirectDraw( pDirectDraw->Global.dhpdev, &pDirectDraw->DD, &pDirectDraw->Surf, @@ -217,9 +219,8 @@ } /* test see if drv got a dx interface or not */ - if (( pDC->DriverFunctions.GetDirectDrawInfo == NULL) || - ( pDC->DriverFunctions.DisableDirectDraw == NULL) || - ( pDC->DriverFunctions.EnableDirectDraw == NULL)) + if ( ( pDC->DriverFunctions.DisableDirectDraw == NULL) || + ( pDC->DriverFunctions.EnableDirectDraw == NULL)) { DC_UnlockDc(pDC); return NULL; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c Sun Mar 25 14:53:05 2007 @@ -82,6 +82,12 @@ } Blt.ddRVal = DDERR_GENERIC; + + /* MSDN say this member is always set to FALSE in windows 2000 or higher */ + Blt.IsClipped = FALSE; + + /* MSDN say this member is always unuse in windows 2000 or higher */ + Blt.dwROPFlags = 0; if (pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_BLT) {

1 0

[gedmurphy] 26163: rearrange servman language files before sbs goes crazy ...
by gedmurphy＠svn.reactos.org 24 Mar '07

24 Mar '07

Author: gedmurphy Date: Sat Mar 24 17:55:57 2007 New Revision: 26163 URL: http://svn.reactos.org/svn/reactos?rev=26163&view=rev Log: rearrange servman language files before sbs goes crazy ... Added: trunk/reactos/base/applications/mscutils/servman/lang/ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc - copied unchanged from r26161, trunk/reactos/base/applications/mscutils/servman/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc - copied unchanged from r26161, trunk/reactos/base/applications/mscutils/servman/en-US.rc trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc - copied unchanged from r26161, trunk/reactos/base/applications/mscutils/servman/id-ID.rc trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc - copied unchanged from r26161, trunk/reactos/base/applications/mscutils/servman/it-IT.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc - copied unchanged from r26161, trunk/reactos/base/applications/mscutils/servman/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/manifest.xml trunk/reactos/base/applications/mscutils/servman/rsrc.rc Removed: trunk/reactos/base/applications/mscutils/servman/de-DE.rc trunk/reactos/base/applications/mscutils/servman/en-US.rc trunk/reactos/base/applications/mscutils/servman/id-ID.rc trunk/reactos/base/applications/mscutils/servman/it-IT.rc trunk/reactos/base/applications/mscutils/servman/ru-RU.rc Modified: trunk/reactos/base/applications/mscutils/servman/servman.rc Removed: trunk/reactos/base/applications/mscutils/servman/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/de-DE.rc (removed) @@ -1,121 +1,0 @@ -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN - -IDR_MAINMENU MENU -BEGIN - POPUP "&Datei" - BEGIN - MENUITEM "B&eenden",ID_FILE_EXIT - END - POPUP "Aktion" - BEGIN - MENUITEM "Start",ID_START - MENUITEM "Stopp",ID_STOP - MENUITEM "Pause",ID_PAUSE - MENUITEM "Fortsetzen",ID_RESUME - MENUITEM "Neustart",ID_RESTART - MENUITEM SEPARATOR - MENUITEM "Aktualisieren",ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Eigenschaften",ID_PROP - END - POPUP "Ansicht" - BEGIN - MENUITEM "Anpassen",ID_VIEW_CUSTOMIZE - END - POPUP "Hilfe" - BEGIN - MENUITEM "Info",ID_HELP_ABOUT - END -END - -IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,190,182 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Über den Service Manager" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", - IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,48,7,130,26 - DEFPUSHBUTTON "Schließen",IDOK,140,162,44,15,WS_GROUP - ICON IDI_SM_ICON,IDC_STATIC,12,7,30,20 - EDITTEXT IDC_LICENSE_EDIT,8,44,174,107,ES_MULTILINE | - ES_READONLY | WS_VSCROLL -END - - -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 -CAPTION "Allgemein" -FONT 8, "MS Shell Dlg",0,0 -STYLE 0x10CF0000 -BEGIN - CONTROL "Dienstname:",IDC_STATIC,"Static",0x50000000,4,11,53,11 - CONTROL "Anzeigename:",IDC_STATIC,"Static",0x50000000,4,29,53,11 - CONTROL "Beschreibung",IDC_STATIC,"Static",0x50000000,4,51,53,11 - CONTROL "",IDC_SERV_NAME,"Static",0x50000000,70,11,176,11 - CONTROL "",IDC_DISP_NAME,"Static",0x50001000,70,29,176,12 - CONTROL "",IDC_DESCRIPTION,"Static",0x50201000,70,46,176,22 - CONTROL "Pfad zum ausführbaren Programm:",IDC_STATIC,"Static",0x50000000,6,73,150,9 - CONTROL "",IDC_STATIC,"Static",0x50001000,6,86,238,12 - CONTROL "Starttyp:",IDC_STATIC,"Static",0x50000000,6,108,53,11 - CONTROL "",IDC_START_TYPE,"ComboBox",0x50010003,70,107,176,11 - CONTROL "Status des Dienstes:",IDC_STATIC,"Static",0x50000000,4,138,100,11 - CONTROL "",IDC_SERV_STATUS,"Static",0x50000000,70,138,176,11 - CONTROL "Start",IDC_START,"Button",0x50010000,6,155,54,15 - CONTROL "Stopp",IDC_STOP,"Button",0x50010000,68,155,54,15 - CONTROL "Pause",IDC_PAUSE,"Button",0x50010000,130,155,54,15 - CONTROL "Fortsetzen",IDC_RESUME,"Button",0x50010000,192,155,54,15 - CONTROL "Sie können die Startparameter festlegen, die verwendet werden, wenn Sie den Dienst von hier aus starten.",IDC_STATIC,"Static",0x50000000,6,177,240,15 - CONTROL "Startparameter",IDC_STATIC,"Static",0x50000000,6,199,53,11 - CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 -END - -IDB_BUTTONS BITMAP "buttons.bmp" - -STRINGTABLE DISCARDABLE -BEGIN - IDS_FIRSTCOLUMN "Name" - IDS_SECONDCOLUMN "Beschreibung" - IDS_THIRDCOLUMN "Status" - IDS_FOURTHCOLUMN "Starttyp" - IDS_FITHCOLUMN "Anmelden als" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_STATUS_RUNNING "Gestartet" - IDS_SERVICES_STATUS_STOPPED "Gestoppt" - IDS_SERVICES_YES "Ja" - IDS_SERVICES_UNKNOWN "Unbekannt" - IDS_SERVICES_AUTO "Automatisch" - IDS_SERVICES_MAN "Manuell" - IDS_SERVICES_DIS "Deaktiviert" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_NUM_SERVICES "Dienste: %d" - IDS_LICENSE "This program 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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." - /*"This program 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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU " - "General Public License along with this program; if not, write " - "to the Free Software Foundation, Inc., 59 Temple Place - Suite " - "330, Boston, MA 02111-1307, USA." */ - -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_PROP "Eigenschaften" - IDS_TOOLTIP_REFRESH "Aktualisieren" - IDS_TOOLTIP_EXPORT "Liste exportieren" - IDS_TOOLTIP_START "Dienst starten" - IDS_TOOLTIP_STOP "Dienst beenden" - IDS_TOOLTIP_PAUSE "Dienst pausieren" - IDS_TOOLTIP_RESTART "Dienst neustarten" -END Removed: trunk/reactos/base/applications/mscutils/servman/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/en-US.rc (removed) @@ -1,282 +1,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -IDR_MAINMENU MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "Export...", ID_EXPORT - MENUITEM SEPARATOR - MENUITEM "E&xit", ID_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Connect to...", ID_CONNECT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Start", ID_START, GRAYED - MENUITEM "Stop", ID_STOP, GRAYED - MENUITEM "Pause", ID_PAUSE, GRAYED - MENUITEM "Resume", ID_RESUME, GRAYED - MENUITEM "Restart", ID_RESTART, GRAYED - MENUITEM SEPARATOR - MENUITEM "Refresh", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Create...", ID_CREATE - MENUITEM "Delete...", ID_DELETE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Properties...", ID_PROP, GRAYED - END - POPUP "View" - BEGIN - MENUITEM "Large Icons", ID_VIEW_LARGE - MENUITEM "Small Icons", ID_VIEW_SMALL - MENUITEM "List", ID_VIEW_LIST - MENUITEM "Details", ID_VIEW_DETAILS - MENUITEM SEPARATOR - MENUITEM "Customize...",ID_VIEW_CUST, GRAYED - END - POPUP "Help" - BEGIN - MENUITEM "Help", ID_HELP - MENUITEM "About", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM "Start", ID_START, GRAYED - MENUITEM "Stop", ID_STOP, GRAYED - MENUITEM "Pause", ID_PAUSE, GRAYED - MENUITEM "Resume", ID_RESUME, GRAYED - MENUITEM "Restart", ID_RESTART, GRAYED - MENUITEM SEPARATOR - MENUITEM "Refresh", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Delete...", ID_DELETE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Properties...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Help...", ID_HELP - END -END - -IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "About Service Manager" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 - PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 -CAPTION "General" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP -BEGIN - LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY - EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "Start", IDC_START, 6, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Stop", IDC_STOP, 68, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Pause", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Resume", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED - LTEXT "Service name:", IDC_STATIC, 4, 11, 53, 11 - LTEXT "Display name:", IDC_STATIC, 4, 29, 53, 11 - LTEXT "Description:", IDC_STATIC, 4, 51, 53, 11 - LTEXT "Path to executable:", IDC_STATIC, 6, 73, 82, 9 - LTEXT "Startup type:", IDC_STATIC, 6, 108, 53, 11 - LTEXT "Service status:", IDC_STATIC, 4, 138, 53, 11 - LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE - LTEXT "You can specify the start parameters that apply when you start the service from here.",IDC_STATIC, 6,177,240,15 - LTEXT "Start parameters:", IDC_STATIC, 6, 200, 58, 11 - EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_DLG_DEPEND DIALOGEX 6,6,253,225 -CAPTION "Dependencies" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP -BEGIN - CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 - CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200 - LTEXT "Some services depend on other services, system drivers and load order groups. If a system component is stopped or it is not running properly, dependant services can be affected.", IDC_STATIC,8, 7, 238, 26 - LTEXT "This service depends on the following components", IDC_STATIC, 8, 57, 236, 9 - LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 -END - -IDD_DLG_CREATE DIALOGEX 6,6,225,209 -CAPTION "Create a service" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP -BEGIN - EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE - EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 13, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE - LTEXT "*Service Name :", IDC_STATIC, 12, 12, 54, 9 - LTEXT "*Display Name :", IDC_STATIC, 12, 33, 54, 9 - LTEXT "*Path to executable :", IDC_STATIC, 10, 51, 68, 9 - LTEXT "Description :", IDC_STATIC, 12, 86, 44, 9 - PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 - PUSHBUTTON "Cancel", IDCANCEL, 176, 192, 46, 13 - LTEXT "Additional options (click help for details)", IDC_STATIC, 10, 151, 134, 9 - PUSHBUTTON "Help", ID_CREATE_HELP, 6, 192, 44, 13 -END - -IDD_DLG_DELETE DIALOGEX 6,6,185,148 -CAPTION "Delete a service" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME -BEGIN - ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 - LTEXT "Are you sure you want to delete the following service? This cannot be undone once removed!", IDC_STATIC, 50, 6, 125, 25 - LTEXT "Service Name:",IDC_STATIC, 6, 40, 80, 9 - LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 - EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY - PUSHBUTTON "Yes", IDOK, 26, 129, 54, 13 - PUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 -END - -IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 -CAPTION "Options" -FONT 8, "MS Shell Dlg",0,0 -STYLE 0x10CF0000 -BEGIN - LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 - PUSHBUTTON "Ok", IDOK, 75, 130, 44, 13 -END - -IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 -CAPTION "Service Control" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW -BEGIN - CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 - LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 - LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 - PUSHBUTTON "&Close", IDOK, 100, 70, 54, 13 -END - - - -STRINGTABLE DISCARDABLE -BEGIN - IDS_FIRSTCOLUMN "Name" - IDS_SECONDCOLUMN "Description" - IDS_THIRDCOLUMN "Status" - IDS_FOURTHCOLUMN "Startup Type" - IDS_FITHCOLUMN "Log On As" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_STARTED "Started" - IDS_SERVICES_STOPPED "Stopped" - IDS_SERVICES_AUTO "Automatic" - IDS_SERVICES_MAN "Manual" - IDS_SERVICES_DIS "Disabled" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NUM_SERVICES "Num Services: %d" - IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou 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." -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_PROP "Properties" - IDS_TOOLTIP_REFRESH "Refresh" - IDS_TOOLTIP_EXPORT "Export list" - IDS_TOOLTIP_CREATE "Create a new service" - IDS_TOOLTIP_DELETE "Deletes an existing service" - IDS_TOOLTIP_START "Start service" - IDS_TOOLTIP_STOP "Stop service" - IDS_TOOLTIP_PAUSE "Pause service" - IDS_TOOLTIP_RESTART "Restart service" - IDS_TOOLTIP_HELP "Help" - IDS_TOOLTIP_EXIT "Exit" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_PROGRESS_INFO_START "ReactOS is attempting to start the following service" - IDS_PROGRESS_INFO_STOP "ReactOS is attempting to stop the following service" - IDS_CREATE_SUCCESS "Service Created Succesfully" - IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" - IDS_DELETE_STOP "You must manually stop the service before deleting!" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" -END -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_EXPORT " Exports the current list to a file." - IDS_HINT_EXIT " Exits the program." - - IDS_HINT_CONNECT " Manage a different computer." - IDS_HINT_START " Start the selected service." - IDS_HINT_STOP " Stop the selected service." - IDS_HINT_PAUSE " Pause the selected service." - IDS_HINT_RESUME " Resume the selected service." - IDS_HINT_RESTART " Stop and start the selected service." - IDS_HINT_REFRESH " Refresh the service list." - IDS_HINT_EDIT " Edit the properties of the selected service." - IDS_HINT_CREATE " Create a new service." - IDS_HINT_DELETE " Delete the selected service." - IDS_HINT_PROP " Open property sheet for the current selection." - - IDS_HINT_LARGE " Display items by using large icons." - IDS_HINT_SMALL " Display items by using small icons." - IDS_HINT_LIST " Display item in a list." - IDS_HINT_DETAILS " Display information about each item in a window." - IDS_HINT_CUST " Customizes the view." - - IDS_HINT_HELP " Display help window." - IDS_HINT_ABOUT " About ReactOS Service Manager." - - IDS_HINT_SYS_RESTORE " Restores this window to normal size." - IDS_HINT_SYS_MOVE " Moves this window." - IDS_HINT_SYS_SIZE " Resizes this window." - IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." - IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." - IDS_HINT_SYS_CLOSE " Closes this window." -END Removed: trunk/reactos/base/applications/mscutils/servman/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/id-ID.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/id-ID.rc (removed) @@ -1,282 +1,0 @@ -LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT - -IDR_MAINMENU MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "Ekspor...", ID_EXPORT - MENUITEM SEPARATOR - MENUITEM "&Keluar", ID_EXIT - END - POPUP "Aksi" - BEGIN - MENUITEM "Sambung ke...", ID_CONNECT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Mulai", ID_START, GRAYED - MENUITEM "Hentikan", ID_STOP, GRAYED - MENUITEM "Istirahat", ID_PAUSE, GRAYED - MENUITEM "Lanjutkan", ID_RESUME, GRAYED - MENUITEM "Mulai lagi", ID_RESTART, GRAYED - MENUITEM SEPARATOR - MENUITEM "Segarkan", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Buat...", ID_CREATE - MENUITEM "Hapus...", ID_DELETE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Properti...", ID_PROP, GRAYED - END - POPUP "Lihat" - BEGIN - MENUITEM "Ikon Besar", ID_VIEW_LARGE - MENUITEM "Ikon Kecil", ID_VIEW_SMALL - MENUITEM "Daftar", ID_VIEW_LIST - MENUITEM "Detil", ID_VIEW_DETAILS - MENUITEM SEPARATOR - MENUITEM "Kustomisasi...",ID_VIEW_CUST, GRAYED - END - POPUP "Bantuan" - BEGIN - MENUITEM "Bantuan", ID_HELP - MENUITEM "Tentang", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM "Mulai", ID_START, GRAYED - MENUITEM "Hentikan", ID_STOP, GRAYED - MENUITEM "Istirahat", ID_PAUSE, GRAYED - MENUITEM "Lanjutkan", ID_RESUME, GRAYED - MENUITEM "Mulai lagi", ID_RESTART, GRAYED - MENUITEM SEPARATOR - MENUITEM "Segarkan", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Hapus...", ID_DELETE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Properti...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Bantuan...", ID_HELP - END -END - -IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "Tentang Manajer Layanan" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Manajer Layanan v0.5.1\nHak Cipta (C) 2005-2006\noleh Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 - PUSHBUTTON "Tutup", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 -CAPTION "Umum" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP -BEGIN - LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY - EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "Mulai", IDC_START, 6, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Hentikan", IDC_STOP, 68, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Istirahat", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Lanjutkan", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED - LTEXT "Nama Layanan:", IDC_STATIC, 4, 11, 53, 11 - LTEXT "Nama Tampilan:", IDC_STATIC, 4, 29, 53, 11 - LTEXT "Deskripsi:", IDC_STATIC, 4, 51, 53, 11 - LTEXT "Path ke executable:", IDC_STATIC, 6, 73, 82, 9 - LTEXT "Tipe Startup:", IDC_STATIC, 6, 108, 53, 11 - LTEXT "Status Layanan:", IDC_STATIC, 4, 138, 53, 11 - LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE - LTEXT "Anda menetapkan parameter mulai yang diterapkan ketika anda memulai layanan dari sini.",IDC_STATIC, 6,177,240,15 - LTEXT "Parameter Mulai:", IDC_STATIC, 6, 200, 58, 11 - EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_DLG_DEPEND DIALOGEX 6,6,253,225 -CAPTION "Ketergantungan" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP -BEGIN - CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 - CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200 - LTEXT "Beberapa layanan bergantung pada layanan lainnya, driver sistem dan grup urutan pengambilan. Jika komponen sistem dihentikan atau tidak berjalan dengan benar, layanan yang bergantung akan dipengaruhi.", IDC_STATIC,8, 7, 238, 26 - LTEXT "Layanan ini tergantun pada komponen berikut", IDC_STATIC, 8, 57, 236, 9 - LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 -END - -IDD_DLG_CREATE DIALOGEX 6,6,225,209 -CAPTION "Buat layanan" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP -BEGIN - EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE - EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 13, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE - LTEXT "*Nama Layanan :", IDC_STATIC, 12, 12, 54, 9 - LTEXT "*Nama Tampilan:", IDC_STATIC, 12, 33, 54, 9 - LTEXT "*Path ke executable :", IDC_STATIC, 10, 51, 68, 9 - LTEXT "Deskripsi :", IDC_STATIC, 12, 86, 44, 9 - PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 - PUSHBUTTON "Batal", IDCANCEL, 176, 192, 46, 13 - LTEXT "Opsi tambahan (klik bantuan untuk lengkapnya)", IDC_STATIC, 10, 151, 134, 9 - PUSHBUTTON "Bantuan", ID_CREATE_HELP, 6, 192, 44, 13 -END - -IDD_DLG_DELETE DIALOGEX 6,6,185,148 -CAPTION "Hapus layanan" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME -BEGIN - ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 - LTEXT "Anda yakin ingin menghapus layanann berikut? Ini tidak bisa dibatalkan sekali dihapus!", IDC_STATIC, 50, 6, 125, 25 - LTEXT "Nama Layanan:",IDC_STATIC, 6, 40, 80, 9 - LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 - EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY - PUSHBUTTON "Ya", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Tidak", IDCANCEL, 102, 129, 54, 13 -END - -IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 -CAPTION "Opsi" -FONT 8, "MS Shell Dlg",0,0 -STYLE 0x10CF0000 -BEGIN - LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 - PUSHBUTTON "Ok", IDOK, 75, 130, 44, 13 -END - -IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 -CAPTION "Kontrol Layanan" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW -BEGIN - CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 - LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 - LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 - PUSHBUTTON "&Tutup", IDOK, 100, 70, 54, 13 -END - - - -STRINGTABLE DISCARDABLE -BEGIN - IDS_FIRSTCOLUMN "Nama" - IDS_SECONDCOLUMN "Deskripsi" - IDS_THIRDCOLUMN "Status" - IDS_FOURTHCOLUMN "Tipe Startup" - IDS_FITHCOLUMN "Masuk Sebagai" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_STARTED "Dimulai" - IDS_SERVICES_STOPPED "Dihentikan" - IDS_SERVICES_AUTO "Otomatis" - IDS_SERVICES_MAN "Manual" - IDS_SERVICES_DIS "Dimatikan" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NUM_SERVICES "Jumlah Layanan: %d" - IDS_LICENSE "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_PROP "Properti" - IDS_TOOLTIP_REFRESH "Segarkan" - IDS_TOOLTIP_EXPORT "Ekspor daftar" - IDS_TOOLTIP_CREATE "Buat layanan baru" - IDS_TOOLTIP_DELETE "Menghapus layanan yang ada" - IDS_TOOLTIP_START "Memulai layanan" - IDS_TOOLTIP_STOP "Menghentikan layanan" - IDS_TOOLTIP_PAUSE "Mengistirahatkan layanan" - IDS_TOOLTIP_RESTART "Memulai lagi layanan" - IDS_TOOLTIP_HELP "Bantuan" - IDS_TOOLTIP_EXIT "Keluar" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_PROGRESS_INFO_START "ReactOS sedang mencoba untuk memulai layanan berikut" - IDS_PROGRESS_INFO_STOP "ReactOS sedang mencoba untuk menghentikan layanan berikut" - IDS_CREATE_SUCCESS "Layanan Dibuat Dengan Sukses" - IDS_CREATE_REQ "Field yang ditandai dengan\nbintang adalah mandatori" - IDS_DELETE_STOP "Anda harus menghentikan layanan sebelum menghapus!" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_HELP_OPTIONS "OPSI BUAT:\r\nCATATAN: Nama opsi termasuk tanda sama dengan.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (standar = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (standar = demand) \r\n error= <normal|severe|critical|ignore>\r\n (standar = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(dipisahkan oleh / (garis miring))>\r\n obj= <AccountName|ObjectName>\r\n (standar = LocalSystem)\r\n password= <password>\r\n" -END -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_EXPORT " Mengekspor daftar sekarang ke file." - IDS_HINT_EXIT " Keluar program." - - IDS_HINT_CONNECT " Mengatur komputer yang berbeda." - IDS_HINT_START " Memulai layanan yang dipilih." - IDS_HINT_STOP " Menghentikan layanan yang dipilih." - IDS_HINT_PAUSE " Mengistirahatkan layanan yang dipilih." - IDS_HINT_RESUME " Melanjutkan layanan yang pilih." - IDS_HINT_RESTART " Menghentikan dan memulai layanan yang dipilih." - IDS_HINT_REFRESH " Menyegarkan daftar layanan." - IDS_HINT_EDIT " Mengedit properti layanan yang dipilih." - IDS_HINT_CREATE " Membuat layanan baru." - IDS_HINT_DELETE " Menghapus layanan yang dipilih." - IDS_HINT_PROP " Membuka lembar properti untuk pilihan saat ini." - - IDS_HINT_LARGE " Menampilkan item dengan menggunakan ikon besar." - IDS_HINT_SMALL " Menampilkan item dengan menggunakan ikon kecil." - IDS_HINT_LIST " Menampilkanitem dalam sebuah daftar." - IDS_HINT_DETAILS " Menampilkan informasi mengenai setiap item dalam jendela." - IDS_HINT_CUST " Mengkustomisasi tampilan." - - IDS_HINT_HELP " Menampilkan jendela bantuan." - IDS_HINT_ABOUT " Tentang Manajer Layanan ReactOS." - - IDS_HINT_SYS_RESTORE " Mengembalikan jendela ini ke ukuran normal." - IDS_HINT_SYS_MOVE " Memindahkan jendela ini." - IDS_HINT_SYS_SIZE " Mengukur ulang jendela ini." - IDS_HINT_SYS_MINIMIZE " Menyempitkan jendela menjadi ikon." - IDS_HINT_SYS_MAXIMIZE " Melebarkan jendela ini memenuhi layar ini." - IDS_HINT_SYS_CLOSE " Menutup jendela ini." -END Removed: trunk/reactos/base/applications/mscutils/servman/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/it-IT.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/it-IT.rc (removed) @@ -1,282 +1,0 @@ -LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN - -IDR_MAINMENU MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "Esporta...", ID_EXPORT - MENUITEM SEPARATOR - MENUITEM "E&sci", ID_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Collega a...", ID_CONNECT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Avvia", ID_START, GRAYED - MENUITEM "Ferma", ID_STOP, GRAYED - MENUITEM "Pausa", ID_PAUSE, GRAYED - MENUITEM "Ripristina", ID_RESUME, GRAYED - MENUITEM "Riavvia", ID_RESTART, GRAYED - MENUITEM SEPARATOR - MENUITEM "Aggiorna", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Modifica...", ID_EDIT, GRAYED - MENUITEM "Crea...", ID_CREATE - MENUITEM "Cancella...", ID_DELETE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Proprietà...", ID_PROP, GRAYED - END - POPUP "View" - BEGIN - MENUITEM "Icone grandi", ID_VIEW_LARGE - MENUITEM "Icone piccole", ID_VIEW_SMALL - MENUITEM "Elenco", ID_VIEW_LIST - MENUITEM "Dettagli", ID_VIEW_DETAILS - MENUITEM SEPARATOR - MENUITEM "Personalizza...",ID_VIEW_CUST, GRAYED - END - POPUP "Aiuto" - BEGIN - MENUITEM "Aiuto", ID_HELP - MENUITEM "Informazioni su...", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM "Avvia", ID_START, GRAYED - MENUITEM "Ferma", ID_STOP, GRAYED - MENUITEM "Pausa", ID_PAUSE, GRAYED - MENUITEM "Ripristina", ID_RESUME, GRAYED - MENUITEM "Riavvia", ID_RESTART, GRAYED - MENUITEM SEPARATOR - MENUITEM "Aggiorna", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Modifica...", ID_EDIT, GRAYED - MENUITEM "Cancella...", ID_DELETE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Proprietà...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Aiuto...", ID_HELP - END -END - -IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "Informazioni su Gestione Servizi" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Gestione Servizi v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 - PUSHBUTTON "Chiudi", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 -CAPTION "General" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP -BEGIN - LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY - EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "Avvia", IDC_START, 6, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Ferma", IDC_STOP, 68, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Pausa", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Ripristina", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED - LTEXT "Nome servizio:", IDC_STATIC, 4, 11, 53, 11 - LTEXT "Nome visualizzato:", IDC_STATIC, 4, 29, 53, 11 - LTEXT "Descrizione:", IDC_STATIC, 4, 51, 53, 11 - LTEXT "Percorso dell'eseguibile:", IDC_STATIC, 6, 73, 82, 9 - LTEXT "Tipo di avvio:", IDC_STATIC, 6, 108, 53, 11 - LTEXT "Stato del servizio:", IDC_STATIC, 4, 138, 53, 11 - LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE - LTEXT "Puoi indicarei parametri in uso quando il servizio è avviato da qui.",IDC_STATIC, 6,177,240,15 - LTEXT "Parametri di avvio:", IDC_STATIC, 6, 200, 58, 11 - EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_DLG_DEPEND DIALOGEX 6,6,253,225 -CAPTION "Dipendenze" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP -BEGIN - CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 - CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200 - LTEXT "Alcuni servizi dipendono da altri servizi, driver di sistema e gruppi di ordine di caricamento. Se un componente di sistema viene fermato o non sta funzionando regolarmente, i servizi dipendenti possono venire influenzati.", IDC_STATIC,8, 7, 238, 26 - LTEXT "Questo servizio dipende dai seguenti componenti", IDC_STATIC, 8, 57, 236, 9 - LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 -END - -IDD_DLG_CREATE DIALOGEX 6,6,225,209 -CAPTION "Crea un servizio" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP -BEGIN - EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE - EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 13, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE - LTEXT "*Nome del servizio :", IDC_STATIC, 12, 12, 54, 9 - LTEXT "*Nome visualizzato :", IDC_STATIC, 12, 33, 54, 9 - LTEXT "*Percorso dell'eseguibile :", IDC_STATIC, 10, 51, 68, 9 - LTEXT "Descrizione :", IDC_STATIC, 12, 86, 44, 9 - PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 - PUSHBUTTON "Annulla", IDCANCEL, 176, 192, 46, 13 - LTEXT "Opzioni aggiuntive (cliccak aiuto per i dettagli)", IDC_STATIC, 10, 151, 134, 9 - PUSHBUTTON "Aiuto", ID_CREATE_HELP, 6, 192, 44, 13 -END - -IDD_DLG_DELETE DIALOGEX 6,6,185,148 -CAPTION "Cancella un servizio" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME -BEGIN - ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 - LTEXT "Sei sicuro di voler cancellare il seguente servizio ? Non potrà essere ripristinato!", IDC_STATIC, 50, 6, 125, 25 - LTEXT "Nome del servizio:",IDC_STATIC, 6, 40, 80, 9 - LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 - EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY - PUSHBUTTON "Si", IDOK, 26, 129, 54, 13 - PUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 -END - -IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 -CAPTION "Opzioni" -FONT 8, "MS Shell Dlg",0,0 -STYLE 0x10CF0000 -BEGIN - LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 - PUSHBUTTON "Ok", IDOK, 75, 130, 44, 13 -END - -IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 -CAPTION "Service Control" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW -BEGIN - CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 - LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 - LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 - PUSHBUTTON "&Chiudi", IDOK, 100, 70, 54, 13 -END - - - -STRINGTABLE DISCARDABLE -BEGIN - IDS_FIRSTCOLUMN "Nome" - IDS_SECONDCOLUMN "Descrizione" - IDS_THIRDCOLUMN "Stato" - IDS_FOURTHCOLUMN "Tipo di avvio" - IDS_FITHCOLUMN "Collegati come" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_STARTED "Avviato" - IDS_SERVICES_STOPPED "Fermato" - IDS_SERVICES_AUTO "Automatico" - IDS_SERVICES_MAN "Manuale" - IDS_SERVICES_DIS "Disabilitato" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NUM_SERVICES "Numero Servizi: %d" - IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di COMMERCIABILITÀ o UTILIZZABILITÀ PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA'." -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_PROP "Proprietà" - IDS_TOOLTIP_REFRESH "Aggiorna" - IDS_TOOLTIP_EXPORT "Lista di esportazione" - IDS_TOOLTIP_CREATE "Crea un nuovo servizio" - IDS_TOOLTIP_DELETE "Cancella un servizio esistente" - IDS_TOOLTIP_START "Avvia servizio" - IDS_TOOLTIP_STOP "Ferma servizio" - IDS_TOOLTIP_PAUSE "Pausa servizio" - IDS_TOOLTIP_RESTART "Riavvia servizio" - IDS_TOOLTIP_HELP "Aiuto" - IDS_TOOLTIP_EXIT "Esci" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_PROGRESS_INFO_START "ReactOS sta avviando il seguente servizio" - IDS_PROGRESS_INFO_STOP "ReactOS sta fermando il seguente servizio" - IDS_CREATE_SUCCESS "Servizio creato regolarmente" - IDS_CREATE_REQ "I campi marcati con un asterisco\nsono obbligatori" - IDS_DELETE_STOP "Devi fermare il servizio prima di cancellare!" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTA: Il nome dell'ozione comprende il simbolo di uguale.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" -END -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_EXPORT " Esporta la lista attuale in un file." - IDS_HINT_EXIT " Esce dal programma." - - IDS_HINT_CONNECT " Gestisce un altro computer." - IDS_HINT_START " Avvia il servizio selezionato." - IDS_HINT_STOP " Ferma il servizio selezionato." - IDS_HINT_PAUSE " Sospende il servizio selezionato." - IDS_HINT_RESUME " Ripristina il servizio selezionato." - IDS_HINT_RESTART " Ferma e riavvia il servizio selezionato." - IDS_HINT_REFRESH " Aggiorna la lista dei servizi." - IDS_HINT_EDIT " Modifica le proprieta del servizio selezionato." - IDS_HINT_CREATE " Crea un nuovo servizio." - IDS_HINT_DELETE " Cancella il servizio selezionato." - IDS_HINT_PROP " Presenta le proprietà per la selezione." - - IDS_HINT_LARGE " Visualizza gli elementi usando icone grandi." - IDS_HINT_SMALL " Visualizza gli elementi usando icone piccole." - IDS_HINT_LIST " Visualizza gli elementi in un elenco." - IDS_HINT_DETAILS " Visualizza le informazioni degli elementi." - IDS_HINT_CUST " Personalizza la vista." - - IDS_HINT_HELP " Visualizza Aiuto." - IDS_HINT_ABOUT " Informazioni su ReactOS Gestione servizi." - - IDS_HINT_SYS_RESTORE " Ripristina la dimensione normale della finestra." - IDS_HINT_SYS_MOVE " Muova la finestra." - IDS_HINT_SYS_SIZE " Modifica la dimensione della finestra." - IDS_HINT_SYS_MINIMIZE " Riduce la finestra a una icona." - IDS_HINT_SYS_MAXIMIZE " Espande la finestra fino a riempire lo schermo." - IDS_HINT_SYS_CLOSE " Chiude questa finestra." -END Added: trunk/reactos/base/applications/mscutils/servman/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/manifest.xml (added) +++ trunk/reactos/base/applications/mscutils/servman/manifest.xml Sat Mar 24 17:55:57 2007 @@ -1,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly + xmlns="urn:schemas-microsoft-com:asm.v1" + manifestVersion="1.0"> +<assemblyIdentity + name="Win32 Application.default.App" + processorArchitecture="x86" + version="1.0.0.0" + type="win32"/> +<description>ReactOS Service Manager</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="x86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Added: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/rsrc.rc (added) +++ trunk/reactos/base/applications/mscutils/servman/rsrc.rc Sat Mar 24 17:55:57 2007 @@ -1,0 +1,34 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 24 DISCARDABLE "manifest.xml" + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Service Manager" +END + +IDI_SM_ICON ICON "res/system.ico" + +/* main toolbar icons */ +IDB_PROP BITMAP DISCARDABLE "res/properties.bmp" +IDB_REFRESH BITMAP DISCARDABLE "res/refresh.bmp" +IDB_EXPORT BITMAP DISCARDABLE "res/export.bmp" +IDB_CREATE BITMAP DISCARDABLE "res/create.bmp" +IDB_DELETE BITMAP DISCARDABLE "res/delete.bmp" +IDB_START BITMAP DISCARDABLE "res/start.bmp" +IDB_STOP BITMAP DISCARDABLE "res/stop.bmp" +IDB_PAUSE BITMAP DISCARDABLE "res/pause.bmp" +IDB_RESTART BITMAP DISCARDABLE "res/restart.bmp" +IDB_HELP BITMAP DISCARDABLE "res/help.bmp" +IDB_EXIT BITMAP DISCARDABLE "res/exit.bmp" + + +//#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ru-RU.rc" + Removed: trunk/reactos/base/applications/mscutils/servman/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/ru-RU.rc (removed) @@ -1,283 +1,0 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -IDR_MAINMENU MENU -BEGIN - POPUP "&Ôàéë" - BEGIN - MENUITEM "&Ýêñïîðò...", ID_EXPORT - MENUITEM SEPARATOR - MENUITEM "&Âûõîä", ID_EXIT - END - POPUP "Äåéñòâèå" - BEGIN - MENUITEM "Ñîåäèíåíèå ñ...", ID_CONNECT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ïóñê", ID_START, GRAYED - MENUITEM "Ñòîï", ID_STOP, GRAYED - MENUITEM "Ïàóçà", ID_PAUSE, GRAYED - MENUITEM "Ïðîäîëæèòü", ID_RESUME, GRAYED - MENUITEM "Ïåðåçàïóñê", ID_RESTART, GRAYED - MENUITEM SEPARATOR - MENUITEM "Îáíîâèòü", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Èçìåíèòü...", ID_EDIT, GRAYED - MENUITEM "Ñîçäàòü...", ID_CREATE - MENUITEM "Óäàëèòü...", ID_DELETE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ñâîéñòâà...", ID_PROP, GRAYED - END - POPUP "Âèä" - BEGIN - MENUITEM "Êðóïíûå", ID_VIEW_LARGE - MENUITEM "Ìåëêèå", ID_VIEW_SMALL - MENUITEM "Ñïèñîê", ID_VIEW_LIST - MENUITEM "Òàáëèöà", ID_VIEW_DETAILS - MENUITEM SEPARATOR - MENUITEM "Íàñòðîèòü...",ID_VIEW_CUST, GRAYED - END - POPUP "Ñïðàâêà" - BEGIN - MENUITEM "Ñîäåðæàíèå", ID_HELP - MENUITEM "Î ïðîãðàììå", ID_ABOUT - END -END -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM "Ïóñê", ID_START, GRAYED - MENUITEM "Ñòîï", ID_STOP, GRAYED - MENUITEM "Ïàóçà", ID_PAUSE, GRAYED - MENUITEM "Ïðîäîëæèòü", ID_RESUME, GRAYED - MENUITEM "Ïåðåçàïóñê", ID_RESTART, GRAYED - MENUITEM SEPARATOR - MENUITEM "Îáíîâèòü", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Èçìåíèòü...", ID_EDIT, GRAYED - MENUITEM "Óäàëèòü...", ID_DELETE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ñâîéñòâà...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ñïðàâêà...", ID_HELP - END -END - -IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "Î Service Manager" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Service Manager v0.5\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 - PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 -CAPTION "Îáùèå" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP -BEGIN - LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY - EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "Ïóñê", IDC_START, 6, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Ñòîï", IDC_STOP, 68, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Ïàóçà", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Ïðîäîëæèòü", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED - LTEXT "Èìÿ ñëóæáû:", IDC_STATIC, 4, 11, 53, 11 - LTEXT "Âûâîäèìîå èìÿ:", IDC_STATIC, 4, 29, 53, 11 - LTEXT "Îïèñàíèå:", IDC_STATIC, 4, 51, 53, 11 - LTEXT "Èñïîëíÿåìûé ôàéë:", IDC_STATIC, 6, 73, 82, 9 - LTEXT "Òèï çàïóñêà:", IDC_STATIC, 6, 108, 53, 11 - LTEXT "Ñîñòîÿíèå ñëóæáû:", IDC_STATIC, 4, 138, 53, 11 - LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE - LTEXT "Ìîæíî óêàçàòü ïàðàìåòðû çàïóñêà, ïðèìåíÿåìûå ïðè çàïóñêå ñëóæáû èç ýòîãî êàòàëîãà.",IDC_STATIC, 6,177,240,15 - LTEXT "Ïàðàìåòðû çàïóñêà:", IDC_STATIC, 6, 200, 58, 11 - EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_DLG_DEPEND DIALOGEX 6,6,253,225 -CAPTION "Çàâèñèìîñòè" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP -BEGIN - CONTROL "",IDC_DEPEND_TREE1,"SysTreeView32",0x50010007,8,70,236,68,0x00000200 - CONTROL "",IDC_DEPEND_TREE2,"SysTreeView32",0x50010007,8,151,234,67,0x00000200 - LTEXT "Íåêîòîðûå ñëóæáû çàâèñÿò îò äðóãèõ. Åñëè ñëóæáà îñòàíîâëåíà èëè íåïðàâèëüíî ðàáîòàåò, ýòî îòðàæàåòñÿ íà çàâèñèìûõ îò íåå ñëóæáàõ.", IDC_STATIC,8, 7, 238, 26 - LTEXT "Ýòà ñëóæáà çàâèñèò îò ñëåäóþùèõ êîìïîíåíòîâ", IDC_STATIC, 8, 57, 236, 9 - LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 -END - -IDD_DLG_CREATE DIALOGEX 6,6,225,209 -CAPTION "Ñîçäàòü ñëóæáó" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP -BEGIN - EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE - EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 13, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE - LTEXT "*Èìÿ ñëóæáû :", IDC_STATIC, 12, 12, 54, 9 - LTEXT "*Îòîáðàæàåìîå èìÿ :", IDC_STATIC, 12, 33, 54, 9 - LTEXT "*Èñïîëíÿåìûé ôàéë :", IDC_STATIC, 10, 51, 68, 9 - LTEXT "Îïèñàíèå :", IDC_STATIC, 12, 86, 44, 9 - PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 - PUSHBUTTON "Îòìåíà", IDCANCEL, 176, 192, 46, 13 - LTEXT "Äîïîëíèòåëüíûå îïöèè (íàæìèòå ñïðàâêó äëÿ óòî÷íåíèÿ)", IDC_STATIC, 10, 151, 134, 9 - PUSHBUTTON "Ñïðàâêà", ID_CREATE_HELP, 6, 192, 44, 13 -END - -IDD_DLG_DELETE DIALOGEX 6,6,185,148 -CAPTION "Óäàëèòü ñëóæáó" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME -BEGIN - ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 - LTEXT "Âû óâåðåíû, ÷òî õîòèòå óäàëèòü âûáðàííóþ ñëóæáó? Âû íå ñìîæåòå âîñòàíîâèòü åå ïîñëå óäàëåíèÿ!", IDC_STATIC, 50, 6, 125, 25 - LTEXT "Èìÿ ñëóæáû:",IDC_STATIC, 6, 40, 80, 9 - LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 - EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY - PUSHBUTTON "Äà", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Íåò", IDCANCEL, 102, 129, 54, 13 -END - -IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 -CAPTION "Íàñòðîéêè" -FONT 8, "MS Shell Dlg",0,0 -STYLE 0x10CF0000 -BEGIN - LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 - PUSHBUTTON "OK", IDOK, 75, 130, 44, 13 -END - -IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 -CAPTION "Service Control" -FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -EXSTYLE WS_EX_TOOLWINDOW -BEGIN - CONTROL "",IDC_SERVCON_PROGRESS,"msctls_progress32",0x50000000,8,46,238,13 - LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 - LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 - PUSHBUTTON "&Çàêðûòü", IDOK, 100, 70, 54, 13 -END - - - -STRINGTABLE DISCARDABLE -BEGIN - IDS_FIRSTCOLUMN "Èìÿ" - IDS_SECONDCOLUMN "Îïèñàíèå" - IDS_THIRDCOLUMN "Ñîñòîÿíèå" - IDS_FOURTHCOLUMN "Òèï çàïóñêà" - IDS_FITHCOLUMN "Âõîä îò èìåíè" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_STARTED "Çàïóùåíî" - IDS_SERVICES_STOPPED "Îñòàíîâëåíî" - IDS_SERVICES_AUTO "Àâòî" - IDS_SERVICES_MAN "Âðó÷íóþ" - IDS_SERVICES_DIS "Îòêëþ÷åíî" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NUM_SERVICES "Íîìåð ñëóæáû: %d" - IDS_LICENSE "Ýòà ïðîãðàììà ÿâëÿåòñÿ ñâîáîäíûì ïðîãðàììíûì îáåñïå÷åíèåì; Âû ìîæåòå ðàñïðîñòðàíÿòü è/èëè èçìåíÿòü åå â ñîîòâåòñòâèè ñ ëèöåíçèåé GNU General Public License âåðñèè 2 èëè áîëåå ïîçäíåé, îïóáëèêîâàííîé Free Software Foundation.\r\n\r\nÝòà ïðîãðàììà ðàñïðîñòðàíÿåòñÿ ñ íàäåæäîé, ÷òî îíà ìîæåò áûòü ïîëåçíà, íî ÁÅÇ ÂÑßÊÎÉ ÃÀÐÀÍÒÈÈ; íå ïîäðàçóìåâàåòñÿ äàæå ÐÀÁÎÒÎÑÏÎÑÎÁÍÎÑÒÜ èëè ÏÐÈÃÎÄÍÎÑÒÜ ÄËß ÂÛÏÎËÍÅÍÈß ÍÅÎÁÕÎÄÈÌÛÕ ÇÀÄÀ×. Ñì. GNU General Public License äëÿ ïîëó÷åíèÿ äîïîëíèòåëüíûõ ñâåäåíèé.\r\n\r\nÂû äîëæíû ïîëó÷èòü êîïèþ ëèöåíçèè GNU âìåñòå ñ ýòîé ïðîãðàììîé, â ïðîòèâíîì ñëó÷àå îáðàùàéòåñü â Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_PROP "Ñâîéñòâà" - IDS_TOOLTIP_REFRESH "Îáíîâèòü" - IDS_TOOLTIP_EXPORT "Ýêñïîðòèðîâàòü ñïèñîê" - IDS_TOOLTIP_CREATE "Ñîçäàíèå íîâîé ñëóæáû" - IDS_TOOLTIP_DELETE "Óäàëåíèå ñóùåñòâóþùåé ñëóæáû" - IDS_TOOLTIP_START "Çàïóñòèòü ñëóæáó" - IDS_TOOLTIP_STOP "Îñòàíîâèòü ñëóæáó" - IDS_TOOLTIP_PAUSE "Ïðèîñòàíîâèòü ñëóæáó" - IDS_TOOLTIP_RESTART "Ïåðåçàïóñê ñëóæáû" - IDS_TOOLTIP_HELP "Ñïðàâêà" - IDS_TOOLTIP_EXIT "Âûõîä" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_PROGRESS_INFO_START "ReactOS ïûòàåòñÿ çàïóñòèòü ñëóæáó" - IDS_PROGRESS_INFO_STOP "ReactOS ïûòàåòñÿ îñòàíîâèòü ñëóæáó" - IDS_CREATE_SUCCESS "Ñîçäàíèå ñëóæáû óñïåøíî çàâåðøåíî" - IDS_CREATE_REQ "* = îáÿçàòåëüíûå ïîëÿ" - IDS_DELETE_STOP "Âû äîëæíû âðó÷íóþ îñòàíîâèòü ñëóæáó ïåðåä óäàëåíèåì!" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_HELP_OPTIONS "ÎÏÖÈÈ ÑÎÇÄÀÍÈß:\r\nÏðèìå÷àíèå: Èìÿ îïöèè âêëþ÷àåò çíàê ""ðàâíî"".\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (ïî óìîë÷àíèþ = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (ïî óìîë÷àíèþ = demand) \r\n error= <normal|severe|critical|ignore>\r\n (ïî óìîë÷àíèþ = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(îòäåëÿåòñÿ / (íàêëîííàÿ ÷åðòà))>\r\n obj= <AccountName|ObjectName>\r\n (ïî óìîë÷àíèþ = LocalSystem)\r\n password= <password>\r\n" -END - -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_EXPORT 20001 -#define IDS_HINT_EXIT 20002 - -#define IDS_HINT_CONNECT 20011 -#define IDS_HINT_START 20012 -#define IDS_HINT_STOP 21013 -#define IDS_HINT_PAUSE 21014 -#define IDS_HINT_RESUME 20015 -#define IDS_HINT_RESTART 20016 -#define IDS_HINT_REFRESH 20017 -#define IDS_HINT_EDIT 20018 -#define IDS_HINT_CREATE 20019 -#define IDS_HINT_DELETE 20020 -#define IDS_HINT_PROP 20021 - -#define IDS_HINT_LARGE 20030 -#define IDS_HINT_SMALL 20031 -#define IDS_HINT_LIST 20032 -#define IDS_HINT_DETAILS 20033 -#define IDS_HINT_CUST 20034 - -#define IDS_HINT_HELP 20040 -#define IDS_HINT_ABOUT 20041 - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_EXPORT " Exports the current list to a file." - IDS_HINT_EXIT " Exits the program." - - IDS_HINT_CONNECT " Manage a different computer." - IDS_HINT_START " Start the selected service." - IDS_HINT_STOP " Stop the selected service." - IDS_HINT_PAUSE " Pause the selected service." - IDS_HINT_RESUME " Resume the selected service." - IDS_HINT_RESTART " Stop and start the selected service." - IDS_HINT_REFRESH " Refresh the service list." - IDS_HINT_EDIT " Edit the properties of the selected service." - IDS_HINT_CREATE " Create a new service." - IDS_HINT_DELETE " Delete the selected service." - IDS_HINT_PROP " Open property sheet for the current selection." - - IDS_HINT_LARGE " Display items by using large icons." - IDS_HINT_SMALL " Display items by using small icons." - IDS_HINT_LIST " Display item in a list." - IDS_HINT_DETAILS " Display information about each item in a window." - IDS_HINT_CUST " Customizes the view." - - IDS_HINT_HELP " Display help window." - IDS_HINT_ABOUT " About ReactOS Service Manager." - - IDS_HINT_SYS_RESTORE " Restores this window to normal size." - IDS_HINT_SYS_MOVE " Moves this window." - IDS_HINT_SYS_SIZE " Resizes this window." - IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." - IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." - IDS_HINT_SYS_CLOSE " Closes this window." -END Modified: trunk/reactos/base/applications/mscutils/servman/servman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rc Sat Mar 24 17:55:57 2007 @@ -5,37 +5,9 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Service Manager\0" #define REACTOS_STR_INTERNAL_NAME "services\0" -#define REACTOS_STR_ORIGINAL_FILENAME "services.exe\0" -//#include <reactos/version.rc> +#define REACTOS_STR_ORIGINAL_FILENAME "servman.exe\0" +#include <reactos/version.rc> -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -//1 24 DISCARDABLE "manifest.xml" - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "ReactOS Service Manager" -END - -IDI_SM_ICON ICON "res/system.ico" - -/* main toolbar icons */ -IDB_PROP BITMAP DISCARDABLE "res/properties.bmp" -IDB_REFRESH BITMAP DISCARDABLE "res/refresh.bmp" -IDB_EXPORT BITMAP DISCARDABLE "res/export.bmp" -IDB_CREATE BITMAP DISCARDABLE "res/create.bmp" -IDB_DELETE BITMAP DISCARDABLE "res/delete.bmp" -IDB_START BITMAP DISCARDABLE "res/start.bmp" -IDB_STOP BITMAP DISCARDABLE "res/stop.bmp" -IDB_PAUSE BITMAP DISCARDABLE "res/pause.bmp" -IDB_RESTART BITMAP DISCARDABLE "res/restart.bmp" -IDB_HELP BITMAP DISCARDABLE "res/help.bmp" -IDB_EXIT BITMAP DISCARDABLE "res/exit.bmp" +#include "rsrc.rc" -//#include "de-DE.rc" -#include "en-US.rc" -#include "id-ID.rc" -#include "it-IT.rc" -#include "ru-RU.rc" -

1 0

[gedmurphy] 26162: ensure correct linkage. fixes build
by gedmurphy＠svn.reactos.org 24 Mar '07

24 Mar '07

Author: gedmurphy Date: Sat Mar 24 14:36:36 2007 New Revision: 26162 URL: http://svn.reactos.org/svn/reactos?rev=26162&view=rev Log: ensure correct linkage. fixes build Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild trunk/reactos/base/applications/mscutils/servman/servman.rbuild Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild Sat Mar 24 14:36:36 2007 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="devmgmt" type="win32gui" installbase="system32" installname="devmgmt.exe"> + <module name="devmgmt" type="win32gui" installbase="system32" installname="devmgmt.exe" unicode="yes"> <include base="devmgmt">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/base/applications/mscutils/servman/servman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rbuild (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rbuild Sat Mar 24 14:36:36 2007 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="servman" type="win32gui" installbase="system32" installname="servman.exe"> + <module name="servman" type="win32gui" installbase="system32" installname="servman.exe" unicode="yes"> <include base="servman">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define>

1 0

[gedmurphy] 26161: make entry points unicode compliant thanks to Colin Finck for noticing
by gedmurphy＠svn.reactos.org 24 Mar '07

24 Mar '07

Author: gedmurphy Date: Sat Mar 24 13:38:15 2007 New Revision: 26161 URL: http://svn.reactos.org/svn/reactos?rev=26161&view=rev Log: make entry points unicode compliant thanks to Colin Finck for noticing Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c trunk/reactos/base/applications/mscutils/servman/servman.c Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c Sat Mar 24 13:38:15 2007 @@ -13,10 +13,10 @@ HANDLE ProcessHeap; int WINAPI -WinMain(HINSTANCE hThisInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) +_tWinMain(HINSTANCE hThisInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) { LPTSTR lpAppName; HWND hMainWnd; Modified: trunk/reactos/base/applications/mscutils/servman/servman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.c (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.c Sat Mar 24 13:38:15 2007 @@ -13,10 +13,10 @@ HANDLE ProcessHeap; int WINAPI -WinMain(HINSTANCE hThisInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) +_tWinMain(HINSTANCE hThisInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) { LPTSTR lpAppName; HWND hMainWnd;

1 0

[dgorbachev] 26160: Fix a bug.
by dgorbachev＠svn.reactos.org 24 Mar '07

24 Mar '07

Author: dgorbachev Date: Sat Mar 24 11:31:23 2007 New Revision: 26160 URL: http://svn.reactos.org/svn/reactos?rev=26160&view=rev Log: Fix a bug. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Sat Mar 24 11:31:23 2007 @@ -448,7 +448,7 @@ mov fs, bx /* Save exception list and bogus previous mode */ - push PCR[KPCR_EXCEPTION_LIST] + push fs:[KPCR_EXCEPTION_LIST] push -1 /* Save volatiles and segment registers */ @@ -484,7 +484,7 @@ V86_&EndLabel: /* Get current thread */ - mov ecx, PCR[KPCR_CURRENT_THREAD] + mov ecx, fs:[KPCR_CURRENT_THREAD] cld /* Flush DR7 */

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
29
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 March 2007