Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[fireball] 29629: Dmitry Gorbachev <hs26332@mail.cnt.ru> - NtSetInformationFile() could be done before asynchronously called NtWriteFile is completed. Fix this by sending the synchronous flag. - Check return status of the second NtSetInformationFile() call. See issue #2071 for more details.
by fireball＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: fireball Date: Tue Oct 16 18:59:09 2007 New Revision: 29629 URL: http://svn.reactos.org/svn/reactos?rev=29629&view=rev Log: Dmitry Gorbachev <hs26332(a)mail.cnt.ru> - NtSetInformationFile() could be done before asynchronously called NtWriteFile is completed. Fix this by sending the synchronous flag. - Check return status of the second NtSetInformationFile() call. See issue #2071 for more details. Modified: trunk/reactos/base/setup/usetup/filesup.c Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c (original) +++ trunk/reactos/base/setup/usetup/filesup.c Tue Oct 16 18:59:09 2007 @@ -204,7 +204,9 @@ FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF, - FILE_NO_INTERMEDIATE_BUFFERING | FILE_SEQUENTIAL_ONLY, + FILE_NO_INTERMEDIATE_BUFFERING | + FILE_SEQUENTIAL_ONLY | + FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); if(!NT_SUCCESS(Status)) @@ -243,11 +245,17 @@ } /* shorten the file back to it's real size after completing the write */ - NtSetInformationFile(FileHandleDest, + Status = NtSetInformationFile(FileHandleDest, &IoStatusBlock, &FileStandard.EndOfFile, sizeof(FILE_END_OF_FILE_INFORMATION), FileEndOfFileInformation); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtSetInformationFile failed: %x\n", Status); + } + closedest: NtClose(FileHandleDest); unmapsrcsec:

1 0

[hpoussin] 29628: Display a simple bootlogo, instead of a black screen if /SOS option is not provided
by hpoussin＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: hpoussin Date: Tue Oct 16 14:40:17 2007 New Revision: 29628 URL: http://svn.reactos.org/svn/reactos?rev=29628&view=rev Log: Display a simple bootlogo, instead of a black screen if /SOS option is not provided Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Tue Oct 16 14:40:17 2007 @@ -4,6 +4,24 @@ #define NDEBUG #include <debug.h> #include "bootvid/bootvid.h" + +// +// Bitmap Header +// +typedef struct tagBITMAPINFOHEADER +{ + ULONG biSize; + LONG biWidth; + LONG biHeight; + USHORT biPlanes; + USHORT biBitCount; + ULONG biCompression; + ULONG biSizeImage; + LONG biXPelsPerMeter; + LONG biYPelsPerMeter; + ULONG biClrUsed; + ULONG biClrImportant; +} BITMAPINFOHEADER, *PBITMAPINFOHEADER; /* GLOBALS *******************************************************************/ @@ -593,6 +611,19 @@ if (!InbvBootDriverInstalled) return; /* FIXME: TODO, display full-screen bitmap */ + Bitmap = InbvGetResourceAddress(5); + if (Bitmap) + { + PBITMAPINFOHEADER BitmapInfoHeader = (PBITMAPINFOHEADER)Bitmap; + ULONG Top, Left; + + Left = (640 - BitmapInfoHeader->biWidth) / 2; + if (BitmapInfoHeader->biHeight < 0) + Top = (480 + BitmapInfoHeader->biHeight) / 2; + else + Top = (480 - BitmapInfoHeader->biHeight) / 2; + InbvBitBlt(Bitmap, Left, Top); + } } /* Do we have a system thread? */

1 0

[greatlrd] 29627: all redirect are done, for syscall and export api to dxg.sys left todo fix compiling issue and fix all stub for dxeng.c
by greatlrd＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: greatlrd Date: Tue Oct 16 13:11:22 2007 New Revision: 29627 URL: http://svn.reactos.org/svn/reactos?rev=29627&view=rev Log: all redirect are done, for syscall and export api to dxg.sys left todo fix compiling issue and fix all stub for dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Tue Oct 16 13:11:22 2007 @@ -14,6 +14,9 @@ #include <w32k.h> #include <debug.h> +/************************************************************************/ +/* HeapVidMemAllocAligned */ +/************************************************************************/ FLATPTR STDCALL HeapVidMemAllocAligned(LPVIDMEM lpVidMem, @@ -22,10 +25,10 @@ LPSURFACEALIGNMENT lpAlignment, LPLONG lpNewPitch) { - pfnHeapVidMemAllocAligned = NULL; + PGD_HEAPVIDMEMALLOCALIGNED pfnHeapVidMemAllocAligned = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnHeapVidMemAllocAligned); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdHeapVidMemAllocAligned, pfnHeapVidMemAllocAligned); if (pfnHeapVidMemAllocAligned == NULL) { @@ -37,15 +40,18 @@ return pfnHeapVidMemAllocAligned(lpVidMem, dwWidth, dwHeight, lpAlignment, lpNewPitch); } +/************************************************************************/ +/* VidMemFree */ +/************************************************************************/ VOID STDCALL VidMemFree(LPVMEMHEAP pvmh, FLATPTR ptr) { - pfnVidMemFree = NULL; + PGD_VIDMEMFREE pfnVidMemFree = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnVidMemFree); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdHeapVidMemFree, pfnVidMemFree); if (pfnVidMemFree == NULL) { @@ -57,16 +63,19 @@ return pfnVidMemFree(pvmh, ptr); } +/************************************************************************/ +/* EngAllocPrivateUserMem */ +/************************************************************************/ PVOID STDCALL EngAllocPrivateUserMem(PDD_SURFACE_LOCAL psl, SIZE_T cj, ULONG tag) { - pfnEngAllocPrivateUserMem = NULL; + PGD_ENGALLOCPRIVATEUSERMEM pfnEngAllocPrivateUserMem = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnEngAllocPrivateUserMem); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAllocPrivateUserMem, pfnEngAllocPrivateUserMem); if (pfnEngAllocPrivateUserMem == NULL) { @@ -78,15 +87,18 @@ return pfnEngAllocPrivateUserMem(psl, cj, tag); } +/************************************************************************/ +/* EngFreePrivateUserMem */ +/************************************************************************/ VOID STDCALL EngFreePrivateUserMem(PDD_SURFACE_LOCAL psl, PVOID pv) { - pfnEngFreePrivateUserMem = NULL; + PGD_ENGFREEPRIVATEUSERMEM pfnEngFreePrivateUserMem = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnEngFreePrivateUserMem); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdFreePrivateUserMem, pfnEngFreePrivateUserMem); if (pfnEngFreePrivateUserMem == NULL) { @@ -98,35 +110,41 @@ return pfnEngFreePrivateUserMem(psl, pv); } +/************************************************************************/ +/* EngDxIoctl */ +/************************************************************************/ DWORD STDCALL EngDxIoctl(ULONG ulIoctl, PVOID pBuffer, ULONG ulBufferSize) { - pfnEngFreePrivateUserMem = NULL; + PGD_ENGDXIOCTL pfnEngDxIoctl = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnEngFreePrivateUserMem); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdIoctl, pfnEngDxIoctl); - if (pfnEngFreePrivateUserMem == NULL) + if (pfnEngDxIoctl == NULL) { - DPRINT1("Warring no pfnEngFreePrivateUserMem"); + DPRINT1("Warring no pfnEngDxIoctl"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnEngFreePrivateUserMem"); + DPRINT1("Calling on dxg.sys pfnEngDxIoctl"); return pfnEngFreePrivateUserMem(psl, pv); } +/************************************************************************/ +/* EngLockDirectDrawSurface */ +/************************************************************************/ PDD_SURFACE_LOCAL STDCALL EngLockDirectDrawSurface(HANDLE hSurface) { - pfnEngLockDirectDrawSurface = NULL; + PGD_ENGLOCKDIRECTDRAWSURFACE pfnEngLockDirectDrawSurface = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnEngLockDirectDrawSurface); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdLockDirectDrawSurface, pfnEngLockDirectDrawSurface); if (pfnEngLockDirectDrawSurface == NULL) { @@ -138,14 +156,17 @@ return pfnEngLockDirectDrawSurface(hSurface); } +/************************************************************************/ +/* EngUnlockDirectDrawSurface */ +/************************************************************************/ BOOL STDCALL EngUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface) { - pfnEngUnlockDirectDrawSurface = NULL; + PGD_ENGUNLOCKDIRECTDRAWSURFACE pfnEngUnlockDirectDrawSurface = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnEngUnlockDirectDrawSurface); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnlockDirectDrawSurface, pfnEngUnlockDirectDrawSurface); if (pfnEngUnlockDirectDrawSurface == NULL) {

1 0

[mnordell] 29626: const-correctness cleanup. 'CONST UNICODE_STRING*' -> PCUNICODE_STRING
by mnordell＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: mnordell Date: Tue Oct 16 12:52:09 2007 New Revision: 29626 URL: http://svn.reactos.org/svn/reactos?rev=29626&view=rev Log: const-correctness cleanup. 'CONST UNICODE_STRING*' -> PCUNICODE_STRING Modified: trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmindex.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmname.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/cmvalche.c Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c (original) +++ trunk/reactos/lib/cmlib/hiveinit.c Tue Oct 16 12:52:09 2007 @@ -440,7 +440,7 @@ PFILE_WRITE_ROUTINE FileWrite, PFILE_SET_SIZE_ROUTINE FileSetSize, PFILE_FLUSH_ROUTINE FileFlush, - IN const UNICODE_STRING* FileName) + IN PCUNICODE_STRING FileName) { NTSTATUS Status; PHHIVE Hive = RegistryHive; Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=29626… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Tue Oct 16 12:52:09 2007 @@ -169,13 +169,13 @@ NTSTATUS CmiScanKeyList(IN PKEY_OBJECT Parent, - IN CONST UNICODE_STRING* KeyName, + IN PCUNICODE_STRING KeyName, IN ULONG Attributes, PKEY_OBJECT* ReturnedObject); NTSTATUS CmiLoadHive(POBJECT_ATTRIBUTES KeyObjectAttributes, - CONST UNICODE_STRING* FileName, + PCUNICODE_STRING FileName, ULONG Flags); NTSTATUS @@ -200,7 +200,7 @@ IN PCM_KEY_NODE KeyCell, OUT PCM_KEY_NODE *SubKeyCell, OUT HCELL_INDEX *BlockOffset, - IN CONST UNICODE_STRING* KeyName, + IN PCUNICODE_STRING KeyName, IN ACCESS_MASK DesiredAccess, IN ULONG Attributes); @@ -324,7 +324,7 @@ CmpFindSubKeyByName( IN PHHIVE Hive, IN PCM_KEY_NODE Parent, - IN CONST UNICODE_STRING* SearchName + IN PCUNICODE_STRING SearchName ); VOID @@ -346,7 +346,7 @@ /* cm/cm.h and config/cm.h. TODO: Pick one single place to declare it. */ NTSTATUS NTAPI -CmpOpenHiveFiles(IN CONST UNICODE_STRING* BaseName, +CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName, IN PCWSTR Extension OPTIONAL, IN PHANDLE Primary, IN PHANDLE Log, @@ -359,7 +359,7 @@ NTSTATUS NTAPI -CmpInitHiveFromFile(IN CONST UNICODE_STRING* HiveName, +CmpInitHiveFromFile(IN PCUNICODE_STRING HiveName, IN ULONG HiveFlags, OUT PEREGISTRY_HIVE *Hive, IN OUT PBOOLEAN New, Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Tue Oct 16 12:52:09 2007 @@ -24,7 +24,7 @@ NTSTATUS CmiLoadHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN CONST UNICODE_STRING* FileName, + IN PCUNICODE_STRING FileName, IN ULONG Flags) { PEREGISTRY_HIVE Hive = NULL; @@ -280,7 +280,7 @@ IN PCM_KEY_NODE KeyCell, OUT PCM_KEY_NODE *SubKeyCell, OUT HCELL_INDEX *BlockOffset, - IN CONST UNICODE_STRING* KeyName, + IN PCUNICODE_STRING KeyName, IN ACCESS_MASK DesiredAccess, IN ULONG Attributes) { Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Tue Oct 16 12:52:09 2007 @@ -756,7 +756,7 @@ /* Preconditions: Must be called with CmpRegistryLock held. */ NTSTATUS CmiScanKeyList(PKEY_OBJECT Parent, - CONST UNICODE_STRING* KeyName, + PCUNICODE_STRING KeyName, ULONG Attributes, PKEY_OBJECT* ReturnedObject) { Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Tue Oct 16 12:52:09 2007 @@ -762,7 +762,7 @@ NTAPI CmpFindValueByNameFromCache( IN PKEY_OBJECT KeyObject, - IN CONST UNICODE_STRING* Name, + IN PCUNICODE_STRING Name, OUT PCM_CACHED_VALUE **CachedValue, OUT ULONG *Index, OUT PCM_KEY_VALUE *Value, @@ -933,7 +933,7 @@ IN HANDLE Primary, IN HANDLE Log, IN HANDLE External, - IN CONST UNICODE_STRING* FileName OPTIONAL, + IN PCUNICODE_STRING FileName OPTIONAL, IN ULONG CheckFlags ); @@ -958,7 +958,7 @@ NTSTATUS NTAPI CmpOpenHiveFiles( - IN CONST UNICODE_STRING* BaseName, + IN PCUNICODE_STRING BaseName, IN PCWSTR Extension OPTIONAL, IN PHANDLE Primary, IN PHANDLE Log, @@ -1049,7 +1049,7 @@ LONG NTAPI CmpCompareCompressedName( - IN CONST UNICODE_STRING* SearchName, + IN PCUNICODE_STRING SearchName, IN PWCHAR CompressedName, IN ULONG NameLength ); @@ -1126,7 +1126,7 @@ CmpFindSubKeyByName( IN PHHIVE Hive, IN PCM_KEY_NODE Parent, - IN CONST UNICODE_STRING* SearchName + IN PCUNICODE_STRING SearchName ); HCELL_INDEX @@ -1141,7 +1141,7 @@ NTAPI CmpComputeHashKey( IN ULONG Hash, - IN CONST UNICODE_STRING* Name, + IN PCUNICODE_STRING Name, IN BOOLEAN AllowSeparators ); Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c Tue Oct 16 12:52:09 2007 @@ -30,7 +30,7 @@ static LONG NTAPI CmpDoCompareKeyName(IN PHHIVE Hive, - IN CONST UNICODE_STRING* SearchName, + IN PCUNICODE_STRING SearchName, IN HCELL_INDEX Cell) { PCM_KEY_NODE Node; @@ -66,7 +66,7 @@ static LONG NTAPI CmpCompareInIndex(IN PHHIVE Hive, - IN CONST UNICODE_STRING* SearchName, + IN PCUNICODE_STRING SearchName, IN ULONG Count, IN PCM_KEY_INDEX Index, IN PHCELL_INDEX SubKey) @@ -143,7 +143,7 @@ NTAPI CmpFindSubKeyInRoot(IN PHHIVE Hive, IN PCM_KEY_INDEX Index, - IN CONST UNICODE_STRING* SearchName, + IN PCUNICODE_STRING SearchName, IN PHCELL_INDEX SubKey) { ULONG High, Low = 0, i, ReturnIndex; @@ -359,7 +359,7 @@ NTAPI CmpFindSubKeyInLeaf(IN PHHIVE Hive, IN PCM_KEY_INDEX Index, - IN CONST UNICODE_STRING* SearchName, + IN PCUNICODE_STRING SearchName, IN PHCELL_INDEX SubKey) { ULONG High, Low = 0, i; @@ -473,7 +473,7 @@ ULONG NTAPI CmpComputeHashKey(IN ULONG Hash, - IN CONST UNICODE_STRING* Name, + IN PCUNICODE_STRING Name, IN BOOLEAN AllowSeparators) { LPWSTR Cp; @@ -661,7 +661,7 @@ NTAPI CmpFindSubKeyByHash(IN PHHIVE Hive, IN PCM_KEY_FAST_INDEX FastIndex, - IN CONST UNICODE_STRING* SearchName) + IN PCUNICODE_STRING SearchName) { ULONG HashKey, i; PCM_INDEX FastEntry; @@ -698,7 +698,7 @@ NTAPI CmpFindSubKeyByName(IN PHHIVE Hive, IN PCM_KEY_NODE Parent, - IN CONST UNICODE_STRING* SearchName) + IN PCUNICODE_STRING SearchName) { ULONG i; PCM_KEY_INDEX IndexRoot; Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c (original) +++ trunk/reactos/ntoskrnl/config/cminit.c Tue Oct 16 12:52:09 2007 @@ -25,7 +25,7 @@ IN HANDLE Primary, IN HANDLE Log, IN HANDLE External, - IN CONST UNICODE_STRING* FileName OPTIONAL, + IN PCUNICODE_STRING FileName OPTIONAL, IN ULONG CheckFlags) { #if 0 @@ -240,7 +240,7 @@ NTSTATUS NTAPI -CmpOpenHiveFiles(IN CONST UNICODE_STRING* BaseName, +CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName, IN PCWSTR Extension OPTIONAL, IN PHANDLE Primary, IN PHANDLE Log, Modified: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmname.c (original) +++ trunk/reactos/ntoskrnl/config/cmname.c Tue Oct 16 12:52:09 2007 @@ -107,7 +107,7 @@ LONG NTAPI -CmpCompareCompressedName(IN CONST UNICODE_STRING* SearchName, +CmpCompareCompressedName(IN PCUNICODE_STRING SearchName, IN PWCHAR CompressedName, IN ULONG NameLength) { Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Tue Oct 16 12:52:09 2007 @@ -22,7 +22,7 @@ NTSTATUS NTAPI -CmpInitHiveFromFile(IN CONST UNICODE_STRING* HiveName, +CmpInitHiveFromFile(IN PCUNICODE_STRING HiveName, IN ULONG HiveFlags, OUT PCMHIVE *Hive, IN OUT PBOOLEAN New, Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c Tue Oct 16 12:52:09 2007 @@ -186,7 +186,7 @@ VALUE_SEARCH_RETURN_TYPE NTAPI CmpFindValueByNameFromCache(IN PKEY_OBJECT KeyObject, - IN CONST UNICODE_STRING* Name, + IN PCUNICODE_STRING Name, OUT PCM_CACHED_VALUE **CachedValue, OUT ULONG *Index, OUT PCM_KEY_VALUE *Value,

1 0

[greatlrd] 29625: commit layout for allot functions that need be redirected to dxg.sys the code are not finish
by greatlrd＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: greatlrd Date: Tue Oct 16 12:35:57 2007 New Revision: 29625 URL: http://svn.reactos.org/svn/reactos?rev=29625&view=rev Log: commit layout for allot functions that need be redirected to dxg.sys the code are not finish Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Tue Oct 16 12:35:57 2007 @@ -16,14 +16,25 @@ FLATPTR STDCALL -HeapVidMemAllocAligned( - IN LPVIDMEM lpVidMem, - IN DWORD dwWidth, - IN DWORD dwHeight, - IN LPSURFACEALIGNMENT lpAlignment, - OUT LPLONG lpNewPitch) +HeapVidMemAllocAligned(LPVIDMEM lpVidMem, + DWORD dwWidth, + DWORD dwHeight, + LPSURFACEALIGNMENT lpAlignment, + LPLONG lpNewPitch) { + pfnHeapVidMemAllocAligned = NULL; + INT i; + DXG_GET_INDEX_FUNCTION(, pfnHeapVidMemAllocAligned); + + if (pfnHeapVidMemAllocAligned == NULL) + { + DPRINT1("Warring no pfnHeapVidMemAllocAligned"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnHeapVidMemAllocAligned"); + return pfnHeapVidMemAllocAligned(lpVidMem, dwWidth, dwHeight, lpAlignment, lpNewPitch); } VOID @@ -31,7 +42,19 @@ VidMemFree(LPVMEMHEAP pvmh, FLATPTR ptr) { + pfnVidMemFree = NULL; + INT i; + DXG_GET_INDEX_FUNCTION(, pfnVidMemFree); + + if (pfnVidMemFree == NULL) + { + DPRINT1("Warring no pfnVidMemFree"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnVidMemFree"); + return pfnVidMemFree(pvmh, ptr); } PVOID @@ -40,36 +63,97 @@ SIZE_T cj, ULONG tag) { + pfnEngAllocPrivateUserMem = NULL; + INT i; + DXG_GET_INDEX_FUNCTION(, pfnEngAllocPrivateUserMem); + + if (pfnEngAllocPrivateUserMem == NULL) + { + DPRINT1("Warring no pfnEngAllocPrivateUserMem"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnEngAllocPrivateUserMem"); + return pfnEngAllocPrivateUserMem(psl, cj, tag); } -VOID STDCALL +VOID +STDCALL EngFreePrivateUserMem(PDD_SURFACE_LOCAL psl, PVOID pv) { + pfnEngFreePrivateUserMem = NULL; + INT i; + DXG_GET_INDEX_FUNCTION(, pfnEngFreePrivateUserMem); + + if (pfnEngFreePrivateUserMem == NULL) + { + DPRINT1("Warring no pfnEngFreePrivateUserMem"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnEngFreePrivateUserMem"); + return pfnEngFreePrivateUserMem(psl, pv); } -HRESULT +DWORD STDCALL EngDxIoctl(ULONG ulIoctl, PVOID pBuffer, ULONG ulBufferSize) { + pfnEngFreePrivateUserMem = NULL; + INT i; + DXG_GET_INDEX_FUNCTION(, pfnEngFreePrivateUserMem); + + if (pfnEngFreePrivateUserMem == NULL) + { + DPRINT1("Warring no pfnEngFreePrivateUserMem"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnEngFreePrivateUserMem"); + return pfnEngFreePrivateUserMem(psl, pv); } PDD_SURFACE_LOCAL STDCALL EngLockDirectDrawSurface(HANDLE hSurface) { + pfnEngLockDirectDrawSurface = NULL; + INT i; + DXG_GET_INDEX_FUNCTION(, pfnEngLockDirectDrawSurface); + + if (pfnEngLockDirectDrawSurface == NULL) + { + DPRINT1("Warring no pfnEngLockDirectDrawSurface"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnEngLockDirectDrawSurface"); + return pfnEngLockDirectDrawSurface(hSurface); } BOOL STDCALL EngUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface) { + pfnEngUnlockDirectDrawSurface = NULL; + INT i; + DXG_GET_INDEX_FUNCTION(, pfnEngUnlockDirectDrawSurface); + + if (pfnEngUnlockDirectDrawSurface == NULL) + { + DPRINT1("Warring no pfnEngUnlockDirectDrawSurface"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnEngUnlockDirectDrawSurface"); + return pfnEngUnlockDirectDrawSurface(pSurface); }

1 0

[greatlrd] 29624: fixing few compiling issue.
by greatlrd＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: greatlrd Date: Tue Oct 16 11:42:36 2007 New Revision: 29624 URL: http://svn.reactos.org/svn/reactos?rev=29624&view=rev Log: fixing few compiling issue. Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Tue Oct 16 11:42:36 2007 @@ -66,7 +66,7 @@ /* From mocomp.c */ typedef DWORD (NTAPI *PGD_DDBEGINMOCOMPFRAME)(HANDLE, PDD_BEGINMOCOMPFRAMEDATA); typedef HANDLE (NTAPI *PGD_DXDDCREATEMOCOMP)(HANDLE, PDD_CREATEMOCOMPDATA ); -typedef DWORD (NTAPI *PGD_DXDDDESTROYMOCOMP)(HANDLE, BOOL); +typedef DWORD (NTAPI *PGD_DXDDDESTROYMOCOMP)(HANDLE, PDD_DESTROYMOCOMPDATA); typedef DWORD (NTAPI *PGD_DXDDENDMOCOMPFRAME)(HANDLE, PDD_ENDMOCOMPFRAMEDATA); typedef DWORD (NTAPI *PGD_DXDDGETINTERNALMOCOMPINFO)(HANDLE, PDD_GETINTERNALMOCOMPDATA); typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPBUFFINFO)(HANDLE, PDD_GETMOCOMPCOMPBUFFDATA);

1 0

[mnordell] 29623: Unbreak build. The code is used from user-mode too, so CONST can not be used. Use plain 'const' instead.
by mnordell＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: mnordell Date: Tue Oct 16 10:55:06 2007 New Revision: 29623 URL: http://svn.reactos.org/svn/reactos?rev=29623&view=rev Log: Unbreak build. The code is used from user-mode too, so CONST can not be used. Use plain 'const' instead. Modified: trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hiveinit.c Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2962… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Tue Oct 16 10:55:06 2007 @@ -211,7 +211,8 @@ PFILE_WRITE_ROUTINE FileWrite, PFILE_SET_SIZE_ROUTINE FileSetSize, PFILE_FLUSH_ROUTINE FileFlush, - IN CONST UNICODE_STRING* FileName); + IN const /*CONST*/ UNICODE_STRING* FileName); +/* NOTE: Can not use CONST here, as this file is used from user-mode too */ VOID CMAPI HvFree( Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c (original) +++ trunk/reactos/lib/cmlib/hiveinit.c Tue Oct 16 10:55:06 2007 @@ -440,7 +440,7 @@ PFILE_WRITE_ROUTINE FileWrite, PFILE_SET_SIZE_ROUTINE FileSetSize, PFILE_FLUSH_ROUTINE FileFlush, - IN CONST UNICODE_STRING* FileName) + IN const UNICODE_STRING* FileName) { NTSTATUS Status; PHHIVE Hive = RegistryHive;

1 0

[weiden] 29622: Check if reading theme settings from the registry was successful
by weiden＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: weiden Date: Tue Oct 16 09:56:44 2007 New Revision: 29622 URL: http://svn.reactos.org/svn/reactos?rev=29622&view=rev Log: Check if reading theme settings from the registry was successful Modified: trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/appearance.h Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c (original) +++ trunk/reactos/dll/cpl/desk/appearance.c Tue Oct 16 09:56:44 2007 @@ -130,7 +130,7 @@ } -static VOID +static BOOL LoadThemeFromReg(GLOBALS* g, INT iPreset) { INT i; @@ -138,6 +138,7 @@ TCHAR strValueName[10]; HKEY hkNewSchemes, hkScheme, hkSize; DWORD dwType, dwLength; + BOOL Ret = FALSE; if(RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance\\New Schemes"), 0, KEY_READ, &hkNewSchemes) == ERROR_SUCCESS) @@ -147,27 +148,52 @@ lstrcpyn(&strSizeName[6],g->ThemeTemplates[iPreset].strSizeName, 3); if(RegOpenKeyEx(hkScheme, strSizeName, 0, KEY_READ, &hkSize) == ERROR_SUCCESS) { - dwLength = sizeof(BOOL); - RegQueryValueEx(hkSize, TEXT("FlatMenus"), NULL, &dwType, (LPBYTE)&g->Theme.bFlatMenus, &dwLength); + Ret = TRUE; + + dwLength = sizeof(DWORD); + if (RegQueryValueEx(hkSize, TEXT("FlatMenus"), NULL, &dwType, (LPBYTE)&g->Theme.bFlatMenus, &dwLength) != ERROR_SUCCESS || + dwType != REG_DWORD || dwLength != sizeof(DWORD)) + { + /* Failed to read registry value */ + g->Theme.bFlatMenus = FALSE; + Ret = FALSE; + } for (i = 0; i <= 30; i++) { wsprintf(strValueName, TEXT("Color #%d"), i); dwLength = sizeof(COLORREF); - RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.crColor[i], &dwLength); + if (RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.crColor[i], &dwLength) != ERROR_SUCCESS || + dwType != REG_DWORD || dwLength != sizeof(COLORREF)) + { + /* Failed to read registry value, initialize with current setting for now */ + g->Theme.crColor[i] = GetSysColor(i); + Ret = FALSE; + } } for (i = 0; i <= 5; i++) { wsprintf(strValueName, TEXT("Font #%d"), i); dwLength = sizeof(LOGFONT); g->Theme.lfFont[i].lfFaceName[0] = 'x'; - RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.lfFont[i], &dwLength); + if (RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.lfFont[i], &dwLength) != ERROR_SUCCESS || + dwType != REG_BINARY || dwLength != sizeof(LOGFONT)) + { + /* Failed to read registry value */ + Ret = FALSE; + } } for (i = 0; i <= 8; i++) { wsprintf(strValueName, TEXT("Size #%d"), i); - dwLength = sizeof(DWORD); - RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.Size[i], &dwLength); + dwLength = sizeof(UINT64); + if (RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.Size[i], &dwLength) != ERROR_SUCCESS || + dwType != REG_QWORD || dwLength != sizeof(UINT64)) + { + /* Failed to read registry value, initialize with current setting for now */ + g->Theme.Size[i] = GetSystemMetrics(g_SizeMetric[i]); + Ret = FALSE; + } } RegCloseKey(hkScheme); } @@ -175,6 +201,8 @@ } RegCloseKey(hkNewSchemes); } + + return Ret; } Modified: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.h (original) +++ trunk/reactos/dll/cpl/desk/appearance.h Tue Oct 16 09:56:44 2007 @@ -34,7 +34,7 @@ { COLORREF crColor[NUM_COLORS]; LOGFONT lfFont[NUM_FONTS]; - DWORD Size[NUM_SIZES]; + UINT64 Size[NUM_SIZES]; BOOL bFlatMenus; BOOL bHasChanged; BOOL bIsCustom;

1 0

[mnordell] 29621: Attempt to make Cm API at least a little const-correct.
by mnordell＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: mnordell Date: Tue Oct 16 09:39:47 2007 New Revision: 29621 URL: http://svn.reactos.org/svn/reactos?rev=29621&view=rev Log: Attempt to make Cm API at least a little const-correct. Modified: trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmindex.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmname.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/cmvalche.c Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2962… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Tue Oct 16 09:39:47 2007 @@ -211,7 +211,7 @@ PFILE_WRITE_ROUTINE FileWrite, PFILE_SET_SIZE_ROUTINE FileSetSize, PFILE_FLUSH_ROUTINE FileFlush, - IN PUNICODE_STRING FileName); + IN CONST UNICODE_STRING* FileName); VOID CMAPI HvFree( Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c (original) +++ trunk/reactos/lib/cmlib/hiveinit.c Tue Oct 16 09:39:47 2007 @@ -440,7 +440,7 @@ PFILE_WRITE_ROUTINE FileWrite, PFILE_SET_SIZE_ROUTINE FileSetSize, PFILE_FLUSH_ROUTINE FileFlush, - IN PUNICODE_STRING FileName) + IN CONST UNICODE_STRING* FileName) { NTSTATUS Status; PHHIVE Hive = RegistryHive; Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=29621… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Tue Oct 16 09:39:47 2007 @@ -169,13 +169,13 @@ NTSTATUS CmiScanKeyList(IN PKEY_OBJECT Parent, - IN PUNICODE_STRING KeyName, + IN CONST UNICODE_STRING* KeyName, IN ULONG Attributes, PKEY_OBJECT* ReturnedObject); NTSTATUS CmiLoadHive(POBJECT_ATTRIBUTES KeyObjectAttributes, - PUNICODE_STRING FileName, + CONST UNICODE_STRING* FileName, ULONG Flags); NTSTATUS @@ -200,7 +200,7 @@ IN PCM_KEY_NODE KeyCell, OUT PCM_KEY_NODE *SubKeyCell, OUT HCELL_INDEX *BlockOffset, - IN PUNICODE_STRING KeyName, + IN CONST UNICODE_STRING* KeyName, IN ACCESS_MASK DesiredAccess, IN ULONG Attributes); @@ -317,12 +317,14 @@ IN PUNICODE_STRING Name ); +/* NOTE: This function declaration is currently duplicated in both */ +/* cm/cm.h and config/cm.h. TODO: Pick one single place to declare it. */ HCELL_INDEX NTAPI CmpFindSubKeyByName( IN PHHIVE Hive, IN PCM_KEY_NODE Parent, - IN PUNICODE_STRING SearchName + IN CONST UNICODE_STRING* SearchName ); VOID @@ -340,10 +342,12 @@ IN PVOID ParseContext ); -NTSTATUS -NTAPI -CmpOpenHiveFiles(IN PUNICODE_STRING BaseName, - IN PWCHAR Extension OPTIONAL, +/* NOTE: This function declaration is currently duplicated in both */ +/* cm/cm.h and config/cm.h. TODO: Pick one single place to declare it. */ +NTSTATUS +NTAPI +CmpOpenHiveFiles(IN CONST UNICODE_STRING* BaseName, + IN PCWSTR Extension OPTIONAL, IN PHANDLE Primary, IN PHANDLE Log, IN PULONG PrimaryDisposition, @@ -355,7 +359,7 @@ NTSTATUS NTAPI -CmpInitHiveFromFile(IN PUNICODE_STRING HiveName, +CmpInitHiveFromFile(IN CONST UNICODE_STRING* HiveName, IN ULONG HiveFlags, OUT PEREGISTRY_HIVE *Hive, IN OUT PBOOLEAN New, Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Tue Oct 16 09:39:47 2007 @@ -24,7 +24,7 @@ NTSTATUS CmiLoadHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN PUNICODE_STRING FileName, + IN CONST UNICODE_STRING* FileName, IN ULONG Flags) { PEREGISTRY_HIVE Hive = NULL; @@ -280,7 +280,7 @@ IN PCM_KEY_NODE KeyCell, OUT PCM_KEY_NODE *SubKeyCell, OUT HCELL_INDEX *BlockOffset, - IN PUNICODE_STRING KeyName, + IN CONST UNICODE_STRING* KeyName, IN ACCESS_MASK DesiredAccess, IN ULONG Attributes) { Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Tue Oct 16 09:39:47 2007 @@ -753,9 +753,10 @@ NewKey->ParentKey = ParentKey; } +/* Preconditions: Must be called with CmpRegistryLock held. */ NTSTATUS CmiScanKeyList(PKEY_OBJECT Parent, - PUNICODE_STRING KeyName, + CONST UNICODE_STRING* KeyName, ULONG Attributes, PKEY_OBJECT* ReturnedObject) { @@ -766,6 +767,7 @@ KeyName, &Parent->Name); /* FIXME: if list maintained in alphabetic order, use dichotomic search */ + /* (a binary search) */ for (Index=0; Index < Parent->SubKeyCounts; Index++) { CurKey = Parent->SubKeys[Index]; Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Tue Oct 16 09:39:47 2007 @@ -762,7 +762,7 @@ NTAPI CmpFindValueByNameFromCache( IN PKEY_OBJECT KeyObject, - IN PUNICODE_STRING Name, + IN CONST UNICODE_STRING* Name, OUT PCM_CACHED_VALUE **CachedValue, OUT ULONG *Index, OUT PCM_KEY_VALUE *Value, @@ -929,11 +929,11 @@ IN ULONG Operation, IN ULONG Flags, IN ULONG FileType, - IN PVOID HiveData, + IN PVOID HiveData OPTIONAL, IN HANDLE Primary, IN HANDLE Log, IN HANDLE External, - IN PUNICODE_STRING FileName, + IN CONST UNICODE_STRING* FileName OPTIONAL, IN ULONG CheckFlags ); @@ -953,11 +953,13 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor ); +/* NOTE: This function declaration is currently duplicated in both */ +/* cm/cm.h and config/cm.h. TODO: Pick one single place to declare it. */ NTSTATUS NTAPI CmpOpenHiveFiles( - IN PUNICODE_STRING BaseName, - IN PWCHAR Extension OPTIONAL, + IN CONST UNICODE_STRING* BaseName, + IN PCWSTR Extension OPTIONAL, IN PHANDLE Primary, IN PHANDLE Log, IN PULONG PrimaryDisposition, @@ -1047,7 +1049,7 @@ LONG NTAPI CmpCompareCompressedName( - IN PUNICODE_STRING SearchName, + IN CONST UNICODE_STRING* SearchName, IN PWCHAR CompressedName, IN ULONG NameLength ); @@ -1116,12 +1118,15 @@ // // Cell Index Routines // + +/* NOTE: This function declaration is currently duplicated in both */ +/* cm/cm.h and config/cm.h. TODO: Pick one single place to declare it. */ HCELL_INDEX NTAPI CmpFindSubKeyByName( IN PHHIVE Hive, IN PCM_KEY_NODE Parent, - IN PUNICODE_STRING SearchName + IN CONST UNICODE_STRING* SearchName ); HCELL_INDEX @@ -1136,7 +1141,7 @@ NTAPI CmpComputeHashKey( IN ULONG Hash, - IN PUNICODE_STRING Name, + IN CONST UNICODE_STRING* Name, IN BOOLEAN AllowSeparators ); Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c Tue Oct 16 09:39:47 2007 @@ -27,10 +27,10 @@ /* FUNCTIONS *****************************************************************/ -LONG +static LONG NTAPI CmpDoCompareKeyName(IN PHHIVE Hive, - IN PUNICODE_STRING SearchName, + IN CONST UNICODE_STRING* SearchName, IN HCELL_INDEX Cell) { PCM_KEY_NODE Node; @@ -63,10 +63,10 @@ return (Result == 0) ? Result : ((Result > 0) ? 1 : -1); } -LONG +static LONG NTAPI CmpCompareInIndex(IN PHHIVE Hive, - IN PUNICODE_STRING SearchName, + IN CONST UNICODE_STRING* SearchName, IN ULONG Count, IN PCM_KEY_INDEX Index, IN PHCELL_INDEX SubKey) @@ -139,11 +139,11 @@ return Result; } -ULONG +static ULONG NTAPI CmpFindSubKeyInRoot(IN PHHIVE Hive, IN PCM_KEY_INDEX Index, - IN PUNICODE_STRING SearchName, + IN CONST UNICODE_STRING* SearchName, IN PHCELL_INDEX SubKey) { ULONG High, Low = 0, i, ReturnIndex; @@ -355,11 +355,11 @@ return ReturnIndex; } -ULONG +static ULONG NTAPI CmpFindSubKeyInLeaf(IN PHHIVE Hive, IN PCM_KEY_INDEX Index, - IN PUNICODE_STRING SearchName, + IN CONST UNICODE_STRING* SearchName, IN PHCELL_INDEX SubKey) { ULONG High, Low = 0, i; @@ -473,7 +473,7 @@ ULONG NTAPI CmpComputeHashKey(IN ULONG Hash, - IN PUNICODE_STRING Name, + IN CONST UNICODE_STRING* Name, IN BOOLEAN AllowSeparators) { LPWSTR Cp; @@ -657,11 +657,11 @@ return HCELL_NIL; } -HCELL_INDEX +static HCELL_INDEX NTAPI CmpFindSubKeyByHash(IN PHHIVE Hive, IN PCM_KEY_FAST_INDEX FastIndex, - IN PUNICODE_STRING SearchName) + IN CONST UNICODE_STRING* SearchName) { ULONG HashKey, i; PCM_INDEX FastEntry; @@ -698,7 +698,7 @@ NTAPI CmpFindSubKeyByName(IN PHHIVE Hive, IN PCM_KEY_NODE Parent, - IN PUNICODE_STRING SearchName) + IN CONST UNICODE_STRING* SearchName) { ULONG i; PCM_KEY_INDEX IndexRoot; Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c (original) +++ trunk/reactos/ntoskrnl/config/cminit.c Tue Oct 16 09:39:47 2007 @@ -25,7 +25,7 @@ IN HANDLE Primary, IN HANDLE Log, IN HANDLE External, - IN PUNICODE_STRING FileName OPTIONAL, + IN CONST UNICODE_STRING* FileName OPTIONAL, IN ULONG CheckFlags) { #if 0 @@ -240,8 +240,8 @@ NTSTATUS NTAPI -CmpOpenHiveFiles(IN PUNICODE_STRING BaseName, - IN PWCHAR Extension OPTIONAL, +CmpOpenHiveFiles(IN CONST UNICODE_STRING* BaseName, + IN PCWSTR Extension OPTIONAL, IN PHANDLE Primary, IN PHANDLE Log, IN PULONG PrimaryDisposition, Modified: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmname.c (original) +++ trunk/reactos/ntoskrnl/config/cmname.c Tue Oct 16 09:39:47 2007 @@ -107,7 +107,7 @@ LONG NTAPI -CmpCompareCompressedName(IN PUNICODE_STRING SearchName, +CmpCompareCompressedName(IN CONST UNICODE_STRING* SearchName, IN PWCHAR CompressedName, IN ULONG NameLength) { Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Tue Oct 16 09:39:47 2007 @@ -22,7 +22,7 @@ NTSTATUS NTAPI -CmpInitHiveFromFile(IN PUNICODE_STRING HiveName, +CmpInitHiveFromFile(IN CONST UNICODE_STRING* HiveName, IN ULONG HiveFlags, OUT PCMHIVE *Hive, IN OUT PBOOLEAN New, Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c Tue Oct 16 09:39:47 2007 @@ -186,7 +186,7 @@ VALUE_SEARCH_RETURN_TYPE NTAPI CmpFindValueByNameFromCache(IN PKEY_OBJECT KeyObject, - IN PUNICODE_STRING Name, + IN CONST UNICODE_STRING* Name, OUT PCM_CACHED_VALUE **CachedValue, OUT ULONG *Index, OUT PCM_KEY_VALUE *Value,

1 0

[dreimer] 29620: Fix the size of the new Dialog and make it non-resizeable. Add the Icon to the "Download..." Dialog. Fix some typos. Fixed some formatting stuff. Added a manifest File.
by dreimer＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: dreimer Date: Tue Oct 16 09:37:22 2007 New Revision: 29620 URL: http://svn.reactos.org/svn/reactos?rev=29620&view=rev Log: Fix the size of the new Dialog and make it non-resizeable. Add the Icon to the "Download..." Dialog. Fix some typos. Fixed some formatting stuff. Added a manifest File. Added: trunk/rosapps/downloader/manifest.xml (with props) Modified: trunk/rosapps/downloader/downloader.rc trunk/rosapps/downloader/lang/de-DE.rc trunk/rosapps/downloader/lang/en-US.rc trunk/rosapps/downloader/lang/es-ES.rc trunk/rosapps/downloader/lang/fr-FR.rc trunk/rosapps/downloader/lang/id-ID.rc trunk/rosapps/downloader/lang/it-IT.rc trunk/rosapps/downloader/lang/ru-RU.rc trunk/rosapps/downloader/lang/uk-UA.rc Modified: trunk/rosapps/downloader/downloader.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.rc?r… ============================================================================== --- trunk/rosapps/downloader/downloader.rc (original) +++ trunk/rosapps/downloader/downloader.rc Tue Oct 16 09:37:22 2007 @@ -7,4 +7,6 @@ #include <reactos/version.rc> +1 24 DISCARDABLE "manifest.xml" + #include "rsrc.rc" Modified: trunk/rosapps/downloader/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/de-DE.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/de-DE.rc (original) +++ trunk/rosapps/downloader/lang/de-DE.rc Tue Oct 16 09:37:22 2007 @@ -1,57 +1,57 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Download..." FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER PUSHBUTTON "Abbrechen", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP -} +END -IDD_PROF DIALOGEX 6, 6, 267, 95 -STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_PROF DIALOGEX 6, 6, 267, 110 +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Einstellungen" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Download Ordner:", -1, 6, 10, 140, 8 - EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "W&ähle...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Installationsdateien nach dem Setup löschen", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Update Server:", -1, 6, 55, 140, 8 - EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "&Abbrechen", IDCANCEL, 207, 90, 54, 15 + LTEXT "Download Ordner:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "W&ähle...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Installationsdateien nach dem Setup löschen", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update Server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Abbrechen", IDCANCEL, 207, 90, 54, 15 END STRINGTABLE DISCARDABLE BEGIN - IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" + IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" IDS_WELCOME_TITLE "Willkommen im ReactOS Downloader" - IDS_WELCOME "Bitte wählen Sie links eine Kategorie. Dies ist Version 1.1." + IDS_WELCOME "Bitte wählen Sie links eine Kategorie. Dies ist Version 1.1." IDS_NO_APP_TITLE "Keine Anwendung ausgewählt" - IDS_NO_APP "Bitte wählen Sie eine Anwendung, bevor Sie die Download-Schaltfläche betätigen. Wenn Sie Hilfe benötigen, drücken Sie die Hilfe-Schaltfläche in der oberen rechten Ecke." - IDS_UPDATE_TITLE "Update" + IDS_NO_APP "Bitte wählen Sie eine Anwendung, bevor Sie die Download-Schaltfläche betätigen. Wenn Sie Hilfe benötigen, drücken Sie die Hilfe-Schaltfläche in der oberen rechten Ecke." + IDS_UPDATE_TITLE "Update" IDS_UPDATE "Diese Funktion wurde noch nicht implementiert." - IDS_HELP_TITLE "Hilfe" - IDS_HELP "Wählen Sie links eine Kategorie, wählen Sie eine Anwendung und drücken Sie die Download-Schaltfläche. Um die Anwendungsinformationen zu aktualisieren, drücken Sie die Schaltfläche neben der Hilfe-Schaltfläche." + IDS_HELP_TITLE "Hilfe" + IDS_HELP "Wählen Sie links eine Kategorie, wählen Sie eine Anwendung und drücken Sie die Download-Schaltfläche. Um die Anwendungsinformationen zu aktualisieren, drücken Sie die Schaltfläche neben der Hilfe-Schaltfläche." IDS_NO_APPS "In dieser Kategorie sind bisher noch keine Anwendungen. Sie können helfen, indem Sie Anwendungen hinzufügen." IDS_CHOOSE_APP "Bitte wählen Sie eine Anwendung." IDS_CHOOSE_SUB "Bitte wählen Sie eine Unterkategorie." - IDS_CHOOSE_CATEGORY "Bitte wählen Sie eine Kategorie." + IDS_CHOOSE_CATEGORY "Bitte wählen Sie eine Kategorie." IDS_CHOOSE_BOTH "Bitte wählen Sie eine Unterkategorie oder eine Anwendung." IDS_XMLERROR_1 "XML Datei nicht gefunden!" IDS_XMLERROR_2 "XML Datei kann nicht verarbeitet werden!" - IDS_DOWNLOAD_ERROR "Die Datei konnte nicht runtergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht." + IDS_DOWNLOAD_ERROR "Die Datei konnte nicht heruntergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht." IDS_VERSION "Version: " IDS_LICENCE "Lizenz: " IDS_MAINTAINER "Maintainer: " IDS_APPS_TITLE "Anwendungen" IDS_CATS_TITLE "Kategorien" IDS_CHOOSE_FOLDER "Bitte wählen Sie den Ordner..." - IDS_NOTCREATE_REGKEY "Registryschlüssel könnte nicht erstellt werden." - IDS_DOWNLOAD_FOLDER "Download!" - IDS_UNABLECREATE_FOLDER "Es konnte kein Ordner mit diesem Namen erstellt werden!" + IDS_NOTCREATE_REGKEY "Registryschlüssel könnte nicht erstellt werden." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Es konnte kein Ordner mit diesem Namen erstellt werden!" IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/en-US.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/en-US.rc (original) +++ trunk/rosapps/downloader/lang/en-US.rc Tue Oct 16 09:37:22 2007 @@ -1,57 +1,57 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Download..." FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP -} +END IDD_PROF DIALOGEX 6, 6, 267, 110 -STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Preferences" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Download folder:", -1, 6, 10, 140, 8 - EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Update server:", -1, 6, 55, 140, 8 - EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 END STRINGTABLE DISCARDABLE BEGIN - IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" + IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" IDS_WELCOME_TITLE "Welcome to the ReactOS Downloader" - IDS_WELCOME "Please choose a category on the left. This is version 1.1." + IDS_WELCOME "Please choose a category on the left. This is version 1.1." IDS_NO_APP_TITLE "No application selected" - IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner." - IDS_UPDATE_TITLE "Update" + IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner." + IDS_UPDATE_TITLE "Update" IDS_UPDATE "Sorry this feature is not implemented yet." - IDS_HELP_TITLE "Help" - IDS_HELP "Choose a category on the left, then choose a application and click the download button. To update the application information click the button next to the help button." + IDS_HELP_TITLE "Help" + IDS_HELP "Choose a category on the left, then choose a application and click the download button. To update the application information click the button next to the help button." IDS_NO_APPS "Sorry, there no applications in this category yet. You can help and add more applications." IDS_CHOOSE_APP "Please choose an application." IDS_CHOOSE_SUB "Please choose a subcategory." - IDS_CHOOSE_CATEGORY "Please choose a category." + IDS_CHOOSE_CATEGORY "Please choose a category." IDS_CHOOSE_BOTH "Please choose a subcategory or an application." IDS_XMLERROR_1 "Could not find the xml file !" IDS_XMLERROR_2 "Could not parse the xml file !" - IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check your internet connection." + IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check your internet connection." IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: " IDS_APPS_TITLE "Applications" IDS_CATS_TITLE "Categories" IDS_CHOOSE_FOLDER "Please, choose the folder..." - IDS_NOTCREATE_REGKEY "Could not create the registry key." - IDS_DOWNLOAD_FOLDER "Download!" - IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/es-ES.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/es-ES.rc (original) +++ trunk/rosapps/downloader/lang/es-ES.rc Tue Oct 16 09:37:22 2007 @@ -1,57 +1,57 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Descargar..." FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP -} +END -IDD_PROF DIALOGEX 6, 6, 267, 95 -STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_PROF DIALOGEX 6, 6, 267, 110 +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Proferences" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Download folder:", -1, 6, 10, 140, 8 - EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Update server:", -1, 6, 55, 140, 8 - EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 END STRINGTABLE DISCARDABLE BEGIN - IDS_WINDOW_TITLE "¡Descargar! - Descargador de ReactOS" + IDS_WINDOW_TITLE "¡Descargar! - Descargador de ReactOS" IDS_WELCOME_TITLE "Bienvenido al descargador de ReactOS" - IDS_WELCOME "Por favor selecciona una categoría de la izquierda. Esta es la versión 1.1." + IDS_WELCOME "Por favor selecciona una categoría de la izquierda. Esta es la versión 1.1." IDS_NO_APP_TITLE "Ninguna aplicación seleccionada" - IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner." - IDS_UPDATE_TITLE "Actualizar" + IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner." + IDS_UPDATE_TITLE "Actualizar" IDS_UPDATE "Perdona esta característica no a sido implementada todavía." - IDS_HELP_TITLE "Ayuda" - IDS_HELP "Selecciona una categoría de la izquierda, entonces selecciona una aplicación y pulda el botón de descargar. Para actualizar la información de la aplicación pulsa el botón junto al botón de ayuda." + IDS_HELP_TITLE "Ayuda" + IDS_HELP "Selecciona una categoría de la izquierda, entonces selecciona una aplicación y pulda el botón de descargar. Para actualizar la información de la aplicación pulsa el botón junto al botón de ayuda." IDS_NO_APPS "Perdón, aun no hay ninguna aplicación en esta categoría. Puedes ayudar y añadir más aplicaciones." IDS_CHOOSE_APP "Por favor selecciona una aplicación." IDS_CHOOSE_SUB "Por favor selecciona una subcategoría." - IDS_CHOOSE_CATEGORY "Por favor selecciona una categoría." + IDS_CHOOSE_CATEGORY "Por favor selecciona una categoría." IDS_CHOOSE_BOTH "Por favor selecciona una subcategoria o una aplicación." IDS_XMLERROR_1 "¡No se a encontrado el archivo xml!" IDS_XMLERROR_2 "¡No se ha podido analizar el archivo xml!" - IDS_DOWNLOAD_ERROR "Imposible descargar el archivo.\nPor favor verifica tu conexión a internet." + IDS_DOWNLOAD_ERROR "Imposible descargar el archivo.\nPor favor verifica tu conexión a internet." IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: " IDS_APPS_TITLE "Applications" IDS_CATS_TITLE "Categories" IDS_CHOOSE_FOLDER "Please, choose the folder..." - IDS_NOTCREATE_REGKEY "Could not create the registry key." - IDS_DOWNLOAD_FOLDER "Download!" - IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/fr-FR.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/fr-FR.rc (original) +++ trunk/rosapps/downloader/lang/fr-FR.rc Tue Oct 16 09:37:22 2007 @@ -1,57 +1,57 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Téléchargement..." FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER PUSHBUTTON "Annuler", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP -} +END -IDD_PROF DIALOGEX 6, 6, 267, 95 -STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_PROF DIALOGEX 6, 6, 267, 110 +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Proferences" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Download folder:", -1, 6, 10, 140, 8 - EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Update server:", -1, 6, 55, 140, 8 - EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 END STRINGTABLE DISCARDABLE BEGIN - IDS_WINDOW_TITLE "Télécharger ! - Téléchargeur de ReactOS" + IDS_WINDOW_TITLE "Télécharger ! - Téléchargeur de ReactOS" IDS_WELCOME_TITLE "Bienvenue dans le Téléchargeur de ReactOS" - IDS_WELCOME "Veuillez choisir une catégorie sur la gauche. C'est la version 1.1." + IDS_WELCOME "Veuillez choisir une catégorie sur la gauche. C'est la version 1.1." IDS_NO_APP_TITLE "Aucune application selectionnée" - IDS_NO_APP "Veuillez sélectionner une application avant de cliquer sur le bouton Télécharger, si vous avez besoin d'aide, veuillez cliquer sur le point d'interrogation dans le coin supérieur droit." - IDS_UPDATE_TITLE "Mise à jour" + IDS_NO_APP "Veuillez sélectionner une application avant de cliquer sur le bouton Télécharger, si vous avez besoin d'aide, veuillez cliquer sur le point d'interrogation dans le coin supérieur droit." + IDS_UPDATE_TITLE "Mise à jour" IDS_UPDATE "Désolé, cette fonctionnalité n'est pas encore implémentée." - IDS_HELP_TITLE "Aide" - IDS_HELP "Choisissez une catégorie sur la gauche, puis choisissez une application et cliquez sur le bouton Télécharger. Pour mettre à jour les informations sur l'application, cliquez sur le bouton à côté du bouton d'aide." + IDS_HELP_TITLE "Aide" + IDS_HELP "Choisissez une catégorie sur la gauche, puis choisissez une application et cliquez sur le bouton Télécharger. Pour mettre à jour les informations sur l'application, cliquez sur le bouton à côté du bouton d'aide." IDS_NO_APPS "Désolé, il n'y a pas encore d'application dans cette catégorie. Vous pouvez contribuer et ajouter plus d'applications." IDS_CHOOSE_APP "Veuillez choisir une application." IDS_CHOOSE_SUB "Veuillez choisir une sous-catégorie." - IDS_CHOOSE_CATEGORY "Veuillez choisir une catégorie." + IDS_CHOOSE_CATEGORY "Veuillez choisir une catégorie." IDS_CHOOSE_BOTH "Veuillez choisir une sous-catégorie ou une application." IDS_XMLERROR_1 "Impossible de trouver le fichier xml !" IDS_XMLERROR_2 "Impossible d'analyser le fichier xml !" - IDS_DOWNLOAD_ERROR "Impossible de télécharger le fichier.\nVeuillez vérifier votre connexion Internet." + IDS_DOWNLOAD_ERROR "Impossible de télécharger le fichier.\nVeuillez vérifier votre connexion Internet." IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: " IDS_APPS_TITLE "Applications" IDS_CATS_TITLE "Catégories" IDS_CHOOSE_FOLDER "Please, choose the folder..." - IDS_NOTCREATE_REGKEY "Could not create the registry key." - IDS_DOWNLOAD_FOLDER "Download!" - IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/id-ID.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/id-ID.rc (original) +++ trunk/rosapps/downloader/lang/id-ID.rc Tue Oct 16 09:37:22 2007 @@ -1,57 +1,57 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Download..." FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER PUSHBUTTON "Batal", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP -} +END -IDD_PROF DIALOGEX 6, 6, 267, 95 -STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_PROF DIALOGEX 6, 6, 267, 110 +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Proferences" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Download folder:", -1, 6, 10, 140, 8 - EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Update server:", -1, 6, 55, 140, 8 - EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 END STRINGTABLE DISCARDABLE BEGIN - IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" + IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" IDS_WELCOME_TITLE "Selamat datang di ReactOS Downloader" - IDS_WELCOME "Silahkan pilih kategori di sebelah kiri. Ini versi 1.1." + IDS_WELCOME "Silahkan pilih kategori di sebelah kiri. Ini versi 1.1." IDS_NO_APP_TITLE "Tidak ada aplikasi yang dipilih" - IDS_NO_APP "Silahkan pilih Aplikasi sebelum anda mengklik tombol download, jika anda membutuhkan asistensi silahkan klik pada tombol di sudut kanan atas." - IDS_UPDATE_TITLE "Mutakhirkan" + IDS_NO_APP "Silahkan pilih Aplikasi sebelum anda mengklik tombol download, jika anda membutuhkan asistensi silahkan klik pada tombol di sudut kanan atas." + IDS_UPDATE_TITLE "Mutakhirkan" IDS_UPDATE "Maaf fitur ini belum diimplementasikan." - IDS_HELP_TITLE "Bantuan" - IDS_HELP "Pilih kategori di sisi kiri, lalu pilih aplikasi dan klik tombol download. Untuk memutakhirkan informasi aplikasi klik tombol disebelah tombol bantuan." + IDS_HELP_TITLE "Bantuan" + IDS_HELP "Pilih kategori di sisi kiri, lalu pilih aplikasi dan klik tombol download. Untuk memutakhirkan informasi aplikasi klik tombol disebelah tombol bantuan." IDS_NO_APPS "Maaf, belum ada aplikasi dalam kategori ini. Anda dapat membantu dan menambahkan aplikasi lebih banyak." IDS_CHOOSE_APP "Silahkan pilih aplikasi." IDS_CHOOSE_SUB "Silahkan pilih subkategori." - IDS_CHOOSE_CATEGORY "Silahkan pilih kategori." + IDS_CHOOSE_CATEGORY "Silahkan pilih kategori." IDS_CHOOSE_BOTH "Silahkan pilih subkategori atau aplikasi." IDS_XMLERROR_1 "Tidak dapat menemukan file xml !" IDS_XMLERROR_2 "Tidak dapat mengurai file xml !" - IDS_DOWNLOAD_ERROR "Tidak bisa mendownload file.\nSilahkan periksa koneksi internet anda." + IDS_DOWNLOAD_ERROR "Tidak bisa mendownload file.\nSilahkan periksa koneksi internet anda." IDS_VERSION "Versi: " IDS_LICENCE "Lisensi: " IDS_MAINTAINER "Pemelihara: " IDS_APPS_TITLE "Applications" IDS_CATS_TITLE "Categories" IDS_CHOOSE_FOLDER "Please, choose the folder..." - IDS_NOTCREATE_REGKEY "Could not create the registry key." - IDS_DOWNLOAD_FOLDER "Download!" - IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/it-IT.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/it-IT.rc (original) +++ trunk/rosapps/downloader/lang/it-IT.rc Tue Oct 16 09:37:22 2007 @@ -1,57 +1,57 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Download..." FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP -} +END -IDD_PROF DIALOGEX 6, 6, 267, 95 -STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_PROF DIALOGEX 6, 6, 267, 110 +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Proferences" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Download folder:", -1, 6, 10, 140, 8 - EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Update server:", -1, 6, 55, 140, 8 - EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 END STRINGTABLE DISCARDABLE BEGIN - IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" + IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" IDS_WELCOME_TITLE "Benvenuto al ReactOS Downloader" - IDS_WELCOME "Scegli una categoria a sinistra. Questa è la versione 1.1." + IDS_WELCOME "Scegli una categoria a sinistra. Questa è la versione 1.1." IDS_NO_APP_TITLE "Nessuna applicazione selezionata" - IDS_NO_APP "Scegli una Applicazione prima di premere il bottone di download, se serve assistenza clicca sul punto di domanda nell'angolo in alto a destra." - IDS_UPDATE_TITLE "Aggiorna" + IDS_NO_APP "Scegli una Applicazione prima di premere il bottone di download, se serve assistenza clicca sul punto di domanda nell'angolo in alto a destra." + IDS_UPDATE_TITLE "Aggiorna" IDS_UPDATE "Funzione non ancora implementata." - IDS_HELP_TITLE "Aiuto" - IDS_HELP "Scegli una categoria a sinistra, poi scegli una applicazione e clicca il bottone download. Per aggiornare le informazioni sulla applicazione clicca il bottone accanto a quello di aiuto." + IDS_HELP_TITLE "Aiuto" + IDS_HELP "Scegli una categoria a sinistra, poi scegli una applicazione e clicca il bottone download. Per aggiornare le informazioni sulla applicazione clicca il bottone accanto a quello di aiuto." IDS_NO_APPS "Non ci sono ancora applicazioni in questa categoria. Puoi aiutare aggiungendone altre." IDS_CHOOSE_APP "Scegli una applicazione." IDS_CHOOSE_SUB "Scegli una sottocategoria." - IDS_CHOOSE_CATEGORY "Scegli una categoria." + IDS_CHOOSE_CATEGORY "Scegli una categoria." IDS_CHOOSE_BOTH "Scegli una sottocategoria o una applicazione." IDS_XMLERROR_1 "File xml non trovato !" IDS_XMLERROR_2 "Impossibile trattare il contenuto del file xml !" - IDS_DOWNLOAD_ERROR "Download del file impossibile.\nVerifica la connessione a Internet." + IDS_DOWNLOAD_ERROR "Download del file impossibile.\nVerifica la connessione a Internet." IDS_VERSION "Versione: " IDS_LICENCE "Licenza: " IDS_MAINTAINER "Manutentore: " IDS_APPS_TITLE "Applications" IDS_CATS_TITLE "Categories" IDS_CHOOSE_FOLDER "Please, choose the folder..." - IDS_NOTCREATE_REGKEY "Could not create the registry key." - IDS_DOWNLOAD_FOLDER "Download!" - IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/ru-RU.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/ru-RU.rc (original) +++ trunk/rosapps/downloader/lang/ru-RU.rc Tue Oct 16 09:37:22 2007 @@ -3,57 +3,57 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Çàãðóçêà..." FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 17, SS_CENTER PUSHBUTTON "Îòìåíà", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP -} +END IDD_PROF DIALOGEX 6, 6, 267, 110 -STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Íàñòðîéêè" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ïàïêà äëÿ çàêà÷êè:", -1, 6, 10, 140, 8 - EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Âûáðàòü...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Óäàëÿòü óñòàíîâî÷íûå ôàéëû ïîñëå óñòàíîâêè", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Ñåðâåð îáíîâëåíèé:", -1, 6, 55, 140, 8 - EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "Î&òìåíà", IDCANCEL, 207, 90, 54, 15 + LTEXT "Ïàïêà äëÿ çàêà÷êè:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Âûáðàòü...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Óäàëÿòü óñòàíîâî÷íûå ôàéëû ïîñëå óñòàíîâêè", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Ñåðâåð îáíîâëåíèé:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "Î&òìåíà", IDCANCEL, 207, 90, 54, 15 END STRINGTABLE DISCARDABLE BEGIN - IDS_WINDOW_TITLE "Ñêà÷àòü! - Ìåíåäæåð çàêà÷åê ReactOS" + IDS_WINDOW_TITLE "Ñêà÷àòü! - Ìåíåäæåð çàêà÷åê ReactOS" IDS_WELCOME_TITLE "Äîáðî ïîæàëîâàòü â Ìåíåäæåð çàêà÷åê ReactOS" - IDS_WELCOME "Ïîæàëóéñòà âûáåðèòå êàòåãîðèþ ñïðàâà. Âåðñèÿ 1.1" + IDS_WELCOME "Ïîæàëóéñòà âûáåðèòå êàòåãîðèþ ñïðàâà. Âåðñèÿ 1.1" IDS_NO_APP_TITLE "Ïðèëîæåíèå íå âûáðàíî" - IDS_NO_APP "Ïîæàëóéñòà, âûáåðèòå ïðèëîæåíèå ïðåæäå, ÷åì íàæàòü êíîïêó çàãðóçêè. Åñëè âàì íóæíà ñïðàâêà, òî íàæìèòå êíîïêó ñî çíàêîì âîïðîñà â âåðõíåì ïðàâîì óãëó." - IDS_UPDATE_TITLE "Îáíîâèòü" + IDS_NO_APP "Ïîæàëóéñòà, âûáåðèòå ïðèëîæåíèå ïðåæäå, ÷åì íàæàòü êíîïêó çàãðóçêè. Åñëè âàì íóæíà ñïðàâêà, òî íàæìèòå êíîïêó ñî çíàêîì âîïðîñà â âåðõíåì ïðàâîì óãëó." + IDS_UPDATE_TITLE "Îáíîâèòü" IDS_UPDATE "Èçâåíèòå, äàííàÿ âîçìîæíîñòü íà äàííûì ìîìåíò íåäîñòóïíà." - IDS_HELP_TITLE "Ñïðàâêà" - IDS_HELP "Âûáåðèòå êàòåãîðèþ ñëåâà, çàòåì âûáåðèòå ïðèëîæåíèå è íàæìèòå êíîïêó çàãðóçêè. Äëÿ ïîëó÷åíèÿ èíôîðìàöèè îá îáíîâëåíèÿõ íàæìèòå êíîïêó ðÿäîì ñ êíîïêîé ñïðàâêè." + IDS_HELP_TITLE "Ñïðàâêà" + IDS_HELP "Âûáåðèòå êàòåãîðèþ ñëåâà, çàòåì âûáåðèòå ïðèëîæåíèå è íàæìèòå êíîïêó çàãðóçêè. Äëÿ ïîëó÷åíèÿ èíôîðìàöèè îá îáíîâëåíèÿõ íàæìèòå êíîïêó ðÿäîì ñ êíîïêîé ñïðàâêè." IDS_NO_APPS "Èçâåíèòå, íà äàííûé ìîìåíò â ýòîé êàòåãîðèè ïðèëîæåíèé íåò, íî âû ìîæåòå ïîìî÷ü äîáàâèòü èõ." IDS_CHOOSE_APP "Ïîæàëóéñòà âûáåðèòå ïðèëîæåíèå." IDS_CHOOSE_SUB "Ïîæàëóéñòà âûáåðèòå ïîäêàòåãîðèþ." - IDS_CHOOSE_CATEGORY "Ïîæàëóéñòà âûáåðèòå êàòåãîðèþ." + IDS_CHOOSE_CATEGORY "Ïîæàëóéñòà âûáåðèòå êàòåãîðèþ." IDS_CHOOSE_BOTH "Ïîæàëóéñòà âûáåðèòå ïîäêàòåãîðèþ èëè ïðèëîæåíèå." IDS_XMLERROR_1 "Íå óäàëîñü íàéòè xml-ôàéë!" IDS_XMLERROR_2 "Íå óäàëîñü îáðàáîòàòü xml-ôàéë!" - IDS_DOWNLOAD_ERROR "Íå óäàåòñÿ çàãðóçèòü ôàéë.\nÏîæàëóéñòà ïðîâåðüòå âàøå ïîäêëþ÷åíèå ê èíòåðíåò." + IDS_DOWNLOAD_ERROR "Íå óäàåòñÿ çàãðóçèòü ôàéë.\nÏîæàëóéñòà ïðîâåðüòå âàøå ïîäêëþ÷åíèå ê èíòåðíåò." IDS_VERSION "Âåðñèÿ: " IDS_LICENCE "Ëèöåíçèÿ: " IDS_MAINTAINER "Ïðîèçâîäèòåëü: " IDS_APPS_TITLE "Ïðèëîæåíèÿ" IDS_CATS_TITLE "Êàòåãîðèè" IDS_CHOOSE_FOLDER "Ïîæàëóéñòâà âûáåðèòå ïàïêó..." - IDS_NOTCREATE_REGKEY "Íå óäàëîñü ñîçäàòü êëþ÷ â ðååñòðå." - IDS_DOWNLOAD_FOLDER "Ñêà÷àòü!" - IDS_UNABLECREATE_FOLDER "Íå óäàëîñü ñîçäàòü ïàïêó ñ òàêèì èìåíåì!" + IDS_NOTCREATE_REGKEY "Íå óäàëîñü ñîçäàòü êëþ÷ â ðååñòðå." + IDS_DOWNLOAD_FOLDER "Ñêà÷àòü!" + IDS_UNABLECREATE_FOLDER "Íå óäàëîñü ñîçäàòü ïàïêó ñ òàêèì èìåíåì!" IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/uk-UA.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/uk-UA.rc (original) +++ trunk/rosapps/downloader/lang/uk-UA.rc Tue Oct 16 09:37:22 2007 @@ -9,57 +9,57 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Çàâàíòàæåííÿ..." FONT 8, "MS Shell Dlg" -{ +BEGIN CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP -} +END -IDD_PROF DIALOGEX 6, 6, 267, 95 -STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_PROF DIALOGEX 6, 6, 267, 110 +STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Proferences" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Download folder:", -1, 6, 10, 140, 8 - EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Update server:", -1, 6, 55, 140, 8 - EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 END STRINGTABLE DISCARDABLE BEGIN - IDS_WINDOW_TITLE "Çàâàíòàæèòè ! - Çàâàíòàæóâà÷ ReactOS" + IDS_WINDOW_TITLE "Çàâàíòàæèòè ! - Çàâàíòàæóâà÷ ReactOS" IDS_WELCOME_TITLE "Ëàñêàâî ïðîñèìî ó Çàâàíòàæóâà÷ ReactOS" - IDS_WELCOME "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ çë³âà. Öå âåðñ³ÿ 1.1." + IDS_WELCOME "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ çë³âà. Öå âåðñ³ÿ 1.1." IDS_NO_APP_TITLE "Äîäàòîê íå âèáðàíèé" - IDS_NO_APP "Áóäü ëàñêà, âèáåð³òü äîäàòîê ïåðø í³æ íàòèñíóòè êíîïêó çàâàíòàæåííÿ. ßêùî Âàì ïîòð³áíà äîïîìîãà, íàòèñí³òü êíîïêó ç³ çíàêîì ïèòàííÿ ó âåðõíüîìó ïðàâîìó êóòêó." - IDS_UPDATE_TITLE "Îíîâèòè" + IDS_NO_APP "Áóäü ëàñêà, âèáåð³òü äîäàòîê ïåðø í³æ íàòèñíóòè êíîïêó çàâàíòàæåííÿ. ßêùî Âàì ïîòð³áíà äîïîìîãà, íàòèñí³òü êíîïêó ç³ çíàêîì ïèòàííÿ ó âåðõíüîìó ïðàâîìó êóòêó." + IDS_UPDATE_TITLE "Îíîâèòè" IDS_UPDATE "Âèáà÷òå, äàíà ìîæëèâ³ñòü ùå íåäîñòóïíà." - IDS_HELP_TITLE "Äîâ³äêà" - IDS_HELP "Âèáåð³òü êàòåãîð³þ çë³âà, ïîò³ì âèáåð³òü äîäàòîê ³ íàòèñí³òü êíîïêó çàâàíòàæåííÿ. Äëÿ îòðèìàííÿ ³íôîðìàö³¿ ïðî îíîâëåííÿ íàòèñí³òü êíîïêó ïîðÿä ç êíîïêîþ äîâ³äêè." + IDS_HELP_TITLE "Äîâ³äêà" + IDS_HELP "Âèáåð³òü êàòåãîð³þ çë³âà, ïîò³ì âèáåð³òü äîäàòîê ³ íàòèñí³òü êíîïêó çàâàíòàæåííÿ. Äëÿ îòðèìàííÿ ³íôîðìàö³¿ ïðî îíîâëåííÿ íàòèñí³òü êíîïêó ïîðÿä ç êíîïêîþ äîâ³äêè." IDS_NO_APPS "Âèáà÷òå, â ö³é êàòåãîð³¿ ùå íåìàº äîäàòê³â. Âè ìîæåòå äîïîìîãòè ³ äîäàòè á³ëüøå äîäàòê³â." IDS_CHOOSE_APP "Áóäü ëàñêà âèáåð³òü äîäàòîê." IDS_CHOOSE_SUB "Áóäü ëàñêà âèáåð³òü ï³äêàòåãîð³þ." - IDS_CHOOSE_CATEGORY "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ." + IDS_CHOOSE_CATEGORY "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ." IDS_CHOOSE_BOTH "Áóäü ëàñêà âèáåð³òü ï³äêàòåãîð³þ àáî äîäàòîê." IDS_XMLERROR_1 "Íå âäàëîñÿ çíàéòè ôàéë xml !" IDS_XMLERROR_2 "Íå âäàëîñÿ îáðîáèòè ôàéë xml !" - IDS_DOWNLOAD_ERROR "Íåìîæëèâî çàâàíòàæèòè ôàéë.\nÁóäü ëàñêà ïåðåâ³ðòå âàøå ³íòåðíåò-ç'ºäíàííÿ." + IDS_DOWNLOAD_ERROR "Íåìîæëèâî çàâàíòàæèòè ôàéë.\nÁóäü ëàñêà ïåðåâ³ðòå âàøå ³íòåðíåò-ç'ºäíàííÿ." IDS_VERSION "Âåðñ³ÿ: " IDS_LICENCE "Ë³öåíç³ÿ: " IDS_MAINTAINER "Âèðîáíèê: " IDS_APPS_TITLE "Applications" IDS_CATS_TITLE "Categories" IDS_CHOOSE_FOLDER "Please, choose the folder..." - IDS_NOTCREATE_REGKEY "Could not create the registry key." - IDS_DOWNLOAD_FOLDER "Download!" - IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" IDS_UPDATE_URL "http://svn.reactos.org" END Added: trunk/rosapps/downloader/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/manifest.xml?re… ============================================================================== --- trunk/rosapps/downloader/manifest.xml (added) +++ trunk/rosapps/downloader/manifest.xml Tue Oct 16 09:37:22 2007 @@ -1,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.Application.Downloader" + type="win32" + /> + <description>ReactOS Downloader</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> Propchange: trunk/rosapps/downloader/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
71
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 October 2007