Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[weiden] 27636: Add support for user quotas in GetDiskFreeSpaceExW
by weiden＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: weiden Date: Sat Jul 14 01:42:44 2007 New Revision: 27636 URL: http://svn.reactos.org/svn/reactos?rev=27636&view=rev Log: Add support for user quotas in GetDiskFreeSpaceExW Modified: trunk/reactos/dll/win32/kernel32/file/volume.c trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c Sat Jul 14 01:42:44 2007 @@ -307,61 +307,104 @@ PULARGE_INTEGER lpTotalNumberOfFreeBytes ) { - FILE_FS_SIZE_INFORMATION FileFsSize; + union + { + FILE_FS_SIZE_INFORMATION FsSize; + FILE_FS_FULL_SIZE_INFORMATION FsFullSize; + } FsInfo; IO_STATUS_BLOCK IoStatusBlock; ULARGE_INTEGER BytesPerCluster; - WCHAR RootPathName[MAX_PATH]; HANDLE hFile; - NTSTATUS errCode; - - /* - FIXME: this is obviously wrong for UNC paths, symbolic directories etc. - -Gunnar - */ - if (lpDirectoryName) - { - wcsncpy (RootPathName, lpDirectoryName, 3); - } - else - { - GetCurrentDirectoryW (MAX_PATH, RootPathName); - } - RootPathName[3] = 0; - - hFile = InternalOpenDirW(RootPathName, FALSE); + NTSTATUS Status; + + if (lpDirectoryName == NULL) + lpDirectoryName = L"\\"; + + hFile = InternalOpenDirW(lpDirectoryName, FALSE); if (INVALID_HANDLE_VALUE == hFile) { return FALSE; } - errCode = NtQueryVolumeInformationFile(hFile, - &IoStatusBlock, - &FileFsSize, - sizeof(FILE_FS_SIZE_INFORMATION), - FileFsSizeInformation); - if (!NT_SUCCESS(errCode)) - { - CloseHandle(hFile); - SetLastErrorByStatus (errCode); + if (lpFreeBytesAvailableToCaller != NULL || lpTotalNumberOfBytes != NULL) + { + /* To get the free space available to the user associated with the + current thread, try FileFsFullSizeInformation. If this is not + supported by the file system, fall back to FileFsSize */ + + Status = NtQueryVolumeInformationFile(hFile, + &IoStatusBlock, + &FsInfo.FsFullSize, + sizeof(FsInfo.FsFullSize), + FileFsFullSizeInformation); + + if (NT_SUCCESS(Status)) + { + /* Close the handle before returning data + to avoid a handle leak in case of a fault! */ + CloseHandle(hFile); + + BytesPerCluster.QuadPart = + FsInfo.FsFullSize.BytesPerSector * FsInfo.FsFullSize.SectorsPerAllocationUnit; + + if (lpFreeBytesAvailableToCaller != NULL) + { + lpFreeBytesAvailableToCaller->QuadPart = + BytesPerCluster.QuadPart * FsInfo.FsFullSize.CallerAvailableAllocationUnits.QuadPart; + } + + if (lpTotalNumberOfBytes != NULL) + { + lpTotalNumberOfBytes->QuadPart = + BytesPerCluster.QuadPart * FsInfo.FsFullSize.TotalAllocationUnits.QuadPart; + } + + if (lpTotalNumberOfFreeBytes != NULL) + { + lpTotalNumberOfFreeBytes->QuadPart = + BytesPerCluster.QuadPart * FsInfo.FsFullSize.ActualAvailableAllocationUnits.QuadPart; + } + + return TRUE; + } + } + + Status = NtQueryVolumeInformationFile(hFile, + &IoStatusBlock, + &FsInfo.FsSize, + sizeof(FsInfo.FsSize), + FileFsSizeInformation); + + /* Close the handle before returning data + to avoid a handle leak in case of a fault! */ + CloseHandle(hFile); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus (Status); return FALSE; } BytesPerCluster.QuadPart = - FileFsSize.BytesPerSector * FileFsSize.SectorsPerAllocationUnit; - - // FIXME: Use quota information - if (lpFreeBytesAvailableToCaller) + FsInfo.FsSize.BytesPerSector * FsInfo.FsSize.SectorsPerAllocationUnit; + + if (lpFreeBytesAvailableToCaller) + { lpFreeBytesAvailableToCaller->QuadPart = - BytesPerCluster.QuadPart * FileFsSize.AvailableAllocationUnits.QuadPart; - - if (lpTotalNumberOfBytes) + BytesPerCluster.QuadPart * FsInfo.FsSize.AvailableAllocationUnits.QuadPart; + } + + if (lpTotalNumberOfBytes) + { lpTotalNumberOfBytes->QuadPart = - BytesPerCluster.QuadPart * FileFsSize.TotalAllocationUnits.QuadPart; - if (lpTotalNumberOfFreeBytes) + BytesPerCluster.QuadPart * FsInfo.FsSize.TotalAllocationUnits.QuadPart; + } + + if (lpTotalNumberOfFreeBytes) + { lpTotalNumberOfFreeBytes->QuadPart = - BytesPerCluster.QuadPart * FileFsSize.AvailableAllocationUnits.QuadPart; - - CloseHandle(hFile); + BytesPerCluster.QuadPart * FsInfo.FsSize.AvailableAllocationUnits.QuadPart; + } return TRUE; } Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h (original) +++ trunk/reactos/include/ndk/iotypes.h Sat Jul 14 01:42:44 2007 @@ -584,6 +584,15 @@ ULONG SectorsPerAllocationUnit; ULONG BytesPerSector; } FILE_FS_SIZE_INFORMATION, *PFILE_FS_SIZE_INFORMATION; + +typedef struct _FILE_FS_FULL_SIZE_INFORMATION +{ + LARGE_INTEGER TotalAllocationUnits; + LARGE_INTEGER CallerAvailableAllocationUnits; + LARGE_INTEGER ActualAvailableAllocationUnits; + ULONG SectorsPerAllocationUnit; + ULONG BytesPerSector; +} FILE_FS_FULL_SIZE_INFORMATION, *PFILE_FS_FULL_SIZE_INFORMATION; typedef struct _FILE_FS_LABEL_INFORMATION {

1 0

[weiden] 27635: Sync GetTempFileNameW to wine HEAD
by weiden＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: weiden Date: Sat Jul 14 00:23:26 2007 New Revision: 27635 URL: http://svn.reactos.org/svn/reactos?rev=27635&view=rev Log: Sync GetTempFileNameW to wine HEAD Modified: trunk/reactos/dll/win32/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c Sat Jul 14 00:23:26 2007 @@ -1183,7 +1183,7 @@ int i; LPWSTR p; - if ( !path || !prefix || !buffer ) + if ( !path || !buffer ) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; @@ -1195,7 +1195,8 @@ /* add a \, if there isn't one */ if ((p == buffer) || (p[-1] != '\\')) *p++ = '\\'; - for (i = 3; (i > 0) && (*prefix); i--) *p++ = *prefix++; + if ( prefix ) + for (i = 3; (i > 0) && (*prefix); i--) *p++ = *prefix++; unique &= 0xffff;

1 0

[weiden] 27634: Rewrite parts of FindFirstFileEx to: - Fix searches relative to the current directory using the features RtlDosPathNameToNtPathName_U provides instead of hacking around them - Enable searches for fake DOS devices. Some installers like NSIS use this feature to determine if a drive exists, this works now.
by weiden＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: weiden Date: Fri Jul 13 23:43:09 2007 New Revision: 27634 URL: http://svn.reactos.org/svn/reactos?rev=27634&view=rev Log: Rewrite parts of FindFirstFileEx to: - Fix searches relative to the current directory using the features RtlDosPathNameToNtPathName_U provides instead of hacking around them - Enable searches for fake DOS devices. Some installers like NSIS use this feature to determine if a drive exists, this works now. Modified: trunk/reactos/dll/win32/kernel32/file/find.c Modified: trunk/reactos/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/find.c (original) +++ trunk/reactos/dll/win32/kernel32/file/find.c Fri Jul 13 23:43:09 2007 @@ -21,6 +21,8 @@ #define FIND_DATA_SIZE (16*1024) +#define FIND_DEVICE_HANDLE ((HANDLE)0x1) + typedef struct _KERNEL32_FIND_FILE_DATA { HANDLE DirectoryHandle; @@ -48,6 +50,61 @@ /* FUNCTIONS ****************************************************************/ + +HANDLE +InternalCopyDeviceFindDataW(LPWIN32_FIND_DATAW lpFindFileData, + LPCWSTR lpFileName, + ULONG DeviceNameInfo) +{ + UNICODE_STRING DeviceName; + + DeviceName.Length = DeviceName.MaximumLength = (USHORT)(DeviceNameInfo & 0xFFFF); + DeviceName.Buffer = (LPWSTR)((ULONG_PTR)lpFileName + (DeviceNameInfo >> 16)); + + /* Return the data */ + RtlZeroMemory(lpFindFileData, + sizeof(*lpFindFileData)); + lpFindFileData->dwFileAttributes = FILE_ATTRIBUTE_ARCHIVE; + RtlCopyMemory(lpFindFileData->cFileName, + DeviceName.Buffer, + DeviceName.Length); + + return FIND_DEVICE_HANDLE; +} + +HANDLE +InternalCopyDeviceFindDataA(LPWIN32_FIND_DATAA lpFindFileData, + PUNICODE_STRING FileName, + ULONG DeviceNameInfo) +{ + UNICODE_STRING DeviceName; + ANSI_STRING BufferA; + CHAR Buffer[MAX_PATH]; + + DeviceName.Length = DeviceName.MaximumLength = (USHORT)(DeviceNameInfo & 0xFFFF); + DeviceName.Buffer = (LPWSTR)((ULONG_PTR)FileName->Buffer + (DeviceNameInfo >> 16)); + + BufferA.MaximumLength = sizeof(Buffer) - sizeof(Buffer[0]); + BufferA.Buffer = Buffer; + if (bIsFileApiAnsi) + RtlUnicodeStringToAnsiString (&BufferA, &DeviceName, FALSE); + else + RtlUnicodeStringToOemString (&BufferA, &DeviceName, FALSE); + + /* NOTE: Free the string before we try to write the results to the caller, + this way we prevent a memory leak in case of a fault... */ + RtlFreeUnicodeString(FileName); + + /* Return the data */ + RtlZeroMemory(lpFindFileData, + sizeof(*lpFindFileData)); + lpFindFileData->dwFileAttributes = FILE_ATTRIBUTE_ARCHIVE; + RtlCopyMemory(lpFindFileData->cFileName, + BufferA.Buffer, + BufferA.Length); + + return FIND_DEVICE_HANDLE; +} VOID InternalCopyFindDataW(LPWIN32_FIND_DATAW lpFindFileData, @@ -142,6 +199,12 @@ NTSTATUS Status; DPRINT("InternalFindNextFile(%lx)\n", hFindFile); + + if (hFindFile == FIND_DEVICE_HANDLE) + { + SetLastError (ERROR_NO_MORE_FILES); + return FALSE; + } IHeader = (PKERNEL32_FIND_DATA_HEADER)hFindFile; if (hFindFile == NULL || hFindFile == INVALID_HANDLE_VALUE || @@ -196,214 +259,185 @@ HANDLE STDCALL InternalFindFirstFile ( - LPCWSTR lpFileName, - BOOLEAN DirectoryOnly + LPCWSTR lpFileName, + BOOLEAN DirectoryOnly, + PULONG DeviceNameInfo ) { OBJECT_ATTRIBUTES ObjectAttributes; PKERNEL32_FIND_DATA_HEADER IHeader; PKERNEL32_FIND_FILE_DATA IData; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING NtPathU; - UNICODE_STRING PatternStr = RTL_CONSTANT_STRING(L"*"); + UNICODE_STRING NtPathU, FileName, PathFileName; NTSTATUS Status; - PWSTR e1, e2; - WCHAR CurrentDir[256]; - PWCHAR SlashlessFileName; - PWSTR SearchPath; - PWCHAR SearchPattern; - ULONG Length; + PWSTR NtPathBuffer; + BOOLEAN RemovedSlash = FALSE; BOOL bResult; + CURDIR DirInfo; + HANDLE hDirectory = NULL; DPRINT("FindFirstFileW(lpFileName %S)\n", lpFileName); - Length = wcslen(lpFileName); - if (L'\\' == lpFileName[Length - 1]) - { - SlashlessFileName = RtlAllocateHeap(hProcessHeap, - 0, - Length * sizeof(WCHAR)); - if (NULL == SlashlessFileName) + *DeviceNameInfo = 0; + RtlZeroMemory(&PathFileName, + sizeof(PathFileName)); + RtlInitUnicodeString(&FileName, + lpFileName); + + bResult = RtlDosPathNameToNtPathName_U (lpFileName, + &NtPathU, + (PCWSTR *)((ULONG_PTR)&PathFileName.Buffer), + &DirInfo); + if (FALSE == bResult) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return NULL; + } + + /* Save the buffer pointer for later, we need to free it! */ + NtPathBuffer = NtPathU.Buffer; + + /* If there is a file name/pattern then determine it's length */ + if (PathFileName.Buffer != NULL) + { + PathFileName.Length = NtPathU.Length - + (USHORT)((ULONG_PTR)PathFileName.Buffer - (ULONG_PTR)NtPathU.Buffer); + } + PathFileName.MaximumLength = PathFileName.Length; + + if (DirInfo.DosPath.Length != 0 && DirInfo.DosPath.Buffer != PathFileName.Buffer) + { + if (PathFileName.Buffer != NULL) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; + /* This is a relative path to DirInfo.Handle, adjust NtPathU! */ + NtPathU.Length = NtPathU.MaximumLength = + (USHORT)((ULONG_PTR)PathFileName.Buffer - (ULONG_PTR)DirInfo.DosPath.Buffer); + NtPathU.Buffer = DirInfo.DosPath.Buffer; } - memcpy(SlashlessFileName, lpFileName, (Length - 1) * sizeof(WCHAR)); - SlashlessFileName[Length - 1] = L'\0'; - lpFileName = SlashlessFileName; } else { - SlashlessFileName = NULL; - } - - e1 = wcsrchr(lpFileName, L'/'); - e2 = wcsrchr(lpFileName, L'\\'); - SearchPattern = max(e1, e2); - SearchPath = CurrentDir; - - if (NULL == SearchPattern) - { - CHECKPOINT; - SearchPattern = (PWCHAR)lpFileName; - Length = GetCurrentDirectoryW(sizeof(CurrentDir) / sizeof(WCHAR), SearchPath); - if (0 == Length) - { - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - return NULL; - } - if (Length > sizeof(CurrentDir) / sizeof(WCHAR)) - { - SearchPath = RtlAllocateHeap(hProcessHeap, - HEAP_ZERO_MEMORY, - Length * sizeof(WCHAR)); - if (NULL == SearchPath) - { - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - GetCurrentDirectoryW(Length, SearchPath); - } - } - else - { - CHECKPOINT; - SearchPattern++; - Length = SearchPattern - lpFileName; - if (Length + 1 > sizeof(CurrentDir) / sizeof(WCHAR)) - { - SearchPath = RtlAllocateHeap(hProcessHeap, - HEAP_ZERO_MEMORY, - (Length + 1) * sizeof(WCHAR)); - if (NULL == SearchPath) - { - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - } - memcpy(SearchPath, lpFileName, Length * sizeof(WCHAR)); - SearchPath[Length] = 0; - } - - bResult = RtlDosPathNameToNtPathName_U (SearchPath, - &NtPathU, - NULL, - NULL); - if (SearchPath != CurrentDir) - { - RtlFreeHeap(hProcessHeap, - 0, - SearchPath); - } - if (FALSE == bResult) - { - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - DPRINT("NtPathU \'%S\'\n", NtPathU.Buffer); - - IHeader = RtlAllocateHeap (hProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(KERNEL32_FIND_DATA_HEADER) + - sizeof(KERNEL32_FIND_FILE_DATA) + FIND_DATA_SIZE); - if (NULL == IHeader) - { - RtlFreeHeap (hProcessHeap, - 0, - NtPathU.Buffer); - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - IHeader->Type = FileFind; - IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); - - /* change pattern: "*.*" --> "*" */ - if (wcscmp (SearchPattern, L"*.*")) - { - RtlInitUnicodeString(&PatternStr, SearchPattern); - } - - DPRINT("NtPathU \'%S\' Pattern \'%S\'\n", - NtPathU.Buffer, PatternStr.Buffer); + /* This is an absolute path, NtPathU receives the full path */ + DirInfo.Handle = NULL; + if (PathFileName.Buffer != NULL) + { + NtPathU.Length = NtPathU.MaximumLength = + (USHORT)((ULONG_PTR)PathFileName.Buffer - (ULONG_PTR)NtPathU.Buffer); + } + } + + /* Remove a trailing backslash from the path, unless it's a DOS drive directly */ + if (NtPathU.Length > 3 * sizeof(WCHAR) && + NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 2] != L':' && + NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 1] != L'\\') + { + NtPathU.Length -= sizeof(WCHAR); + RemovedSlash = TRUE; + } + + DPRINT("lpFileName: \"%ws\"\n", lpFileName); + DPRINT("NtPathU: \"%wZ\"\n", &NtPathU); + DPRINT("PathFileName: \"%wZ\"\n", &PathFileName); + DPRINT("RelativeTo: 0x%p\n", DirInfo.Handle); InitializeObjectAttributes (&ObjectAttributes, &NtPathU, - 0, - NULL, + OBJ_CASE_INSENSITIVE, + DirInfo.Handle, NULL); - Status = NtOpenFile (&IData->DirectoryHandle, + Status = NtOpenFile (&hDirectory, FILE_LIST_DIRECTORY, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE); + if (!NT_SUCCESS(Status) && RemovedSlash) + { + /* Try again, this time with the trailing slash... */ + NtPathU.Length -= sizeof(WCHAR); + + Status = NtOpenFile (&hDirectory, + FILE_LIST_DIRECTORY, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE); + + NtPathU.Length -= sizeof(WCHAR); + } + + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap (hProcessHeap, + 0, + NtPathBuffer); + + /* See if the application tries to look for a DOS device */ + *DeviceNameInfo = RtlIsDosDeviceName_U((PWSTR)((ULONG_PTR)lpFileName)); + if (*DeviceNameInfo != 0) + return FIND_DEVICE_HANDLE; + + SetLastErrorByStatus (Status); + return(NULL); + } + + if (PathFileName.Length == 0) + { + /* No file part?! */ + NtClose(hDirectory); + RtlFreeHeap (hProcessHeap, + 0, + NtPathBuffer); + SetLastError(ERROR_FILE_NOT_FOUND); + return NULL; + } + + IHeader = RtlAllocateHeap (hProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(KERNEL32_FIND_DATA_HEADER) + + sizeof(KERNEL32_FIND_FILE_DATA) + FIND_DATA_SIZE); + if (NULL == IHeader) + { + RtlFreeHeap (hProcessHeap, + 0, + NtPathBuffer); + NtClose(hDirectory); + + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + IHeader->Type = FileFind; + IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); + IData->DirectoryHandle = hDirectory; + + /* change pattern: "*.*" --> "*" */ + if (PathFileName.Length == 6 && + RtlCompareMemory(PathFileName.Buffer, + L"*.*", + 6) == 6) + { + PathFileName.Length = 2; + } + + IData->pFileInfo = (PVOID)((ULONG_PTR)IData + sizeof(KERNEL32_FIND_FILE_DATA)); + IData->pFileInfo->FileIndex = 0; + IData->DirectoryOnly = DirectoryOnly; + + bResult = InternalFindNextFile((HANDLE)IHeader, &PathFileName); + RtlFreeHeap (hProcessHeap, 0, - NtPathU.Buffer); - - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap (hProcessHeap, 0, IHeader); - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - SetLastErrorByStatus (Status); - return(NULL); - } - IData->pFileInfo = (PVOID)((ULONG_PTR)IData + sizeof(KERNEL32_FIND_FILE_DATA)); - IData->pFileInfo->FileIndex = 0; - IData->DirectoryOnly = DirectoryOnly; - - bResult = InternalFindNextFile((HANDLE)IHeader, &PatternStr); - if (NULL != SlashlessFileName) - { - RtlFreeHeap(hProcessHeap, - 0, - SlashlessFileName); - } - - if (!bResult) - { - FindClose((HANDLE)IHeader); - return NULL; - } + NtPathBuffer); + + if (!bResult) + { + FindClose((HANDLE)IHeader); + return NULL; + } return (HANDLE)IHeader; } @@ -423,6 +457,7 @@ PKERNEL32_FIND_FILE_DATA IData; UNICODE_STRING FileNameU; ANSI_STRING FileName; + ULONG DeviceNameInfo; RtlInitAnsiString (&FileName, (LPSTR)lpFileName); @@ -437,15 +472,22 @@ &FileName, TRUE); - IHeader = InternalFindFirstFile (FileNameU.Buffer, FALSE); - - RtlFreeUnicodeString (&FileNameU); + IHeader = InternalFindFirstFile (FileNameU.Buffer, FALSE, &DeviceNameInfo); if (IHeader == NULL) { + RtlFreeUnicodeString (&FileNameU); DPRINT("Failing request\n"); return INVALID_HANDLE_VALUE; } + + if ((HANDLE)IHeader == FIND_DEVICE_HANDLE) + { + /* NOTE: FileNameU will be freed in InternalCopyDeviceFindDataA */ + return InternalCopyDeviceFindDataA(lpFindFileData, &FileNameU, DeviceNameInfo); + } + + RtlFreeUnicodeString (&FileNameU); IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); @@ -501,6 +543,9 @@ PKERNEL32_FIND_DATA_HEADER IHeader; DPRINT("FindClose(hFindFile %x)\n",hFindFile); + + if (hFindFile == FIND_DEVICE_HANDLE) + return TRUE; if (!hFindFile || hFindFile == INVALID_HANDLE_VALUE) { @@ -600,6 +645,7 @@ { PKERNEL32_FIND_DATA_HEADER IHeader; PKERNEL32_FIND_FILE_DATA IData; + ULONG DeviceNameInfo; if (fInfoLevelId != FindExInfoStandard) { @@ -614,12 +660,15 @@ return INVALID_HANDLE_VALUE; } - IHeader = InternalFindFirstFile (lpFileName, fSearchOp == FindExSearchLimitToDirectories ? TRUE : FALSE); - if (IHeader == NULL) - { - DPRINT("Failing request\n"); - return INVALID_HANDLE_VALUE; - } + IHeader = InternalFindFirstFile (lpFileName, fSearchOp == FindExSearchLimitToDirectories ? TRUE : FALSE, &DeviceNameInfo); + if (IHeader == NULL) + { + DPRINT("Failing request\n"); + return INVALID_HANDLE_VALUE; + } + + if ((HANDLE)IHeader == FIND_DEVICE_HANDLE) + return InternalCopyDeviceFindDataW((LPWIN32_FIND_DATAW)lpFindFileData, lpFileName, DeviceNameInfo); IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); @@ -650,6 +699,7 @@ PKERNEL32_FIND_FILE_DATA IData; UNICODE_STRING FileNameU; ANSI_STRING FileNameA; + ULONG DeviceNameInfo; if (fInfoLevelId != FindExInfoStandard) { @@ -672,15 +722,22 @@ else RtlOemStringToUnicodeString (&FileNameU, &FileNameA, TRUE); - IHeader = InternalFindFirstFile (FileNameU.Buffer, FALSE); - - RtlFreeUnicodeString (&FileNameU); + IHeader = InternalFindFirstFile (FileNameU.Buffer, FALSE, &DeviceNameInfo); if (IHeader == NULL) { + RtlFreeUnicodeString (&FileNameU); DPRINT("Failing request\n"); return INVALID_HANDLE_VALUE; } + + if ((HANDLE)IHeader == FIND_DEVICE_HANDLE) + { + /* NOTE: FileNameU will be freed in InternalCopyDeviceFindDataA */ + return InternalCopyDeviceFindDataA(lpFindFileData, &FileNameU, DeviceNameInfo); + } + + RtlFreeUnicodeString (&FileNameU); IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1);

1 0

[fireball] 27633: - Merge 27154:27632 for the following directories: * boot * hal * include * lib * media (excluding fonts!) * ntoskrnl * tools * baseaddress.rbuild/reactos.rbuild from the root folder
by fireball＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: fireball Date: Fri Jul 13 23:07:59 2007 New Revision: 27633 URL: http://svn.reactos.org/svn/reactos?rev=27633&view=rev Log: - Merge 27154:27632 for the following directories: * boot * hal * include * lib * media (excluding fonts!) * ntoskrnl * tools * baseaddress.rbuild/reactos.rbuild from the root folder Added: branches/olpc/boot/freeldr/fdebug/lang/ru-RU.rc - copied unchanged from r27632, trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc branches/olpc/include/psdk/ksmedia.h - copied unchanged from r27632, trunk/reactos/include/psdk/ksmedia.h branches/olpc/include/psdk/reason.h - copied unchanged from r27632, trunk/reactos/include/psdk/reason.h branches/olpc/lib/sdk/libcntpr/string/strtoull.c - copied unchanged from r27632, trunk/reactos/lib/sdk/libcntpr/string/strtoull.c branches/olpc/ntoskrnl/ke/i386/init.S - copied unchanged from r27632, trunk/reactos/ntoskrnl/ke/i386/init.S branches/olpc/tools/rbuild/backend/msbuild/ - copied from r27632, trunk/reactos/tools/rbuild/backend/msbuild/ branches/olpc/tools/sysreg/data_source.h - copied unchanged from r27632, trunk/reactos/tools/sysreg/data_source.h Removed: branches/olpc/include/psdk/comcat.h Modified: branches/olpc/ReactOS.rbuild branches/olpc/baseaddress.rbuild branches/olpc/boot/bootdata/hivesys.inf branches/olpc/boot/bootdata/packages/reactos.dff branches/olpc/boot/freeldr/fdebug/fdebug.rc branches/olpc/boot/freeldr/fdebug/lang/hu-HU.rc branches/olpc/boot/freeldr/fdebug/lang/id-ID.rc (contents, props changed) branches/olpc/boot/freeldr/fdebug/lang/it-IT.rc (contents, props changed) branches/olpc/boot/freeldr/fdebug/lang/pl-PL.rc branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c branches/olpc/boot/freeldr/freeldr/reactos/reactos.c branches/olpc/boot/freeldr/freeldr/reactos/setupldr.c branches/olpc/hal/hal/hal.def branches/olpc/hal/halx86/generic/pci.c branches/olpc/hal/halx86/generic/sysinfo.c branches/olpc/hal/halx86/include/halp.h branches/olpc/include/ddk/ddrawi.h branches/olpc/include/ddk/drmk.h branches/olpc/include/ddk/kcom.h branches/olpc/include/ddk/portcls.h (contents, props changed) branches/olpc/include/ddk/punknown.h branches/olpc/include/ddk/stdunk.h branches/olpc/include/ddk/winddk.h branches/olpc/include/ndk/haltypes.h branches/olpc/include/psdk/basetsd.h branches/olpc/include/psdk/commctrl.h branches/olpc/include/psdk/ks.h branches/olpc/include/psdk/psdk.rbuild branches/olpc/include/psdk/rpc.h branches/olpc/include/psdk/rpcdce.h branches/olpc/include/psdk/rpcndr.h branches/olpc/include/psdk/shlobj.h branches/olpc/include/psdk/winerror.h branches/olpc/include/psdk/winnt.h branches/olpc/include/psdk/winuser.h branches/olpc/include/psdk/winver.h branches/olpc/include/reactos/idl/eventlogrpc.idl branches/olpc/include/reactos/idl/idl.rbuild branches/olpc/include/reactos/idl/svcctl.idl branches/olpc/include/reactos/libs/syssetup/syssetup.h branches/olpc/include/reactos/wine/unicode.h branches/olpc/lib/3rdparty/mingw/moldname-msvcrt.def branches/olpc/lib/rossym/frommem.c branches/olpc/lib/rtl/unicode.c branches/olpc/lib/sdk/crt/math/i386/atan_asm.s branches/olpc/lib/sdk/crt/math/i386/log10_asm.s branches/olpc/lib/sdk/crt/stdlib/malloc.c branches/olpc/lib/sdk/libcntpr/libcntpr.rbuild branches/olpc/lib/sdk/libcntpr/string/strtoul.c branches/olpc/media/doc/README.WINE branches/olpc/media/inf/netamd.inf branches/olpc/ntoskrnl/cm/ntfunc.c branches/olpc/ntoskrnl/cm/regfile.c branches/olpc/ntoskrnl/cm/registry.c branches/olpc/ntoskrnl/cm/regobj.c branches/olpc/ntoskrnl/config/cmse.c branches/olpc/ntoskrnl/include/internal/io_x.h branches/olpc/ntoskrnl/include/internal/kd.h branches/olpc/ntoskrnl/io/iomgr/driver.c branches/olpc/ntoskrnl/io/pnpmgr/pnpmgr.c branches/olpc/ntoskrnl/kd/kdinit.c branches/olpc/ntoskrnl/kd/kdio.c branches/olpc/ntoskrnl/kd/kdmain.c branches/olpc/ntoskrnl/kdbg/kdb.c branches/olpc/ntoskrnl/kdbg/kdb_symbols.c branches/olpc/ntoskrnl/ke/i386/exp.c branches/olpc/ntoskrnl/ke/i386/kiinit.c branches/olpc/ntoskrnl/ke/timerobj.c branches/olpc/ntoskrnl/mm/sysldr.c branches/olpc/ntoskrnl/ntoskrnl.mc branches/olpc/ntoskrnl/ntoskrnl.rbuild branches/olpc/ntoskrnl/ob/obref.c branches/olpc/ntoskrnl/po/events.c branches/olpc/ntoskrnl/po/power.c branches/olpc/ntoskrnl/se/semgr.c branches/olpc/ntoskrnl/se/token.c branches/olpc/tools/cabman/dfp.cxx branches/olpc/tools/rbuild/backend/mingw/modulehandler.cpp branches/olpc/tools/rbuild/backend/mingw/modulehandler.h branches/olpc/tools/rbuild/backend/msvc/msvc.cpp branches/olpc/tools/rbuild/backend/msvc/msvc.h branches/olpc/tools/rbuild/backend/msvc/vcprojmaker.cpp branches/olpc/tools/rbuild/bootstrap.cpp branches/olpc/tools/rbuild/define.cpp branches/olpc/tools/rbuild/include.cpp branches/olpc/tools/rbuild/module.cpp branches/olpc/tools/rbuild/rbuild.h branches/olpc/tools/rbuild/rbuild.mak branches/olpc/tools/sysreg/file_reader.cpp branches/olpc/tools/sysreg/file_reader.h branches/olpc/tools/sysreg/namedpipe_reader.cpp branches/olpc/tools/sysreg/namedpipe_reader.h branches/olpc/tools/sysreg/os_support.cpp branches/olpc/tools/sysreg/os_support.h branches/olpc/tools/sysreg/pipe_reader.h branches/olpc/tools/sysreg/rosboot_test.cpp branches/olpc/tools/sysreg/rosboot_test.h branches/olpc/tools/sysreg/sysreg.mak [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/olpc/ReactOS.rbuild URL: http://svn.reactos.org/svn/reactos/branches/olpc/ReactOS.rbuild?rev=27633&r… Modified: branches/olpc/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/olpc/baseaddress.rbuild?rev=276… Modified: branches/olpc/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/bootdata/hivesys.inf?… Modified: branches/olpc/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/bootdata/packages/rea… Modified: branches/olpc/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/fdebug/fdebug… Modified: branches/olpc/boot/freeldr/fdebug/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/fdebug/lang/h… Modified: branches/olpc/boot/freeldr/fdebug/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/fdebug/lang/i… Modified: branches/olpc/boot/freeldr/fdebug/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/fdebug/lang/i… Modified: branches/olpc/boot/freeldr/fdebug/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/fdebug/lang/p… Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… Modified: branches/olpc/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/react… Modified: branches/olpc/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/react… Modified: branches/olpc/hal/hal/hal.def URL: http://svn.reactos.org/svn/reactos/branches/olpc/hal/hal/hal.def?rev=27633&… Modified: branches/olpc/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/hal/halx86/generic/pci.c?r… Modified: branches/olpc/hal/halx86/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/hal/halx86/generic/sysinfo… Modified: branches/olpc/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/hal/halx86/include/halp.h?… Modified: branches/olpc/include/ddk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/ddk/ddrawi.h?rev=2… Modified: branches/olpc/include/ddk/drmk.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/ddk/drmk.h?rev=276… Modified: branches/olpc/include/ddk/kcom.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/ddk/kcom.h?rev=276… Modified: branches/olpc/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/ddk/portcls.h?rev=… Modified: branches/olpc/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/ddk/punknown.h?rev… Modified: branches/olpc/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/ddk/stdunk.h?rev=2… Modified: branches/olpc/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/ddk/winddk.h?rev=2… Modified: branches/olpc/include/ndk/haltypes.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/ndk/haltypes.h?rev… Modified: branches/olpc/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/basetsd.h?rev… Removed: branches/olpc/include/psdk/comcat.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/comcat.h?rev=… Modified: branches/olpc/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/commctrl.h?re… Modified: branches/olpc/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/ks.h?rev=2763… Modified: branches/olpc/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/psdk.rbuild?r… Modified: branches/olpc/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/rpc.h?rev=276… Modified: branches/olpc/include/psdk/rpcdce.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/rpcdce.h?rev=… Modified: branches/olpc/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/rpcndr.h?rev=… Modified: branches/olpc/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/shlobj.h?rev=… Modified: branches/olpc/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/winerror.h?re… Modified: branches/olpc/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/winnt.h?rev=2… Modified: branches/olpc/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/winuser.h?rev… Modified: branches/olpc/include/psdk/winver.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/psdk/winver.h?rev=… Modified: branches/olpc/include/reactos/idl/eventlogrpc.idl URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/reactos/idl/eventl… Modified: branches/olpc/include/reactos/idl/idl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/reactos/idl/idl.rb… Modified: branches/olpc/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/reactos/idl/svcctl… Modified: branches/olpc/include/reactos/libs/syssetup/syssetup.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/reactos/libs/sysse… Modified: branches/olpc/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/include/reactos/wine/unico… Modified: branches/olpc/lib/3rdparty/mingw/moldname-msvcrt.def URL: http://svn.reactos.org/svn/reactos/branches/olpc/lib/3rdparty/mingw/moldnam… Modified: branches/olpc/lib/rossym/frommem.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/lib/rossym/frommem.c?rev=2… Modified: branches/olpc/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/lib/rtl/unicode.c?rev=2763… Modified: branches/olpc/lib/sdk/crt/math/i386/atan_asm.s URL: http://svn.reactos.org/svn/reactos/branches/olpc/lib/sdk/crt/math/i386/atan… Modified: branches/olpc/lib/sdk/crt/math/i386/log10_asm.s URL: http://svn.reactos.org/svn/reactos/branches/olpc/lib/sdk/crt/math/i386/log1… Modified: branches/olpc/lib/sdk/crt/stdlib/malloc.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/lib/sdk/crt/stdlib/malloc.… Modified: branches/olpc/lib/sdk/libcntpr/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/olpc/lib/sdk/libcntpr/libcntpr.… Modified: branches/olpc/lib/sdk/libcntpr/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/lib/sdk/libcntpr/string/st… Modified: branches/olpc/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/olpc/media/doc/README.WINE?rev=… Modified: branches/olpc/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/branches/olpc/media/inf/netamd.inf?rev=2… Modified: branches/olpc/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/cm/ntfunc.c?rev=2… Modified: branches/olpc/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/cm/regfile.c?rev=… Modified: branches/olpc/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/cm/registry.c?rev… Modified: branches/olpc/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/cm/regobj.c?rev=2… Modified: branches/olpc/ntoskrnl/config/cmse.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/config/cmse.c?rev… Modified: branches/olpc/ntoskrnl/include/internal/io_x.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/include/internal/… Modified: branches/olpc/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/include/internal/… Modified: branches/olpc/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/io/iomgr/driver.c… Modified: branches/olpc/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/io/pnpmgr/pnpmgr.… Modified: branches/olpc/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/kd/kdinit.c?rev=2… Modified: branches/olpc/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/kd/kdio.c?rev=276… Modified: branches/olpc/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/kd/kdmain.c?rev=2… Modified: branches/olpc/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/kdbg/kdb.c?rev=27… Modified: branches/olpc/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/kdbg/kdb_symbols.… Modified: branches/olpc/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/ke/i386/exp.c?rev… Modified: branches/olpc/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/ke/i386/kiinit.c?… Modified: branches/olpc/ntoskrnl/ke/timerobj.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/ke/timerobj.c?rev… Modified: branches/olpc/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/mm/sysldr.c?rev=2… Modified: branches/olpc/ntoskrnl/ntoskrnl.mc URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/ntoskrnl.mc?rev=2… Modified: branches/olpc/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/ntoskrnl.rbuild?r… Modified: branches/olpc/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/ob/obref.c?rev=27… Modified: branches/olpc/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/po/events.c?rev=2… Modified: branches/olpc/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/po/power.c?rev=27… Modified: branches/olpc/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/se/semgr.c?rev=27… Modified: branches/olpc/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/se/token.c?rev=27… Modified: branches/olpc/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/cabman/dfp.cxx?rev=2… Modified: branches/olpc/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/rbuild/backend/mingw… Modified: branches/olpc/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/rbuild/backend/mingw… Modified: branches/olpc/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/rbuild/backend/msvc/… Modified: branches/olpc/tools/rbuild/backend/msvc/msvc.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/rbuild/backend/msvc/… Modified: branches/olpc/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/rbuild/backend/msvc/… Modified: branches/olpc/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/rbuild/bootstrap.cpp… Modified: branches/olpc/tools/rbuild/define.cpp URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/rbuild/define.cpp?re… Modified: branches/olpc/tools/rbuild/include.cpp URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/rbuild/include.cpp?r… Modified: branches/olpc/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/rbuild/module.cpp?re… Modified: branches/olpc/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/rbuild/rbuild.h?rev=… Modified: branches/olpc/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/rbuild/rbuild.mak?re… Modified: branches/olpc/tools/sysreg/file_reader.cpp URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/sysreg/file_reader.c… Modified: branches/olpc/tools/sysreg/file_reader.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/sysreg/file_reader.h… Modified: branches/olpc/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/sysreg/namedpipe_rea… Modified: branches/olpc/tools/sysreg/namedpipe_reader.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/sysreg/namedpipe_rea… Modified: branches/olpc/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/sysreg/os_support.cp… Modified: branches/olpc/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/sysreg/os_support.h?… Modified: branches/olpc/tools/sysreg/pipe_reader.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/sysreg/pipe_reader.h… Modified: branches/olpc/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/sysreg/rosboot_test.… Modified: branches/olpc/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/sysreg/rosboot_test.… Modified: branches/olpc/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/branches/olpc/tools/sysreg/sysreg.mak?re…

1 0

[fireball] 27632: - Include olpchw.c into build.
by fireball＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: fireball Date: Fri Jul 13 19:08:20 2007 New Revision: 27632 URL: http://svn.reactos.org/svn/reactos?rev=27632&view=rev Log: - Include olpchw.c into build. Modified: branches/olpc/boot/freeldr/freeldr/freeldr_arch.rbuild Modified: branches/olpc/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/freel… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ branches/olpc/boot/freeldr/freeldr/freeldr_arch.rbuild Fri Jul 13 19:08:20 2007 @@ -32,6 +32,7 @@ <file>portio.c</file> <file>macholpc.c</file> <file>machxbox.c</file> + <file>olpchw.c</file> <file>olpcvideo.c</file> <file>xboxcons.c</file> <file>xboxdisk.c</file>

1 0

[fireball] 27631: - OLPC-specific hacks (enabling debug-output to screen, changing hardcoded 640x480 to olpc's display resolution).
by fireball＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: fireball Date: Fri Jul 13 19:07:40 2007 New Revision: 27631 URL: http://svn.reactos.org/svn/reactos?rev=27631&view=rev Log: - OLPC-specific hacks (enabling debug-output to screen, changing hardcoded 640x480 to olpc's display resolution). Modified: branches/olpc/ntoskrnl/inbv/inbv.c Modified: branches/olpc/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/inbv/inbv.c?rev=2… ============================================================================== --- branches/olpc/ntoskrnl/inbv/inbv.c (original) +++ branches/olpc/ntoskrnl/inbv/inbv.c Fri Jul 13 19:07:40 2007 @@ -11,7 +11,7 @@ KIRQL InbvOldIrql; INBV_DISPLAY_STATE InbvDisplayState; BOOLEAN InbvBootDriverInstalled; -BOOLEAN InbvDisplayDebugStrings; +BOOLEAN InbvDisplayDebugStrings = TRUE; INBV_DISPLAY_STRING_FILTER InbvDisplayFilter; ULONG ProgressBarLeft, ProgressBarTop; BOOLEAN ShowProgressBar; @@ -238,17 +238,26 @@ /* Check if a filter is installed */ if (InbvDisplayFilter) InbvDisplayFilter(&String); - /* Acquire the lock */ - InbvAcquireLock(); - - /* Make sure we're installed and display the string */ - if (InbvBootDriverInstalled) VidDisplayString((PUCHAR) String); - - /* Call Headless (We don't support headless for now) - HeadlessDispatch(DISPLAY_STRING); */ - - /* Release the lock */ - InbvReleaseLock(); + if (InbvBootDriverInstalled) + { + /* Acquire the lock */ + InbvAcquireLock(); + + /* Make sure we're installed and display the string */ + VidDisplayString((PUCHAR) String); + + /* Call Headless (We don't support headless for now) + HeadlessDispatch(DISPLAY_STRING); */ + + /* Release the lock */ + InbvReleaseLock(); + } + else + { + /* We're still allowed to print very-early debug messages. + Be warned, this is a HACK! */ + VidDisplayString((PUCHAR) String); + } /* All done */ return TRUE; @@ -577,7 +586,7 @@ } /* Set the scrolling region */ - InbvSetScrollRegion(32, 80, 631, 400); + InbvSetScrollRegion(32, 80, 1191, 820); /* Make sure we have resources */ if ((Bitmap) && (Header)) @@ -615,7 +624,7 @@ if (InbvGetDisplayState() == INBV_DISPLAY_STATE_OWNED) { /* Clear the screen */ - VidSolidColorFill(0, 0, 639, 479, 0); + VidSolidColorFill(0, 0, 1199, 899, 0); } /* Reset progress bar and lock */

1 0

[greatlrd] 27630: patch from Preston Pigglessworth email : tykef at atlas dot cz --------------------------------------------------------------- update the translations for CZ See issue #1958 for more details.
by greatlrd＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: greatlrd Date: Fri Jul 13 17:43:46 2007 New Revision: 27630 URL: http://svn.reactos.org/svn/reactos?rev=27630&view=rev Log: patch from Preston Pigglessworth email : tykef at atlas dot cz --------------------------------------------------------------- update the translations for CZ See issue #1958 for more details. Modified: trunk/reactos/base/shell/explorer/explorer-cz.rc Modified: trunk/reactos/base/shell/explorer/explorer-cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cz.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-cz.rc Fri Jul 13 17:43:46 2007 @@ -7,10 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "resource.h" -#define APSTUDIO_HIDDEN_SYMBOLS #include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -33,40 +30,40 @@ BEGIN POPUP "&Soubor" BEGIN - MENUITEM "&Spustit...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "&Ukonèit", ID_FILE_EXIT + MENUITEM "&Spustit...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&Ukonèit", ID_FILE_EXIT END POPUP "&Zobrazení" BEGIN - MENUITEM "&Lita nástrojù", ID_VIEW_TOOL_BAR - MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR - MENUITEM "L&ita diskù", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Boèní lita", ID_VIEW_SIDE_BAR - MENUITEM "&Status Bar", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Aktualizovat\tF5", ID_REFRESH + MENUITEM "Panel &nástrojù", ID_VIEW_TOOL_BAR + MENUITEM "Panel &extra", ID_VIEW_EXTRA_BAR + MENUITEM "L&ita diskù", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Boèní panel", ID_VIEW_SIDE_BAR + MENUITEM "&Stavový øádek", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Aktualizovat\tF5", ID_REFRESH MENUITEM "&Celá obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "SDI", ID_VIEW_SDI + MENUITEM "SDI", ID_VIEW_SDI END POPUP "&Okno" BEGIN - MENUITEM "&Nové Okno", ID_WINDOW_NEW - MENUITEM "&Kaskádovat\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "&Uspoøádat vodorovnì", ID_WINDOW_TILE_HORZ - MENUITEM "U&spoøádat svisle\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "Us&poøádat automaticky", ID_WINDOW_AUTOSORT - MENUITEM "Usp&oøádat symboly", ID_WINDOW_ARRANGE + MENUITEM "&Nové Okno", ID_WINDOW_NEW + MENUITEM "&Kaskádovat\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "&Uspoøádat vodorovnì", ID_WINDOW_TILE_HORZ + MENUITEM "U&spoøádat svisle\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Us&poøádat automaticky", ID_WINDOW_AUTOSORT + MENUITEM "Usp&oøádat symboly", ID_WINDOW_ARRANGE END POPUP "&Nástroje" BEGIN - MENUITEM "&Nastavení", ID_TOOLS_OPTIONS + MENUITEM "&Monosti", ID_TOOLS_OPTIONS END POPUP "&Pomoc" BEGIN - MENUITEM "&Prùzkumník &FAQ...", ID_EXPLORER_FAQ - MENUITEM "O p&rùzkumníku...", ID_ABOUT_EXPLORER - MENUITEM "&O OS...", ID_ABOUT_WINDOWS + MENUITEM "&Prùzkumník &FAQ", ID_EXPLORER_FAQ + MENUITEM "O P&rùzkumníku", ID_ABOUT_EXPLORER + MENUITEM "&O operaèním systému", ID_ABOUT_WINDOWS END END @@ -74,10 +71,10 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Nastavení...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Správce úloh...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&O Exploreru...", ID_ABOUT_EXPLORER + MENUITEM "&Nastavení", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Správce úloh", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&O Prùzkumníku", ID_ABOUT_EXPLORER END END @@ -86,7 +83,7 @@ POPUP "" BEGIN MENUITEM "&Otevøít ovládání hlasitosti", ID_TRAY_VOLUME - MENUITEM "&Upravit vlastnosti zvuku", ID_VOLUME_PROPERTIES + MENUITEM "&Upravit vlastnosti zvuku", ID_VOLUME_PROPERTIES END END @@ -94,12 +91,12 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Zobrazit skryté ikony", ID_SHOW_HIDDEN_ICONS - MENUITEM "Z&obrazit ikonu tlaèítka", ID_SHOW_ICON_BUTTON - MENUITEM "&Nastavit upozornìní...", ID_CONFIG_NOTIFYAREA - MENUITEM "N&astavit datum a èas...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "&O prùzkuníku...", ID_ABOUT_EXPLORER + MENUITEM "&Zobrazit skryté ikony", ID_SHOW_HIDDEN_ICONS + MENUITEM "Z&obrazit ikonu tlaèítka", ID_SHOW_ICON_BUTTON + MENUITEM "&Nastavit upozornìní", ID_CONFIG_NOTIFYAREA + MENUITEM "N&astavit datum a èas", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&O Prùzkumníku", ID_ABOUT_EXPLORER END END @@ -107,29 +104,29 @@ BEGIN POPUP "&Soubor" BEGIN - MENUITEM "&Spustit...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "&Ukonèit", ID_FILE_EXIT + MENUITEM "&Spustit...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&Ukonèit", ID_FILE_EXIT END POPUP "&Zobrazení" BEGIN - MENUITEM "&Lita nástrojù", ID_VIEW_TOOL_BAR - MENUITEM "&Boèní lita", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "&Status lita", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Aktualizovat\tF5", ID_REFRESH + MENUITEM "Panel &nástrojù", ID_VIEW_TOOL_BAR + MENUITEM "&Boèní panel", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Stavový øádek", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Aktualizovat\tF5", ID_REFRESH MENUITEM "Celá obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&MDI", ID_VIEW_MDI + MENUITEM "&MDI", ID_VIEW_MDI END POPUP "&Nástroje" BEGIN - MENUITEM "&Nastavení", ID_TOOLS_OPTIONS + MENUITEM "&Nastavení", ID_TOOLS_OPTIONS END POPUP "&Pomoc" BEGIN - MENUITEM "Prùzkumník &FAQ...", ID_EXPLORER_FAQ - MENUITEM "O &prùzkumníku...", ID_ABOUT_EXPLORER - MENUITEM "O &OS...", ID_ABOUT_WINDOWS + MENUITEM "Prùzkumník &FAQ", ID_EXPLORER_FAQ + MENUITEM "O &Prùzkumníku", ID_ABOUT_EXPLORER + MENUITEM "O &Operaèním systému", ID_ABOUT_WINDOWS END END @@ -139,19 +136,19 @@ // Dialog // -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Spustit" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 - CONTROL "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + CONTROL "&Pøíkaz:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, 18,60,10 EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + CONTROL "Jako &symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, 45,71,12 DEFPUSHBUTTON "&Spustit",1,158,6,47,14 - PUSHBUTTON "&Zruit",2,158,23,47,14 + PUSHBUTTON "&Storno",2,158,23,47,14 PUSHBUTTON "&Pomoc",254,158,43,47,14 END @@ -162,7 +159,7 @@ CAPTION "Hledat program v nabídce Start" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "&Filter:",IDC_STATIC,7,9,18,8 + LTEXT "&Filtr:",IDC_STATIC,7,9,18,8 EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | @@ -177,27 +174,27 @@ BEGIN LTEXT "Prosím zvolte si zpùsob zarovnání ikon:",IDC_STATIC,7,7, 166,8 - CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + CONTROL "vlevo/n. d.",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + CONTROL "vlevo/n. p.",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + CONTROL "vpravo/n. l.",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + CONTROL "vpravo/d. d.",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + CONTROL "vlevo/dole n.",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + CONTROL "vlevo/dole p.",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + CONTROL "vpravo/d. l.",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + CONTROL "vpravo/d. n.",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + CONTROL "na okraji d.",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + CONTROL "na okraji",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + CONTROL "dokola",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 @@ -212,8 +209,9 @@ BEGIN CONTROL "&Zobrazit èas",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,152,52,10 - CONTROL "&Skrýt neaktivní ikony",ID_HIDE_INACTIVE_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,174,111,10 + CONTROL "&Skrýt neaktivní ikony", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 PUSHBUTTON "&Upozornìní...",ID_CONFIG_NOTIFYAREA,153,173,50,14 END @@ -233,27 +231,27 @@ BEGIN CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "&Tooltip Text:",IDC_LABEL1,7,44,40,8 + LTEXT "&Text popisku:",IDC_LABEL1,7,44,40,8 EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL - LTEXT "W&indow Title:",IDC_LABEL2,7,63,44,8 + LTEXT "&Název okna:",IDC_LABEL2,7,63,44,8 EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL - LTEXT "&Module Path:",IDC_LABEL3,7,81,43,8 + LTEXT "&Cesta:",IDC_LABEL3,7,81,80,8 EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL - GROUPBOX "&Display Mode",IDC_LABEL4,7,96,157,28 - CONTROL "&show",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,15,108,33,10 - CONTROL "&hide",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + GROUPBOX "&Zobrazení",IDC_LABEL4,7,96,157,28 + CONTROL "z&obrazit",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,45,10 + CONTROL "&skrýt",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, 108,29,10 - CONTROL "a&utohide",IDC_NOTIFY_AUTOHIDE,"Button", - BS_AUTORADIOBUTTON,112,108,43,10 + CONTROL "&automaticky",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,104,108,55,10 ICON "",IDC_PICTURE,173,101,21,20 - LTEXT "&Last Change:",IDC_LABEL6,7,132,43,8 + LTEXT "&Poslední zmìna:",IDC_LABEL6,7,132,60,8 EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | ES_READONLY - CONTROL "sho&w hidden",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 - DEFPUSHBUTTON "&Nastavit",IDOK,91,153,50,14,WS_GROUP - PUSHBUTTON "&Zruit",IDCANCEL,151,153,50,14 + CONTROL "zob&razit skryté",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,158,57,10 + DEFPUSHBUTTON "&Ok",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Storno",IDCANCEL,151,153,50,14 END IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 @@ -262,22 +260,63 @@ CAPTION "Volba MDI / SDI módu" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "Prosím zvolte si Vámi upøednostòovaný zpùsob zobrazení oken prùzkumníka:", + LTEXT "Prosím zvolte si Vámi upøednostòovaný zpùsob zobrazení oken Prùzkumníka:", IDC_STATIC,7,7,160,8 CONTROL "&MDI (Mnoho dokumentový interface)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,121,10 + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,125,10 CONTROL "&SDI (Jedno dokumentový interface)",IDC_SDI,"Button", - BS_AUTORADIOBUTTON,7,62,115,10 + BS_AUTORADIOBUTTON,7,62,125,10 CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 - CONTROL "Open Subfolders in s&eparate windows", + CONTROL "&Otevírat sloky v novém oknì", IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,135,10 - LTEXT "Toto nastavení bude pouito jako implicitní pro vechny okna prùzkumníka.", + LTEXT "Toto nastavení bude pouito jako výchozí pro vechna okna Prùzkumníka.", IDC_STATIC,7,111,174,22 - DEFPUSHBUTTON "&Nastavit",IDOK,29,136,50,14,WS_GROUP - PUSHBUTTON "&Zruit",IDCANCEL,106,136,50,14 -END + DEFPUSHBUTTON "&Ok",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Storno",IDCANCEL,106,136,50,14 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "O ReactOS Prùzkumníku" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Prùzkumník",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -287,13 +326,13 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TITLE "ReactOS prùzkumník" + IDS_TITLE "ReactOS Prùzkumník" IDS_START "Start" IDS_LOGOFF "Odhlásit se..." IDS_SHUTDOWN "Vypnout..." IDS_LAUNCH "Spustit..." IDS_START_HELP "Pomoc" - IDS_SEARCH_FILES "Hledat..." + IDS_SEARCH_FILES "Hledat" IDS_DOCUMENTS "Dokumenty" IDS_FAVORITES "Oblíbené" IDS_PROGRAMS "Programy" @@ -301,7 +340,7 @@ IDS_EXPLORE "Prozkoumat" IDS_EMPTY "(Prázdné)" IDS_RECENT "Nedávné dokumenty" - IDS_ADMIN "Administrace" + IDS_ADMIN "Systémové nástroje" END STRINGTABLE DISCARDABLE @@ -319,25 +358,25 @@ IDS_NOTIFY_AUTOHIDE "skrývat automaticky" IDS_SHOW_HIDDEN_ICONS "Zobrazit skryté ikony" IDS_HIDE_ICONS "Skrýt ikony" - IDS_TERMINATE "Ukonèit ReactOS prùzkumník" + IDS_TERMINATE "Ukonèit ReactOS Prùzkumníka" END STRINGTABLE DISCARDABLE BEGIN - IDS_NETWORK "Sí" + IDS_NETWORK "Sí" IDS_CONNECTIONS "Síové spojení" IDS_DRIVES "Disky" - IDS_SEARCH_COMPUTER "Hledat..." + IDS_SEARCH_COMPUTER "Hledat poèítaè" IDS_SETTINGS_MENU "Nastavení" IDS_CONTROL_PANEL "Ovládací panel" IDS_PRINTERS "Tiskárny" IDS_BROWSE "Prohlíet soubory" - IDS_SEARCH_PRG "Search Program..." + IDS_SEARCH_PRG "Hledat programy" IDS_ALL_USERS "Vichni uivatelé\\" IDS_SEARCH "Hledat" - IDS_ABOUT_EXPLORER "&O prùzkumníku..." + IDS_ABOUT_EXPLORER "&O Prùzkumníku" IDS_LAUNCH_MANY_PROGRAMS - "Spustili jste více ne jeden program.\nJste si jisti, e je chcete spustit vechny?" + "Bylo vybráno více programù.\nPøejete si je spustit vechny?" IDS_DESKTOPBAR_SETTINGS "Nastavení plochy" IDS_DESKTOP "Plocha" IDS_TASKBAR "Panel úloh" @@ -347,47 +386,6 @@ ///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""resource.h""\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// - - #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -399,3 +397,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED +

1 0

[dreimer] 27629: Fix Translation.
by dreimer＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: dreimer Date: Fri Jul 13 17:43:02 2007 New Revision: 27629 URL: http://svn.reactos.org/svn/reactos?rev=27629&view=rev Log: Fix Translation. Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Fri Jul 13 17:43:02 2007 @@ -37,7 +37,7 @@ IDS_SOL_NAME "Solitär" IDS_SOL_ABOUT "Solitär von J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Laufendes Spiel beenden?" - IDS_SOL_WIN "Congratulations, you win!!" + IDS_SOL_WIN "Glückwunsch, Sie haben Gewonnen!" END

1 0

[greatlrd] 27628: patch from Preston Pigglessworth email : tykef at atlas dot cz --------------------------------------------------------------- update the translations for CZ See issue #1958 for more details.
by greatlrd＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: greatlrd Date: Fri Jul 13 17:38:26 2007 New Revision: 27628 URL: http://svn.reactos.org/svn/reactos?rev=27628&view=rev Log: patch from Preston Pigglessworth email : tykef at atlas dot cz --------------------------------------------------------------- update the translations for CZ See issue #1958 for more details. Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc Fri Jul 13 17:38:26 2007 @@ -19,29 +19,30 @@ CBS_SORT | WS_VSCROLL | WS_TABSTOP END + IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Screensaver" +CAPTION "Spoøiè obrazovky" FONT 8, "MS Shell Dlg", 0, 0 BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + GROUPBOX "&Spoøiè obrazovky",IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Se&ttings",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&Wait",IDC_WAITTEXT, 14, 125, 16, 9 + PUSHBUTTON "&Nastavení",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "Ná&hled",IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "È&ekat",IDC_WAITTEXT, 14, 125, 18, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 - CONTROL "Ask for &password on resume.",IDC_SCREENS_USEPASSCHK,"button", + LTEXT "minut", IDC_MINTEXT, 70, 125, 26, 9 + CONTROL "Chránit &heslem.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 - GROUPBOX "&Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 - LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + GROUPBOX "Napájení monitoru", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "Pro nastavení napájení Vaeho monitoru, kliknìte na Napájení.", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "Na&pájení...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -51,46 +52,46 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + LTEXT "Poloka:", IDC_STATIC, 7, 159, 26, 9 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "Upøesnit", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Advanced Appearance" +CAPTION "Upøesnit vzhled" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Element:", 8, 5, 160, 50, 9 + LTEXT "Poloka:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + LTEXT "&Velikost:", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 - LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + LTEXT "&1. barva:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + LTEXT "&2. barva:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + LTEXT "Písmo:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + LTEXT "Velikost:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL - LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 + LTEXT "Barva:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -99,13 +100,13 @@ CAPTION "Nastavení" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Displej:",1820,3,100,30,8 + LTEXT "&Obrazovka:",1820,3,100,38,8 LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Velikost obrazovky",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 30,130,58,17 - LTEXT "Ménì",1815,9,130,15,8,NOT WS_GROUP - LTEXT "Více",1816,93,130,21,8,NOT WS_GROUP + LTEXT "Mení",1815,9,130,18,8,NOT WS_GROUP + LTEXT "Vìtí",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Poèet barev",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | @@ -115,20 +116,19 @@ PUSHBUTTON "R&ozíøené nastavení...",IDC_SETTINGS_ADVANCED,306,165,56,14 END - IDR_PREVIEW_MENU MENU BEGIN - MENUITEM "Normal", ID_MENU_NORMAL - MENUITEM "Disabled", ID_MENU_DISABLED - MENUITEM "Selected", ID_MENU_SELECTED + MENUITEM "Normální", ID_MENU_NORMAL + MENUITEM "Nepøístupné", ID_MENU_DISABLED + MENUITEM "Vybráno", ID_MENU_SELECTED END STRINGTABLE BEGIN IDS_CPLNAME "Obrazovka" IDS_CPLDESCRIPTION "Nastavení obrazovky, spoøièe, vzhledu a rozliení." - IDS_NONE "(Nic)" - IDS_CENTER "Vycentrovat" + IDS_NONE "(Není)" + IDS_CENTER "Na støed" IDS_STRETCH "Roztáhnout" IDS_TILE "Dladice" END @@ -137,9 +137,9 @@ BEGIN IDS_COLOR_4BIT "16 barev" IDS_COLOR_8BIT "256 barev" - IDS_COLOR_16BIT "High Color (16 Bit)" - IDS_COLOR_24BIT "True Color (24 Bit)" - IDS_COLOR_32BIT "True Color (32 Bit)" + IDS_COLOR_16BIT "High Color (16 Bitù)" + IDS_COLOR_24BIT "True Color (24 Bitù)" + IDS_COLOR_32BIT "True Color (32 Bitù)" IDS_PIXEL "%lux%lu bodù" END @@ -151,36 +151,36 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_INACTWIN "Inactive Window" - IDS_ACTWIN "Active Window" - IDS_WINTEXT "Window Text" - IDS_MESSBOX "Message Box" - IDS_MESSTEXT "Message Text" + IDS_INACTWIN "Neaktivní okno" + IDS_ACTWIN "Aktivní okno" + IDS_WINTEXT "Text okna" + IDS_MESSBOX "Okno zprávy" + IDS_MESSTEXT "Text zprávy" IDS_BUTTEXT "OK" END STRINGTABLE DISCARDABLE BEGIN - IDS_ELEMENT_1 "Desktop" - IDS_ELEMENT_2 "Caption of inactive windows" - IDS_ELEMENT_3 "Border of inactive windows" - IDS_ELEMENT_4 "Caption of active windows" - IDS_ELEMENT_5 "Border of active windows" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Hilited elements" - IDS_ELEMENT_8 "Windows" - IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objects" - IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" - IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" - IDS_ELEMENT_15 "Dialog" - IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" - IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" - IDS_ELEMENT_21 "Quickinfo" - IDS_ELEMENT_22 "Symbol" + IDS_ELEMENT_1 "Plocha" + IDS_ELEMENT_2 "Neaktivní záhlaví" + IDS_ELEMENT_3 "Okraj neaktivního okna" + IDS_ELEMENT_4 "Aktivní záhlaví" + IDS_ELEMENT_5 "Okraj aktivního okna" + IDS_ELEMENT_6 "Nabídka" + IDS_ELEMENT_7 "Vybraná poloka" + IDS_ELEMENT_8 "Okno" + IDS_ELEMENT_9 "Posuvník" + IDS_ELEMENT_10 "3D objekty" + IDS_ELEMENT_11 "Paleta" + IDS_ELEMENT_12 "Popis ikon" + IDS_ELEMENT_13 "Tlaèítka záhlaví" + IDS_ELEMENT_14 "Nepøístupné poloky" + IDS_ELEMENT_15 "Okno zprávy" + IDS_ELEMENT_16 "Ovládání posuvníku" + IDS_ELEMENT_17 "Pozadí aplikace" + IDS_ELEMENT_18 "Tlaèítka záhlaví (malá)" + IDS_ELEMENT_19 "Rozestup ikon (vodorovnì)" + IDS_ELEMENT_20 "Rozestup ikon (svisle)" + IDS_ELEMENT_21 "Popis tlaèítek" + IDS_ELEMENT_22 "Ikona" END Modified: trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc Fri Jul 13 17:38:26 2007 @@ -28,24 +28,24 @@ CAPTION "Mìna" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE - LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + GROUPBOX "Ukázka", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Kladné:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Záporné:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "&Symbol mìny:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "&Kladná èástka:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "&Záporná èástka:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "&Desetinný oddìlovaè:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "&Poèet desetinných míst:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Skupinový &oddìlovaè:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Seskupování èísli&c:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -62,15 +62,15 @@ COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Oddìlovaè:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Zkratka dopoledne:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + LTEXT "Dopoledne:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Zkratka odpoledne:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + LTEXT "Odpoledne:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Zápis formátu èasu\n\n\ h = hodina m = minuta s = vteøina t = dop. nebo odp.\n\n\ -h = 12-ti hodinový cyklus H = 24-ti godinový cyklus\n\ -hh, mm, ss = poèáteèní nula h, m, s = bez poèáteèní nuly", -1, 13, 133, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP +h = 12-ti hodinový cyklus H = 24-ti hodinový cyklus\n\ +hh, mm, ss = poèáteèní nula h, m, s = bez poèáteèní nuly", -1, 13, 133, 214, 50, WS_CHILD |WS_VISIBLE | WS_GROUP END Modified: trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/cs-C… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc Fri Jul 13 17:38:26 2007 @@ -39,17 +39,17 @@ IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Internet Time" +CAPTION "Èas v Internetu" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + CONTROL "Automaticky synchronizovat èas s èasovým serverem v Internetu", IDC_AUTODAYLIGHT, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Server:", -1, 34, 22, 28, 13 - PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + PUSHBUTTON "Aktualizovat", IDC_UPDATEBUTTON, 187, 22, 49, 14 LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 - LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 + LTEXT "Synchronizace mùe probìhnout pouze v pøípadì, e je poèítaè pøipojen k síti Internet.", -1, 12, 114, 225, 25 END @@ -60,6 +60,6 @@ IDS_TIMEZONETEXT "Aktuální èasové pásmo: %s" IDS_TIMEZONEINVALID "Neplatné" IDS_TIMEZONEUNKNOWN "Neznámé" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" - IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" + IDS_INETTIMESUCSYNC "Èas byl úspìnì synchronizován z %s %s v %s" + IDS_INETTIMENEXTSYNC "Dalí synchronizace: %s v %s" END

1 0

[greatlrd] 27627: patch from Pierre Schweitzer (aka Heis Spiter) heis_spiter at hotmail dor com ------------------------------------------------------------------------------ 1. remove one hard code line. 2. cleanup one rc file See issue #2400 for more details.
by greatlrd＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: greatlrd Date: Fri Jul 13 15:42:20 2007 New Revision: 27627 URL: http://svn.reactos.org/svn/reactos?rev=27627&view=rev Log: patch from Pierre Schweitzer (aka Heis Spiter) heis_spiter at hotmail dor com ------------------------------------------------------------------------------ 1. remove one hard code line. 2. cleanup one rc file See issue #2400 for more details. Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc trunk/reactos/base/applications/games/solitaire/lang/en-US.rc trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc trunk/reactos/base/applications/games/solitaire/resource.h trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Fri Jul 13 15:42:20 2007 @@ -37,6 +37,7 @@ IDS_SOL_NAME "Ïàñèàíñ" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Äà ïðåêðàòÿ ëè òåêóùàòà èãðà?" + IDS_SOL_WIN "Congratulations, you win!!" END Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Fri Jul 13 15:42:20 2007 @@ -37,6 +37,7 @@ IDS_SOL_NAME "Solitär" IDS_SOL_ABOUT "Solitär von J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Laufendes Spiel beenden?" + IDS_SOL_WIN "Congratulations, you win!!" END Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc Fri Jul 13 15:42:20 2007 @@ -37,6 +37,7 @@ IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Fri Jul 13 15:42:20 2007 @@ -37,6 +37,7 @@ IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc Fri Jul 13 15:42:20 2007 @@ -37,6 +37,7 @@ IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire par J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quitter le jeu actuel?" + IDS_SOL_WIN "Félicitations ! Vous avez gagné !" END Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc Fri Jul 13 15:42:20 2007 @@ -38,6 +38,7 @@ IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc Fri Jul 13 15:42:20 2007 @@ -38,6 +38,7 @@ IDS_SOL_NAME "Solitario" IDS_SOL_ABOUT "Solitario by J Brown\n\nCardLib versione 1.0." IDS_SOL_QUIT "Chiudere la partita in corso?" + IDS_SOL_WIN "Congratulations, you win!!" END Modified: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Fri Jul 13 15:42:20 2007 @@ -38,6 +38,7 @@ IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc Fri Jul 13 15:42:20 2007 @@ -36,6 +36,7 @@ IDS_SOL_NAME "Pasjans" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Zakoñczyæ aktualn¹ grê?" + IDS_SOL_WIN "Congratulations, you win!!" END Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc Fri Jul 13 15:42:20 2007 @@ -32,6 +32,7 @@ IDS_SOL_NAME "Ïàñüÿíñ" IDS_SOL_ABOUT "Ïàñüÿíñ îò J Brown\n\nCardLib âåðñèè 1.0." IDS_SOL_QUIT "Çàêîí÷èòü òåêóùóþ èãðó?" + IDS_SOL_WIN "Congratulations, you win!!" END Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Fri Jul 13 15:42:20 2007 @@ -1,86 +1,44 @@ -//Microsoft Developer Studio generated resource script. -// +// Slovak translation by Kario 2007 <kario(a)szm.sk> #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Slovak translation by Kario 2007 <kario(a)szm.sk> - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -#pragma code_page(1250) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // // Dialog // -IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 95 +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Sans Serif" +CAPTION "Options" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Zrui",IDCANCEL,129,24,50,14 + GROUPBOX "Cards", -1, 7, 7, 65, 40 + AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 + + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + + DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Zrui»", IDCANCEL, 101, 97, 50, 14 END ///////////////////////////////////////////////////////////////////////////// // -// DESIGNINFO +// Strings // -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +STRINGTABLE BEGIN - IDD_DIALOG1, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END + IDS_SOL_NAME "Solitaire" + IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." + IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -118,27 +76,3 @@ VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // Slovak resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc Fri Jul 13 15:42:20 2007 @@ -38,6 +38,7 @@ IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Fri Jul 13 15:42:20 2007 @@ -37,6 +37,7 @@ IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Fri Jul 13 15:42:20 2007 @@ -38,6 +38,7 @@ IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END Modified: trunk/reactos/base/applications/games/solitaire/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/resource.h (original) +++ trunk/reactos/base/applications/games/solitaire/resource.h Fri Jul 13 15:42:20 2007 @@ -25,3 +25,4 @@ #define IDS_SOL_NAME 1300 #define IDS_SOL_ABOUT 1301 #define IDS_SOL_QUIT 1302 +#define IDS_SOL_WIN 1303 Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solgame.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solgame.cpp Fri Jul 13 15:42:20 2007 @@ -13,6 +13,8 @@ #define TRACE(s) printf("%s(%i): %s",__FILE__,__LINE__,s) #endif +extern TCHAR MsgWin[128]; + CardStack activepile; bool fGameStarted = false; @@ -240,7 +242,7 @@ if(fGameOver) { - MessageBox(SolWnd, _T("Congratulations, you win!!"), szAppName, MB_OK | MB_ICONINFORMATION); + MessageBox(SolWnd, MsgWin, szAppName, MB_OK | MB_ICONINFORMATION); for(int i = 0; i < 4; i++) { Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Fri Jul 13 15:42:20 2007 @@ -18,6 +18,7 @@ TCHAR szAppName[128]; TCHAR MsgQuit[128]; TCHAR MsgAbout[128]; +TCHAR MsgWin[128]; INT nOptions = 8; CardWindow SolWnd; @@ -53,9 +54,10 @@ // Load application title LoadString(hInst, IDS_SOL_NAME, szAppName, sizeof(szAppName) / sizeof(szAppName[0])); - // Load MsgBox() text here to avoid loading it many times later + // Load MsgBox() texts here to avoid loading them many times later LoadString(hInst, IDS_SOL_ABOUT, MsgAbout, sizeof(MsgAbout) / sizeof(MsgAbout[0])); LoadString(hInst, IDS_SOL_QUIT, MsgQuit, sizeof(MsgQuit) / sizeof(MsgQuit[0])); + LoadString(hInst, IDS_SOL_WIN, MsgWin, sizeof(MsgWin) / sizeof(MsgWin[0])); //Window class for the main application parent window wndclass.cbSize = sizeof(wndclass); @@ -266,3 +268,4 @@ return DefWindowProc (hwnd, iMsg, wParam, lParam); } +

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
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 July 2007