Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 21553: Add library to deal with recycle bin. It is aimed to be compatible with Windows 2000/XP/2003 (at least) on FAT or NTFS volumes.
by hpoussin＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: hpoussin Date: Tue Apr 11 23:51:55 2006 New Revision: 21553 URL: http://svn.reactos.ru/svn/reactos?rev=21553&view=rev Log: Add library to deal with recycle bin. It is aimed to be compatible with Windows 2000/XP/2003 (at least) on FAT or NTFS volumes. Added: trunk/reactos/lib/recyclebin/ trunk/reactos/lib/recyclebin/openclose.c trunk/reactos/lib/recyclebin/readme.txt trunk/reactos/lib/recyclebin/recyclebin.c trunk/reactos/lib/recyclebin/recyclebin.h trunk/reactos/lib/recyclebin/recyclebin.rbuild trunk/reactos/lib/recyclebin/recyclebin_private.h trunk/reactos/lib/recyclebin/recyclebin_v5.c trunk/reactos/lib/recyclebin/recyclebin_v5.h trunk/reactos/lib/recyclebin/refcount.c Modified: trunk/reactos/lib/lib.rbuild Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=21553&r1… ============================================================================== --- trunk/reactos/lib/lib.rbuild (original) +++ trunk/reactos/lib/lib.rbuild Tue Apr 11 23:51:55 2006 @@ -4,12 +4,11 @@ <directory name="3rdparty"> <xi:include href="3rdparty/3rdparty.rbuild" /> </directory> +<directory name="crt"> + <xi:include href="crt/crt.rbuild" /> +</directory> <directory name="drivers"> <xi:include href="drivers/directory.rbuild" /> -</directory> - -<directory name="crt"> - <xi:include href="crt/crt.rbuild" /> </directory> <directory name="dxguid"> <xi:include href="dxguid/dxguid.rbuild" /> @@ -38,6 +37,9 @@ <directory name="pseh"> <xi:include href="pseh/pseh.rbuild" /> </directory> +<directory name="recyclebin"> + <xi:include href="recyclebin/recyclebin.rbuild" /> +</directory> <directory name="rossym"> <xi:include href="rossym/rossym.rbuild" /> </directory> Added: trunk/reactos/lib/recyclebin/openclose.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/openclose.c?… ============================================================================== --- trunk/reactos/lib/recyclebin/openclose.c (added) +++ trunk/reactos/lib/recyclebin/openclose.c Tue Apr 11 23:51:55 2006 @@ -1,0 +1,315 @@ +/* + * PROJECT: Recycle bin management + * LICENSE: GPL v2 - See COPYING in the top level directory + * FILE: lib/recyclebin/openclose.c + * PURPOSE: Open/close recycle bins + * PROGRAMMERS: Copyright 2006 Hervé Poussineau (hpoussin(a)reactos.org) + */ + +#include "recyclebin_private.h" + +BOOL +IntCheckDeletedFileHandle( + IN HANDLE hDeletedFile) +{ + if (hDeletedFile == NULL || hDeletedFile == INVALID_HANDLE_VALUE) + return FALSE; + + if (((PDELETED_FILE_HANDLE)hDeletedFile)->magic != DELETEDFILE_MAGIC) + return FALSE; + + return TRUE; +} + +static BOOL +IntCloseRecycleBinHandle( + IN PREFCOUNT_DATA pData) +{ + PRECYCLE_BIN bin; + + bin = CONTAINING_RECORD(pData, RECYCLE_BIN, refCount); + if (!CloseHandle(bin->hInfo)) + return FALSE; + + RemoveEntryList(&bin->ListEntry); + HeapFree(GetProcessHeap(), 0, bin); + return TRUE; +} + +static BOOL +IntCreateEmptyRecycleBin( + IN PRECYCLE_BIN bin, + IN PSID OwnerSid OPTIONAL) +{ + LPWSTR BufferName = NULL; + LPWSTR Separator; /* Pointer into BufferName buffer */ + LPWSTR FileName; /* Pointer into BufferName buffer */ + LPCSTR DesktopIniContents = "[.ShellClassInfo]\r\nCLSID={645FF040-5081-101B-9F08-00AA002F954E}\r\n"; + DWORD Info2Contents[] = { 5, 0, 0, 0x320, 0 }; + SIZE_T BytesToWrite, BytesWritten, Needed; + HANDLE hFile = INVALID_HANDLE_VALUE; + BOOL ret = FALSE; + + Needed = (wcslen(bin->Folder) + 1 + max(wcslen(RECYCLE_BIN_FILE_NAME), wcslen(L"desktop.ini")) + 1) * sizeof(WCHAR); + BufferName = HeapAlloc(GetProcessHeap(), 0, Needed); + if (!BufferName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + wcscpy(BufferName, bin->Folder); + Separator = wcsstr(&BufferName[3], L"\\"); + if (Separator) + *Separator = UNICODE_NULL; + ret = CreateDirectoryW(BufferName, NULL); + if (!ret && GetLastError() != ERROR_ALREADY_EXISTS) + goto cleanup; + SetFileAttributesW(BufferName, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN); + if (Separator) + { + *Separator = L'\\'; + ret = CreateDirectoryW(BufferName, NULL); + if (!ret && GetLastError() != ERROR_ALREADY_EXISTS) + goto cleanup; + } + + if (OwnerSid) + { + //DWORD rc; + + /* Add ACL to allow only user/SYSTEM to open it */ + /* FIXME: rc = SetNamedSecurityInfo( + BufferName, + SE_FILE_OBJECT, + ???, + OwnerSid, + NULL, + ???, + ???); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + */ + } + + wcscat(BufferName, L"\\"); + FileName = &BufferName[wcslen(BufferName)]; + + /* Create desktop.ini */ + wcscpy(FileName, L"desktop.ini"); + hFile = CreateFileW(BufferName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN, NULL); + if (hFile == INVALID_HANDLE_VALUE) + goto cleanup; + BytesToWrite = strlen(DesktopIniContents); + ret = WriteFile(hFile, DesktopIniContents, (DWORD)BytesToWrite, &BytesWritten, NULL); + if (!ret) + goto cleanup; + if (BytesWritten != BytesToWrite) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + CloseHandle(hFile); + hFile = INVALID_HANDLE_VALUE; + + /* Create empty INFO2 file */ + wcscpy(FileName, RECYCLE_BIN_FILE_NAME); + hFile = CreateFileW(BufferName, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_HIDDEN, NULL); + if (hFile == INVALID_HANDLE_VALUE) + goto cleanup; + BytesToWrite = sizeof(Info2Contents); + ret = WriteFile(hFile, Info2Contents, (DWORD)BytesToWrite, &BytesWritten, NULL); + if (!ret) + goto cleanup; + if (BytesWritten != BytesToWrite) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + bin->hInfo = hFile; + ret = TRUE; + +cleanup: + HeapFree(GetProcessHeap(), 0, BufferName); + if (!ret) + { + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle(hFile); + } + return ret; +} + +PRECYCLE_BIN +IntReferenceRecycleBin( + IN WCHAR driveLetter) +{ + PLIST_ENTRY ListEntry; + PRECYCLE_BIN bin = NULL, ret = NULL; + WCHAR RootPath[4]; + DWORD FileSystemFlags; + LPCWSTR RecycleBinDirectory; + HANDLE tokenHandle = INVALID_HANDLE_VALUE; + PTOKEN_USER TokenUserInfo = NULL; + LPWSTR StringSid = NULL; + SIZE_T Needed, DirectoryLength; + INFO2_HEADER Header; + BOOL AlreadyCreated = FALSE; + DWORD bytesRead; + + static LIST_ENTRY ListHead; + static BOOL ListInitialized = FALSE; + + if (!ListInitialized) + { + InitializeListHead(&ListHead); + ListInitialized = TRUE; + } + + /* Search if the recycle bin has already been opened */ + driveLetter = toupper(driveLetter); + ListEntry = ListHead.Flink; + while (ListEntry != &ListHead) + { + bin = CONTAINING_RECORD(ListEntry, RECYCLE_BIN, ListEntry); + if (bin->Folder[0] == driveLetter) + { + ReferenceHandle(&bin->refCount); + return bin; + } + ListEntry = ListEntry->Flink; + } + bin = NULL; + + /* We need to create a new recycle bin */ + + /* Get information about file system */ + wsprintfW(RootPath, L"%c:\\", driveLetter); + if (!GetVolumeInformationW( + RootPath, + NULL, + 0, + NULL, + NULL, + &FileSystemFlags, + NULL, + 0)) + { + goto cleanup; + } + if (!(FileSystemFlags & FILE_PERSISTENT_ACLS)) + RecycleBinDirectory = RECYCLE_BIN_DIRECTORY_WITHOUT_ACL; + else + { + RecycleBinDirectory = RECYCLE_BIN_DIRECTORY_WITH_ACL; + + /* Get user SID */ + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &tokenHandle)) + goto cleanup; + if (GetTokenInformation(tokenHandle, TokenUser, NULL, 0, &Needed)) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + goto cleanup; + TokenUserInfo = HeapAlloc(GetProcessHeap(), 0, Needed); + if (!TokenUserInfo) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + if (!GetTokenInformation(tokenHandle, TokenUser, TokenUserInfo, (DWORD)Needed, &Needed)) + goto cleanup; + if (!ConvertSidToStringSidW(TokenUserInfo->User.Sid, &StringSid)) + goto cleanup; + } + + /* Create RECYCLEBIN structure */ +openfile: + DirectoryLength = 3 + wcslen(RecycleBinDirectory) + 1; + if (StringSid) + DirectoryLength += wcslen(StringSid) + 1; + Needed = FIELD_OFFSET(RECYCLE_BIN, Folder) + (2 * DirectoryLength + 2 + wcslen(RECYCLE_BIN_FILE_NAME))* sizeof(WCHAR); + bin = HeapAlloc(GetProcessHeap(), 0, Needed); + if (!bin) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + memset(bin, 0, Needed); + InitializeHandle(&bin->refCount, IntCloseRecycleBinHandle); + bin->magic = RECYCLEBIN_MAGIC; + bin->hInfo = INVALID_HANDLE_VALUE; + bin->InfoFile = &bin->Folder[DirectoryLength]; + bin->Folder[0] = driveLetter; + bin->Folder[1] = '\0'; + wcscat(bin->Folder, L":\\"); + wcscat(bin->Folder, RecycleBinDirectory); + if (StringSid) + { + wcscat(bin->Folder, L"\\"); + wcscat(bin->Folder, StringSid); + } + wcscpy(bin->InfoFile, bin->Folder); + wcscat(bin->InfoFile, L"\\"); + wcscat(bin->InfoFile, RECYCLE_BIN_FILE_NAME); + InsertTailList(&ListHead, &bin->ListEntry); + + /* Open info file */ + bin->hInfo = CreateFileW(bin->InfoFile, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + if (bin->hInfo == INVALID_HANDLE_VALUE) + { + if (GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_FILE_NOT_FOUND) + { + if (!IntCreateEmptyRecycleBin(bin, TokenUserInfo ? TokenUserInfo->User.Sid : NULL)) + goto cleanup; + AlreadyCreated = TRUE; + } + } + if (bin->hInfo == INVALID_HANDLE_VALUE) + goto cleanup; + + if (SetFilePointer(bin->hInfo, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + goto cleanup; + if (!ReadFile(bin->hInfo, &Header, sizeof(INFO2_HEADER), &bytesRead, NULL)) + goto cleanup; + if (bytesRead != sizeof(INFO2_HEADER) && !AlreadyCreated) + { + /* Create a new file */ + if (!DereferenceHandle(&bin->refCount)) + goto cleanup; + if (!DeleteFileW(bin->InfoFile)) + goto cleanup; + goto openfile; + } + switch (Header.dwVersion) + { + case 5: + InitializeCallbacks5(&bin->Callbacks); + break; + default: + /* Unknown recycle bin version */ + SetLastError(ERROR_NOT_SUPPORTED); + goto cleanup; + } + + ret = bin; + +cleanup: + if (tokenHandle != INVALID_HANDLE_VALUE) + CloseHandle(tokenHandle); + HeapFree(GetProcessHeap(), 0, TokenUserInfo); + if (StringSid) + LocalFree(StringSid); + if (!ret) + { + if (bin && bin->hInfo != INVALID_HANDLE_VALUE) + DereferenceHandle(&bin->refCount); + HeapFree(GetProcessHeap(), 0, bin); + } + return ret; +} Added: trunk/reactos/lib/recyclebin/readme.txt URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/readme.txt?r… ============================================================================== --- trunk/reactos/lib/recyclebin/readme.txt (added) +++ trunk/reactos/lib/recyclebin/readme.txt Tue Apr 11 23:51:55 2006 @@ -1,0 +1,14 @@ +This library deals with Recycle bin. +It is aimed to be compatible with Windows 2000/XP/2003 (at least) on FAT or NTFS volumes. + + +TODO +- Empty a recycle bin containing directories (v5) +- Set security on recycle bin folder +- Delete files > 4Gb + +3 levels +- 1: recyclebin.c: Public interface +- 2a: openclose.c: Open/close recycle bins +- 2b: refcount.c: Do reference counting on objects +- 3: recyclebin_v5.c: Deals with recycle bins of Windows 2000/XP/2003 Added: trunk/reactos/lib/recyclebin/recyclebin.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.c… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin.c (added) +++ trunk/reactos/lib/recyclebin/recyclebin.c Tue Apr 11 23:51:55 2006 @@ -1,0 +1,319 @@ +/* + * PROJECT: Recycle bin management + * LICENSE: GPL v2 - See COPYING in the top level directory + * FILE: lib/recyclebin/openclose.c + * PURPOSE: Public interface + * PROGRAMMERS: Copyright 2006 Hervé Poussineau (hpoussin(a)reactos.org) + */ + +#include "recyclebin_private.h" + +typedef struct _ENUMERATE_RECYCLE_BIN_CONTEXT +{ + PRECYCLE_BIN bin; + PENUMERATE_RECYCLEBIN_CALLBACK pFnCallback; + PVOID Context; +} ENUMERATE_RECYCLE_BIN_CONTEXT, *PENUMERATE_RECYCLE_BIN_CONTEXT; + +BOOL WINAPI +CloseRecycleBinHandle( + IN HANDLE hDeletedFile) +{ + BOOL ret = FALSE; + + if (!IntCheckDeletedFileHandle(hDeletedFile)) + SetLastError(ERROR_INVALID_HANDLE); + else + { + PDELETED_FILE_HANDLE file = (PDELETED_FILE_HANDLE)hDeletedFile; + ret = DereferenceHandle(&file->refCount); + } + + return ret; +} + +BOOL WINAPI +DeleteFileToRecycleBinA( + IN LPCSTR FileName) +{ + int len; + LPWSTR FileNameW = NULL; + BOOL ret = FALSE; + + len = MultiByteToWideChar(CP_ACP, 0, FileName, -1, NULL, 0); + if (len == 0) + goto cleanup; + FileNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!FileNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + if (MultiByteToWideChar(CP_ACP, 0, FileName, -1, FileNameW, len) == 0) + goto cleanup; + + ret = DeleteFileToRecycleBinW(FileNameW); + +cleanup: + HeapFree(GetProcessHeap(), 0, FileNameW); + return ret; +} + +BOOL WINAPI +DeleteFileToRecycleBinW( + IN LPCWSTR FileName) +{ + LPWSTR FullFileName = NULL; + DWORD dwBufferLength = 0; + LPWSTR lpFilePart; + DWORD len; + PRECYCLE_BIN bin = NULL; + BOOL ret = FALSE; + + /* Get full file name */ + while (TRUE) + { + len = GetFullPathNameW(FileName, dwBufferLength, FullFileName, &lpFilePart); + if (len == 0) + goto cleanup; + else if (len < dwBufferLength) + break; + HeapFree(GetProcessHeap(), 0, FullFileName); + dwBufferLength = len; + FullFileName = HeapAlloc(GetProcessHeap(), 0, dwBufferLength * sizeof(WCHAR)); + if (!FullFileName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + } + + if (!lpFilePart || dwBufferLength < 2 || FullFileName[1] != ':') + { + /* Only a directory name, or not a local file */ + SetLastError(ERROR_INVALID_NAME); + } + + /* Open recycle bin */ + bin = IntReferenceRecycleBin(FullFileName[0]); + if (!bin) + goto cleanup; + + if (bin->Callbacks.DeleteFile) + ret = bin->Callbacks.DeleteFile(bin, FullFileName, lpFilePart); + else + SetLastError(ERROR_NOT_SUPPORTED); + +cleanup: + HeapFree(GetProcessHeap(), 0, FullFileName); + if (bin) + DereferenceHandle(&bin->refCount); + return ret; +} + +BOOL WINAPI +EmptyRecycleBinA( + IN CHAR driveLetter) +{ + return EmptyRecycleBinW((WCHAR)driveLetter); +} + +BOOL WINAPI +EmptyRecycleBinW( + IN WCHAR driveLetter) +{ + PRECYCLE_BIN bin = NULL; + BOOL ret = FALSE; + + /* Open recycle bin */ + bin = IntReferenceRecycleBin(driveLetter); + if (!bin) + goto cleanup; + + if (bin->Callbacks.EmptyRecycleBin) + ret = bin->Callbacks.EmptyRecycleBin(&bin); + else + SetLastError(ERROR_NOT_SUPPORTED); + +cleanup: + if (bin) + DereferenceHandle(&bin->refCount); + return ret; +} + +BOOL WINAPI +EnumerateRecycleBinA( + IN CHAR driveLetter, + IN PENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, + IN PVOID Context) +{ + return EnumerateRecycleBinW((WCHAR)driveLetter, pFnCallback, Context); +} + +static BOOL +IntCloseDeletedFileHandle( + IN PREFCOUNT_DATA pData) +{ + PDELETED_FILE_HANDLE file; + + file = CONTAINING_RECORD(pData, DELETED_FILE_HANDLE, refCount); + if (!DereferenceHandle(&file->bin->refCount)) + return FALSE; + + file->magic = 0; + HeapFree(GetProcessHeap(), 0, file); + return TRUE; +} + +static BOOL +IntEnumerateRecycleBinCallback( + IN PVOID Context, + IN HANDLE hDeletedFile) +{ + PENUMERATE_RECYCLE_BIN_CONTEXT CallbackContext = (PENUMERATE_RECYCLE_BIN_CONTEXT)Context; + PDELETED_FILE_HANDLE DeletedFileHandle = NULL; + BOOL ret = FALSE; + + DeletedFileHandle = HeapAlloc(GetProcessHeap(), 0, sizeof(DELETED_FILE_HANDLE)); + if (!DeletedFileHandle) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + ReferenceHandle(&CallbackContext->bin->refCount); + InitializeHandle(&DeletedFileHandle->refCount, IntCloseDeletedFileHandle); + DeletedFileHandle->magic = DELETEDFILE_MAGIC; + DeletedFileHandle->bin = CallbackContext->bin; + DeletedFileHandle->hDeletedFile = hDeletedFile; + + ret = CallbackContext->pFnCallback(CallbackContext->Context, DeletedFileHandle); + +cleanup: + if (!ret) + { + if (DeletedFileHandle) + DereferenceHandle(&DeletedFileHandle->refCount); + } + return ret; +} + +BOOL WINAPI +EnumerateRecycleBinW( + IN WCHAR driveLetter, + IN PENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, + IN PVOID Context) +{ + PRECYCLE_BIN bin = NULL; + BOOL ret = FALSE; + + /* Open recycle bin */ + bin = IntReferenceRecycleBin(driveLetter); + if (!bin) + goto cleanup; + + if (bin->Callbacks.EnumerateFiles) + { + ENUMERATE_RECYCLE_BIN_CONTEXT CallbackContext; + + CallbackContext.bin = bin; + CallbackContext.pFnCallback = pFnCallback; + CallbackContext.Context = Context; + + ret = bin->Callbacks.EnumerateFiles(bin, IntEnumerateRecycleBinCallback, &CallbackContext); + } + else + SetLastError(ERROR_NOT_SUPPORTED); + +cleanup: + if (bin) + DereferenceHandle(&bin->refCount); + return ret; +} + +BOOL WINAPI +GetDeletedFileDetailsA( + IN HANDLE hDeletedFile, + IN DWORD BufferSize, + IN OUT PDELETED_FILE_DETAILS_A FileDetails, + OUT LPDWORD RequiredSize OPTIONAL) +{ + PDELETED_FILE_DETAILS_W FileDetailsW = NULL; + DWORD BufferSizeW = 0; + DWORD RequiredSizeW; + BOOL ret = FALSE; + + if (BufferSize >= FIELD_OFFSET(DELETED_FILE_DETAILS_A, FileName)) + { + BufferSizeW = FIELD_OFFSET(DELETED_FILE_DETAILS_W, FileName) + + (BufferSize - FIELD_OFFSET(DELETED_FILE_DETAILS_A, FileName)) * sizeof(WCHAR); + } + if (FileDetails && BufferSizeW) + { + FileDetailsW = HeapAlloc(GetProcessHeap(), 0, BufferSizeW); + if (!FileDetailsW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + } + + ret = GetDeletedFileDetailsW(hDeletedFile, BufferSizeW, FileDetailsW, &RequiredSizeW); + if (!ret) + goto cleanup; + + if (FileDetails) + { + memcpy(FileDetails, FileDetailsW, FIELD_OFFSET(DELETED_FILE_DETAILS_A, FileName)); + if (0 == WideCharToMultiByte(CP_ACP, 0, FileDetailsW->FileName, -1, FileDetails->FileName, BufferSize - FIELD_OFFSET(DELETED_FILE_DETAILS_A, FileName), NULL, NULL)) + goto cleanup; + } + ret = TRUE; + +cleanup: + HeapFree(GetProcessHeap(), 0, FileDetailsW); + return ret; +} + +BOOL WINAPI +GetDeletedFileDetailsW( + IN HANDLE hDeletedFile, + IN DWORD BufferSize, + IN OUT PDELETED_FILE_DETAILS_W FileDetails, + OUT LPDWORD RequiredSize OPTIONAL) +{ + BOOL ret = FALSE; + + if (!IntCheckDeletedFileHandle(hDeletedFile)) + SetLastError(ERROR_INVALID_HANDLE); + else + { + PDELETED_FILE_HANDLE DeletedFile = (PDELETED_FILE_HANDLE)hDeletedFile; + if (DeletedFile->bin->Callbacks.GetDetails) + ret = DeletedFile->bin->Callbacks.GetDetails(DeletedFile->bin, DeletedFile->hDeletedFile, BufferSize, FileDetails, RequiredSize); + else + SetLastError(ERROR_NOT_SUPPORTED); + } + + return ret; +} + +BOOL WINAPI +RestoreFile( + IN HANDLE hDeletedFile) +{ + BOOL ret = FALSE; + + if (!IntCheckDeletedFileHandle(hDeletedFile)) + SetLastError(ERROR_INVALID_HANDLE); + else + { + PDELETED_FILE_HANDLE DeletedFile = (PDELETED_FILE_HANDLE)hDeletedFile; + if (DeletedFile->bin->Callbacks.RestoreFile) + ret = DeletedFile->bin->Callbacks.RestoreFile(DeletedFile->bin, DeletedFile->hDeletedFile); + else + SetLastError(ERROR_NOT_SUPPORTED); + } + + return ret; +} Added: trunk/reactos/lib/recyclebin/recyclebin.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.h… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin.h (added) +++ trunk/reactos/lib/recyclebin/recyclebin.h Tue Apr 11 23:51:55 2006 @@ -1,0 +1,109 @@ +#ifndef __RECYCLEBIN_H +#define __RECYCLEBIN_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include <windows.h> +#define ANY_SIZE 1 + +typedef struct _DELETED_FILE_DETAILS_A +{ + FILETIME LastModification; + FILETIME DeletionTime; + LARGE_INTEGER FileSize; + LARGE_INTEGER PhysicalFileSize; + DWORD Attributes; + CHAR FileName[ANY_SIZE]; +} DELETED_FILE_DETAILS_A, *PDELETED_FILE_DETAILS_A; +typedef struct _DELETED_FILE_DETAILS_W +{ + FILETIME LastModification; + FILETIME DeletionTime; + LARGE_INTEGER FileSize; + LARGE_INTEGER PhysicalFileSize; + DWORD Attributes; + WCHAR FileName[ANY_SIZE]; +} DELETED_FILE_DETAILS_W, *PDELETED_FILE_DETAILS_W; +#ifdef UNICODE +#define DELETED_FILE_DETAILS DELETED_FILE_DETAILS_W +#define PDELETED_FILE_DETAILS PDELETED_FILE_DETAILS_W +#else +#define DELETED_FILE_DETAILS DELETED_FILE_DETAILS_A +#define PDELETED_FILE_DETAILS PDELETED_FILE_DETAILS_A +#endif + +typedef BOOL (WINAPI *PENUMERATE_RECYCLEBIN_CALLBACK)(IN PVOID Context, IN HANDLE hDeletedFile); + +BOOL WINAPI +CloseRecycleBinHandle( + IN HANDLE hDeletedFile); + +BOOL WINAPI +DeleteFileToRecycleBinA( + IN LPCSTR FileName); +BOOL WINAPI +DeleteFileToRecycleBinW( + IN LPCWSTR FileName); +#ifdef UNICODE +#define DeleteFileToRecycleBin DeleteFileToRecycleBinW +#else +#define DeleteFileToRecycleBin DeleteFileToRecycleBinA +#endif + +BOOL WINAPI +EmptyRecycleBinA( + IN CHAR driveLetter); +BOOL WINAPI +EmptyRecycleBinW( + IN WCHAR driveLetter); +#ifdef UNICODE +#define EmptyRecycleBin EmptyRecycleBinW +#else +#define EmptyRecycleBin EmptyRecycleBinA +#endif + +BOOL WINAPI +EnumerateRecycleBinA( + IN CHAR driveLetter, + IN PENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, + IN PVOID Context); +BOOL WINAPI +EnumerateRecycleBinW( + IN WCHAR driveLetter, + IN PENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, + IN PVOID Context); +#ifdef UNICODE +#define EnumerateRecycleBin EnumerateRecycleBinW +#else +#define EnumerateRecycleBin EnumerateRecycleBinA +#endif + +BOOL WINAPI +GetDeletedFileDetailsA( + IN HANDLE hDeletedFile, + IN DWORD BufferSize, + IN OUT PDELETED_FILE_DETAILS_A FileDetails, + OUT LPDWORD RequiredSize OPTIONAL); +BOOL WINAPI +GetDeletedFileDetailsW( + IN HANDLE hDeletedFile, + IN DWORD BufferSize, + IN OUT PDELETED_FILE_DETAILS_W FileDetails, + OUT LPDWORD RequiredSize OPTIONAL); +#ifdef UNICODE +#define GetDeletedFileDetails GetDeletedFileDetailsW +#else +#define GetDeletedFileDetails GetDeletedFileDetailsA +#endif + +BOOL WINAPI +RestoreFile( + IN HANDLE hDeletedFile); + +#ifdef __cplusplus +} +#endif + +#endif /* __RECYCLEBIN_H */ Added: trunk/reactos/lib/recyclebin/recyclebin.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.r… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin.rbuild (added) +++ trunk/reactos/lib/recyclebin/recyclebin.rbuild Tue Apr 11 23:51:55 2006 @@ -1,0 +1,7 @@ +<module name="recyclebin" type="staticlibrary"> + <define name="__USE_W32API" /> + <file>openclose.c</file> + <file>recyclebin.c</file> + <file>recyclebin_v5.c</file> + <file>refcount.c</file> +</module> Added: trunk/reactos/lib/recyclebin/recyclebin_private.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_p… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_private.h (added) +++ trunk/reactos/lib/recyclebin/recyclebin_private.h Tue Apr 11 23:51:55 2006 @@ -1,0 +1,116 @@ +#include "recyclebin.h" +#include "sddl.h" + +/* Defines */ +#define RECYCLEBIN_MAGIC 0x6e694252 +#define DELETEDFILE_MAGIC 0x6e694253 + +#define RECYCLE_BIN_DIRECTORY_WITH_ACL L"RECYCLER" +#define RECYCLE_BIN_DIRECTORY_WITHOUT_ACL L"RECYCLED" +#define RECYCLE_BIN_FILE_NAME L"INFO2" + +#define ROUND_UP(N, S) ((( (N) + (S) - 1) / (S) ) * (S) ) + +/* List manipulation */ +#define InitializeListHead(le) (void)((le)->Flink = (le)->Blink = (le)) +#define InsertTailList(le,e) do { PLIST_ENTRY b = (le)->Blink; (e)->Flink = (le); (e)->Blink = b; b->Flink = (e); (le)->Blink = (e); } while (0) +#define RemoveEntryList(Entry) { PLIST_ENTRY _EX_Blink, _EX_Flink; _EX_Flink = (Entry)->Flink; _EX_Blink = (Entry)->Blink; _EX_Blink->Flink = _EX_Flink; _EX_Flink->Blink = _EX_Blink; } + +/* Typedefs */ +struct _RECYCLE_BIN; +typedef struct _RECYCLE_BIN *PRECYCLE_BIN; +struct _REFCOUNT_DATA; +typedef struct _REFCOUNT_DATA *PREFCOUNT_DATA; + +typedef BOOL (*PINT_ENUMERATE_RECYCLEBIN_CALLBACK)(IN PVOID Context, IN HANDLE hDeletedFile); +typedef BOOL (*PDESTROY_DATA) (IN PREFCOUNT_DATA pData); + +typedef BOOL (*PCLOSE_HANDLE) (IN HANDLE hHandle); +typedef BOOL (*PDELETE_FILE) (IN PRECYCLE_BIN bin, IN LPCWSTR FullPath, IN LPCWSTR FileName); +typedef BOOL (*PEMPTY_RECYCLEBIN)(IN PRECYCLE_BIN* bin); +typedef BOOL (*PENUMERATE_FILES) (IN PRECYCLE_BIN bin, IN PINT_ENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, IN PVOID Context); +typedef BOOL (*PGET_DETAILS) (IN PRECYCLE_BIN bin, IN HANDLE hDeletedFile, IN DWORD BufferSize, IN OUT PDELETED_FILE_DETAILS_W FileDetails, OUT LPDWORD RequiredSize OPTIONAL); +typedef BOOL (*PRESTORE_FILE) (IN PRECYCLE_BIN bin, IN HANDLE hDeletedFile); + +typedef struct _RECYCLEBIN_CALLBACKS +{ + PCLOSE_HANDLE CloseHandle; + PDELETE_FILE DeleteFile; + PEMPTY_RECYCLEBIN EmptyRecycleBin; + PENUMERATE_FILES EnumerateFiles; + PGET_DETAILS GetDetails; + PRESTORE_FILE RestoreFile; +} RECYCLEBIN_CALLBACKS, *PRECYCLEBIN_CALLBACKS; + +typedef struct _REFCOUNT_DATA +{ + DWORD ReferenceCount; + PDESTROY_DATA Close; +} REFCOUNT_DATA; + +typedef struct _RECYCLE_BIN +{ + DWORD magic; /* RECYCLEBIN_MAGIC */ + LIST_ENTRY ListEntry; + REFCOUNT_DATA refCount; + HANDLE hInfo; + RECYCLEBIN_CALLBACKS Callbacks; + LPWSTR InfoFile; + WCHAR Folder[ANY_SIZE]; /* [drive]:\[RECYCLE_BIN_DIRECTORY]\{SID} */ +} RECYCLE_BIN; + +typedef struct _DELETED_FILE_HANDLE +{ + DWORD magic; /* DELETEDFILE_MAGIC */ + REFCOUNT_DATA refCount; + PRECYCLE_BIN bin; + HANDLE hDeletedFile; /* specific to recycle bin format */ +} DELETED_FILE_HANDLE, *PDELETED_FILE_HANDLE; + +/* Structures on disk */ + +#include <pshpack1.h> + +typedef struct _INFO2_HEADER +{ + DWORD dwVersion; + DWORD dwNumberOfEntries; + DWORD dwHighestRecordUniqueId; + DWORD dwRecordSize; + DWORD dwTotalLogicalSize; +} INFO2_HEADER, *PINFO2_HEADER; + +#include <poppack.h> + +/* Prototypes */ + +/* openclose.c */ + +BOOL +IntCheckDeletedFileHandle( + IN HANDLE hDeletedFile); + +PRECYCLE_BIN +IntReferenceRecycleBin( + IN WCHAR driveLetter); + +/* recyclebin_v5.c */ + +VOID +InitializeCallbacks5( + IN OUT PRECYCLEBIN_CALLBACKS Callbacks); + +/* refcount.c */ + +BOOL +InitializeHandle( + IN PREFCOUNT_DATA pData, + IN PDESTROY_DATA pFnClose OPTIONAL); + +BOOL +ReferenceHandle( + IN PREFCOUNT_DATA pData); + +BOOL +DereferenceHandle( + IN PREFCOUNT_DATA pData); Added: trunk/reactos/lib/recyclebin/recyclebin_v5.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_v… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.c (added) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.c Tue Apr 11 23:51:55 2006 @@ -1,0 +1,539 @@ +/* + * PROJECT: Recycle bin management + * LICENSE: GPL v2 - See COPYING in the top level directory + * FILE: lib/recyclebin/openclose.c + * PURPOSE: Deals with recycle bins of Windows 2000/XP/2003 + * PROGRAMMERS: Copyright 2006 Hervé Poussineau (hpoussin(a)reactos.org) + */ + +#include "recyclebin_v5.h" + +VOID +InitializeCallbacks5( + IN OUT PRECYCLEBIN_CALLBACKS Callbacks) +{ + Callbacks->CloseHandle = CloseHandle5; + Callbacks->DeleteFile = DeleteFile5; + Callbacks->EmptyRecycleBin = EmptyRecycleBin5; + Callbacks->EnumerateFiles = EnumerateFiles5; + Callbacks->GetDetails = GetDetails5; + Callbacks->RestoreFile = RestoreFile5; +} + +static BOOL +CloseHandle5( + IN HANDLE hDeletedFile) +{ + /* Nothing to do, as hDeletedFile is simply a DWORD... */ + return TRUE; +} + +static BOOL +DeleteFile5( + IN PRECYCLE_BIN bin, + IN LPCWSTR FullPath, + IN LPCWSTR FileName) +{ + HANDLE hFile = INVALID_HANDLE_VALUE; + INFO2_HEADER Header; + DELETED_FILE_RECORD DeletedFile; + DWORD bytesRead, bytesWritten; + LARGE_INTEGER fileSize; + SYSTEMTIME SystemTime; + WCHAR RootDir[4]; + WCHAR DeletedFileName[2 * MAX_PATH]; + LPCWSTR Extension; + DWORD ClusterSize, BytesPerSector, SectorsPerCluster; + BOOL ret = FALSE; + + if (wcslen(FullPath) >= MAX_PATH) + { + /* Unable to store a too long path in recycle bin */ + SetLastError(ERROR_INVALID_NAME); + goto cleanup; + } + + hFile = CreateFileW(FullPath, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + if (hFile == INVALID_HANDLE_VALUE) + goto cleanup; + + if (SetFilePointer(bin->hInfo, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + goto cleanup; + if (!ReadFile(bin->hInfo, &Header, sizeof(INFO2_HEADER), &bytesRead, NULL)) + goto cleanup; + if (bytesRead != sizeof(INFO2_HEADER) || Header.dwRecordSize == 0) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + if (Header.dwVersion != 5 || Header.dwRecordSize != sizeof(DELETED_FILE_RECORD)) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + /* Get file size */ +#if 0 + if (!GetFileSizeEx(hFile, &fileSize)) + goto cleanup; +#else + fileSize.u.LowPart = GetFileSize(hFile, &fileSize.u.HighPart); + if (fileSize.u.LowPart == INVALID_FILE_SIZE && GetLastError() != NO_ERROR) + goto cleanup; +#endif + /* Check if file size is > 4Gb */ + if (fileSize.u.HighPart != 0) + { + /* FIXME: how to delete files >= 4Gb? */ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + goto cleanup; + } + Header.dwTotalLogicalSize += fileSize.u.LowPart; + + /* Generate new name */ + Header.dwHighestRecordUniqueId++; + Extension = wcsrchr(FileName, '.'); + wsprintfW(DeletedFileName, L"%s\\D%c%lu%s", bin->Folder, FullPath[0] - 'A' + 'a', Header.dwHighestRecordUniqueId, Extension); + + /* Get cluster size */ + wsprintfW(RootDir, L"%c:\\", bin->Folder[0]); + if (!GetDiskFreeSpaceW(RootDir, &SectorsPerCluster, &BytesPerSector, NULL, NULL)) + goto cleanup; + ClusterSize = BytesPerSector * SectorsPerCluster; + + /* Get current time */ + GetSystemTime(&SystemTime); + if (!SystemTimeToFileTime(&SystemTime, &DeletedFile.DeletionTime)) + goto cleanup; + + /* Update INFO2 */ + memset(&DeletedFile, 0, sizeof(DELETED_FILE_RECORD)); + if (WideCharToMultiByte(CP_ACP, 0, FullPath, -1, DeletedFile.FileNameA, MAX_PATH, NULL, NULL) == 0) + { + SetLastError(ERROR_INVALID_NAME); + goto cleanup; + } + DeletedFile.dwRecordUniqueId = Header.dwHighestRecordUniqueId; + DeletedFile.dwDriveNumber = tolower(bin->Folder[0]) - 'a'; + DeletedFile.dwPhysicalFileSize = ROUND_UP(fileSize.u.LowPart, ClusterSize); + wcscpy(DeletedFile.FileNameW, FullPath); + + if (!SetFilePointer(bin->hInfo, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER) + goto cleanup; + if (!WriteFile(bin->hInfo, &DeletedFile, sizeof(DELETED_FILE_RECORD), &bytesWritten, NULL)) + goto cleanup; + if (bytesWritten != sizeof(DELETED_FILE_RECORD)) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + Header.dwNumberOfEntries++; + if (SetFilePointer(bin->hInfo, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + goto cleanup; + } + if (!WriteFile(bin->hInfo, &Header, sizeof(INFO2_HEADER), &bytesWritten, NULL)) + goto cleanup; + if (bytesWritten != sizeof(INFO2_HEADER)) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + /* Move file */ + if (!MoveFileW(FullPath, DeletedFileName)) + goto cleanup; + + ret = TRUE; + +cleanup: + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle(hFile); + return ret; +} + +static BOOL +EmptyRecycleBin5( + IN PRECYCLE_BIN* bin) +{ + LPWSTR InfoFile = NULL; + BOOL ret = FALSE; + + InfoFile = HeapAlloc(GetProcessHeap(), 0, wcslen((*bin)->InfoFile) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!InfoFile) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + wcscpy(InfoFile, (*bin)->InfoFile); + + /* Delete all files in the recycle bin */ + if (!EnumerateFiles5(*bin, IntEmptyRecycleBinCallback, *bin)) + goto cleanup; + + /* Delete INFO2 */ + if (!DereferenceHandle(&(*bin)->refCount)) + goto cleanup; + if (!DeleteFileW(InfoFile)) + goto cleanup; + *bin = NULL; + ret = TRUE; + +cleanup: + HeapFree(GetProcessHeap(), 0, InfoFile); + return ret; +} + +static BOOL +EnumerateFiles5( + IN PRECYCLE_BIN bin, + IN PINT_ENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, + IN PVOID Context) +{ + INFO2_HEADER Header; + DELETED_FILE_RECORD DeletedFile; + DWORD bytesRead, dwEntries; + BOOL ret = FALSE; + + if (SetFilePointer(bin->hInfo, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + goto cleanup; + if (!ReadFile(bin->hInfo, &Header, sizeof(INFO2_HEADER), &bytesRead, NULL)) + goto cleanup; + if (bytesRead != sizeof(INFO2_HEADER) || Header.dwRecordSize == 0) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + if (Header.dwVersion != 5 || Header.dwRecordSize != sizeof(DELETED_FILE_RECORD)) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + SetLastError(ERROR_SUCCESS); + for (dwEntries = 0; dwEntries < Header.dwNumberOfEntries; dwEntries++) + { + if (!ReadFile(bin->hInfo, &DeletedFile, Header.dwRecordSize, &bytesRead, NULL)) + goto cleanup; + if (bytesRead != Header.dwRecordSize) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + if (!pFnCallback(Context, (HANDLE)(ULONG_PTR)DeletedFile.dwRecordUniqueId)) + goto cleanup; + if (SetFilePointer(bin->hInfo, sizeof(INFO2_HEADER) + Header.dwRecordSize * dwEntries, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + goto cleanup; + } + + ret = TRUE; + +cleanup: + return ret; +} + +static BOOL +GetDetails5( + IN PRECYCLE_BIN bin, + IN HANDLE hDeletedFile, + IN DWORD BufferSize, + IN OUT PDELETED_FILE_DETAILS_W FileDetails, + OUT LPDWORD RequiredSize OPTIONAL) +{ + DELETED_FILE_RECORD DeletedFile; + SIZE_T Needed; + LPWSTR FullName = NULL; + HANDLE hFile = INVALID_HANDLE_VALUE; + BOOL ret = FALSE; + + if (!IntSearchRecord(bin, hDeletedFile, &DeletedFile, NULL)) + goto cleanup; + Needed = (DWORD)FIELD_OFFSET(DELETED_FILE_DETAILS_W, FileName) + (wcslen(DeletedFile.FileNameW) + 1) * sizeof(WCHAR); + if (RequiredSize) + *RequiredSize = (DWORD)Needed; + if (Needed > BufferSize) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto cleanup; + } + + if (!IntGetFullName(bin, &DeletedFile, &FullName)) + goto cleanup; + + /* Open file */ + FileDetails->Attributes = GetFileAttributesW(FullName); + if (FileDetails->Attributes == INVALID_FILE_ATTRIBUTES) + goto cleanup; + if (FileDetails->Attributes & FILE_ATTRIBUTE_DIRECTORY) + hFile = CreateFileW(FullName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); + else + hFile = CreateFileW(FullName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (hFile == INVALID_HANDLE_VALUE) + goto cleanup; + + /* Fill returned structure */ + if (!GetFileTime(hFile, NULL, NULL, &FileDetails->LastModification)) + goto cleanup; + memcpy(&FileDetails->DeletionTime, &DeletedFile.DeletionTime, sizeof(FILETIME)); + FileDetails->FileSize.u.LowPart = GetFileSize(hFile, &FileDetails->FileSize.u.HighPart); + if (FileDetails->FileSize.u.LowPart == INVALID_FILE_SIZE) + goto cleanup; + FileDetails->PhysicalFileSize.u.HighPart = 0; + FileDetails->PhysicalFileSize.u.LowPart = DeletedFile.dwPhysicalFileSize; + wcscpy(FileDetails->FileName, DeletedFile.FileNameW); + + ret = TRUE; + +cleanup: + HeapFree(GetProcessHeap(), 0, FullName); + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle(hFile); + return ret; +} + +static BOOL +RestoreFile5( + IN PRECYCLE_BIN bin, + IN HANDLE hDeletedFile) +{ + INFO2_HEADER Header; + DWORD bytesRead, bytesWritten; + LARGE_INTEGER Position; + DELETED_FILE_RECORD DeletedFile, LastFile; + LPWSTR FullName = NULL; + BOOL ret = FALSE; + + if (SetFilePointer(bin->hInfo, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + goto cleanup; + if (!ReadFile(bin->hInfo, &Header, sizeof(INFO2_HEADER), &bytesRead, NULL)) + goto cleanup; + if (bytesRead != sizeof(INFO2_HEADER) || Header.dwRecordSize == 0) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + if (Header.dwVersion != 5 || Header.dwRecordSize != sizeof(DELETED_FILE_RECORD)) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + /* Search deleted entry */ + if (!IntSearchRecord(bin, hDeletedFile, &DeletedFile, &Position)) + goto cleanup; + /* Get destination full name */ + if (!IntGetFullName(bin, &DeletedFile, &FullName)) + goto cleanup; + /* Restore file */ + if (!MoveFileW(FullName, DeletedFile.FileNameW)) + goto cleanup; + + /* Update INFO2 */ + /* 1) If not last entry, copy last entry to the current one */ + if (SetFilePointer(bin->hInfo, -sizeof(DELETED_FILE_RECORD), NULL, FILE_END) == INVALID_SET_FILE_POINTER) + goto cleanup; + if (!ReadFile(bin->hInfo, &LastFile, sizeof(DELETED_FILE_RECORD), &bytesRead, NULL)) + goto cleanup; + if (bytesRead != sizeof(DELETED_FILE_RECORD)) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + if (LastFile.dwRecordUniqueId != DeletedFile.dwRecordUniqueId) + { + /* Move the last entry to the current one */ + if (SetFilePointer(bin->hInfo, Position.u.LowPart, &Position.u.HighPart, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + goto cleanup; + if (!WriteFile(bin->hInfo, &LastFile, sizeof(DELETED_FILE_RECORD), &bytesWritten, NULL)) + goto cleanup; + if (bytesWritten != sizeof(DELETED_FILE_RECORD)) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + } + /* 2) Update the header */ + Header.dwNumberOfEntries--; + if (SetFilePointer(bin->hInfo, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + goto cleanup; + if (!WriteFile(bin->hInfo, &Header, sizeof(INFO2_HEADER), &bytesWritten, NULL)) + goto cleanup; + if (bytesWritten != sizeof(INFO2_HEADER)) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + /* 3) Truncate file */ + if (SetFilePointer(bin->hInfo, -sizeof(DELETED_FILE_RECORD), NULL, FILE_END) == INVALID_SET_FILE_POINTER) + goto cleanup; + if (!SetEndOfFile(bin->hInfo)) + goto cleanup; + ret = TRUE; + +cleanup: + HeapFree(GetProcessHeap(), 0, FullName); + return ret; +} + +static BOOL +IntDeleteRecursive( + IN LPCWSTR FullName) +{ + DWORD RemovableAttributes = FILE_ATTRIBUTE_READONLY; + DWORD FileAttributes; + BOOL ret = FALSE; + + FileAttributes = GetFileAttributesW(FullName); + if (FileAttributes == INVALID_FILE_ATTRIBUTES) + { + if (GetLastError() == ERROR_FILE_NOT_FOUND) + ret = TRUE; + goto cleanup; + } + if (FileAttributes & RemovableAttributes) + { + if (!SetFileAttributesW(FullName, FileAttributes & ~RemovableAttributes)) + goto cleanup; + } + if (FileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + /* Recursive deletion */ + /* FIXME: recursive deletion */ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + goto cleanup; + + if (!RemoveDirectoryW(FullName)) + goto cleanup; + } + else + { + if (!DeleteFileW(FullName)) + goto cleanup; + } + ret = TRUE; + +cleanup: + return ret; +} + +static BOOL +IntEmptyRecycleBinCallback( + IN PVOID Context, + IN HANDLE hDeletedFile) +{ + PRECYCLE_BIN bin = (PRECYCLE_BIN)Context; + DELETED_FILE_RECORD DeletedFile; + LPWSTR FullName = NULL; + BOOL ret = FALSE; + + if (!IntSearchRecord(bin, hDeletedFile, &DeletedFile, NULL)) + goto cleanup; + + if (!IntGetFullName(bin, &DeletedFile, &FullName)) + goto cleanup; + + if (!IntDeleteRecursive(FullName)) + goto cleanup; + ret = TRUE; + +cleanup: + HeapFree(GetProcessHeap(), 0, FullName); + return ret; +} + +static BOOL +IntGetFullName( + IN PRECYCLE_BIN bin, + IN PDELETED_FILE_RECORD pDeletedFile, + OUT LPWSTR* pFullName) +{ + SIZE_T Needed; + LPCWSTR Extension; + LPWSTR FullName = NULL; + BOOL ret = FALSE; + + *pFullName = NULL; + Extension = wcsrchr(pDeletedFile->FileNameW, '.'); + if (Extension < wcsrchr(pDeletedFile->FileNameW, '\\')) + Extension = NULL; + Needed = wcslen(bin->Folder) + 13; + if (Extension) + Needed += wcslen(Extension); + FullName = HeapAlloc(GetProcessHeap(), 0, Needed * sizeof(WCHAR)); + if (!FullName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + wsprintfW(FullName, L"%s\\D%c%lu%s", bin->Folder, pDeletedFile->dwDriveNumber + 'a', pDeletedFile->dwRecordUniqueId, Extension); + *pFullName = FullName; + ret = TRUE; + +cleanup: + if (!ret) + HeapFree(GetProcessHeap(), 0, FullName); + return ret; +} + +static BOOL +IntSearchRecord( + IN PRECYCLE_BIN bin, + IN HANDLE hDeletedFile, + OUT PDELETED_FILE_RECORD pDeletedFile, + OUT PLARGE_INTEGER Position OPTIONAL) +{ + INFO2_HEADER Header; + DELETED_FILE_RECORD DeletedFile; + DWORD bytesRead, dwEntries; + BOOL ret = FALSE; + + if (SetFilePointer(bin->hInfo, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + goto cleanup; + if (!ReadFile(bin->hInfo, &Header, sizeof(INFO2_HEADER), &bytesRead, NULL)) + goto cleanup; + if (bytesRead != sizeof(INFO2_HEADER) || Header.dwRecordSize == 0) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + if (Header.dwVersion != 5 || Header.dwRecordSize != sizeof(DELETED_FILE_RECORD)) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + SetLastError(ERROR_SUCCESS); + for (dwEntries = 0; dwEntries < Header.dwNumberOfEntries; dwEntries++) + { + if (Position) + { + LARGE_INTEGER Zero; + Zero.QuadPart = 0; + if (!SetFilePointerEx(bin->hInfo, Zero, Position, FILE_CURRENT)) + goto cleanup; + } + if (!ReadFile(bin->hInfo, &DeletedFile, Header.dwRecordSize, &bytesRead, NULL)) + goto cleanup; + if (bytesRead != Header.dwRecordSize) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + if (DeletedFile.dwRecordUniqueId == (DWORD)(ULONG_PTR)hDeletedFile) + { + memcpy(pDeletedFile, &DeletedFile, Header.dwRecordSize); + ret = TRUE; + goto cleanup; + } + } + + /* Entry not found */ + SetLastError(ERROR_INVALID_HANDLE); + +cleanup: + return ret; +} Added: trunk/reactos/lib/recyclebin/recyclebin_v5.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_v… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.h (added) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.h Tue Apr 11 23:51:55 2006 @@ -1,0 +1,76 @@ +/* Recycle bin management + * This file is under the GPLv2 licence + * Copyright (C) 2006 Hervé Poussineau <hpoussin(a)reactos.org> + */ + +#include "recyclebin_private.h" + +#include <pshpack1.h> + +/* MS Windows 2000/XP/2003 */ +typedef struct _DELETED_FILE_RECORD +{ + CHAR FileNameA[MAX_PATH]; + DWORD dwRecordUniqueId; + DWORD dwDriveNumber; + FILETIME DeletionTime; + DWORD dwPhysicalFileSize; + WCHAR FileNameW[MAX_PATH]; +} DELETED_FILE_RECORD, *PDELETED_FILE_RECORD; + +#include <poppack.h> + +static BOOL +CloseHandle5( + IN HANDLE hDeletedFile); + +static BOOL +DeleteFile5( + IN PRECYCLE_BIN Context, + IN LPCWSTR FullPath, + IN LPCWSTR FileName); + +static BOOL +EmptyRecycleBin5( + IN PRECYCLE_BIN* bin); + +static BOOL +EnumerateFiles5( + IN PRECYCLE_BIN bin, + IN PINT_ENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, + IN PVOID Context); + +static BOOL +GetDetails5( + IN PRECYCLE_BIN bin, + IN HANDLE hDeletedFile, + IN DWORD BufferSize, + IN OUT PDELETED_FILE_DETAILS_W FileDetails, + OUT LPDWORD RequiredSize OPTIONAL); + +static BOOL +RestoreFile5( + IN PRECYCLE_BIN Context, + IN HANDLE hDeletedFile); + +static BOOL +IntDeleteRecursive( + IN LPCWSTR FullName); + +static BOOL +IntEmptyRecycleBinCallback( + IN PVOID Context, + IN HANDLE hDeletedFile); + +static BOOL +IntGetFullName( + IN PRECYCLE_BIN bin, + IN PDELETED_FILE_RECORD pDeletedFile, + OUT LPWSTR* pFullName); + +static BOOL +IntSearchRecord( + IN PRECYCLE_BIN bin, + IN HANDLE hDeletedFile, + OUT PDELETED_FILE_RECORD DeletedFile, + OUT PLARGE_INTEGER Position OPTIONAL); Added: trunk/reactos/lib/recyclebin/refcount.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/refcount.c?r… ============================================================================== --- trunk/reactos/lib/recyclebin/refcount.c (added) +++ trunk/reactos/lib/recyclebin/refcount.c Tue Apr 11 23:51:55 2006 @@ -1,0 +1,42 @@ +/* + * PROJECT: Recycle bin management + * LICENSE: GPL v2 - See COPYING in the top level directory + * FILE: lib/recyclebin/openclose.c + * PURPOSE: Do reference counting on objects + * PROGRAMMERS: Copyright 2006 Hervé Poussineau (hpoussin(a)reactos.org) + */ + +#include "recyclebin_private.h" + +BOOL +InitializeHandle( + IN PREFCOUNT_DATA pData, + IN PDESTROY_DATA pFnClose OPTIONAL) +{ + pData->ReferenceCount = 1; + pData->Close = pFnClose; + return TRUE; +} + +BOOL +ReferenceHandle( + IN PREFCOUNT_DATA pData) +{ + pData->ReferenceCount++; + return TRUE; +} + +BOOL +DereferenceHandle( + IN PREFCOUNT_DATA pData) +{ + pData->ReferenceCount--; + if (pData->ReferenceCount == 0) + { + if (pData->Close) + return pData->Close(pData); + else + return TRUE; + } + return TRUE; +}

1 0

[gedmurphy] 21552: Add buttons to the floating tool window. They don't do anything yet apart from look pretty. Give some order to the resource.h file tool.
by gedmurphy＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: gedmurphy Date: Tue Apr 11 23:47:04 2006 New Revision: 21552 URL: http://svn.reactos.ru/svn/reactos?rev=21552&view=rev Log: Add buttons to the floating tool window. They don't do anything yet apart from look pretty. Give some order to the resource.h file tool. Added: trunk/reactos/base/applications/imagesoft/res/icons/std/ trunk/reactos/base/applications/imagesoft/res/icons/std/MainCopyIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainCutIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainNewIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainOpenIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainPasteIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainPrintIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainPrintPreIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainRedoIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainSaveIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainUndoIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/text/ trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignCenterIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignLeftIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignRightIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/text/TextBoldIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/text/TextItalicIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/text/TextUnderlineIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsCloneStamp.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsColorPicker.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEllipse.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEllipseSelect.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEraser.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsFreeformShape.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsLassoSelect.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsLine.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMagicWand.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMove.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMoveSelection.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPaintBrush.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPaintBucket.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPencil.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRecoloring.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRectangle.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRectangleSelect.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRoundedRectangle.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsText.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsZoom.bmp (with props) Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainCopyIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainCutIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainNewIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainOpenIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainPasteIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainPrintIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainPrintPreIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainRedoIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainSaveIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainUndoIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/TextAlignCenterIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/TextAlignLeftIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/TextAlignRightIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/TextBoldIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/TextItalicIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/TextUnderlineIcon.bmp Modified: trunk/reactos/base/applications/imagesoft/about.c trunk/reactos/base/applications/imagesoft/floatwindow.c trunk/reactos/base/applications/imagesoft/imagesoft.c trunk/reactos/base/applications/imagesoft/imagesoft.rc trunk/reactos/base/applications/imagesoft/imgedwnd.c trunk/reactos/base/applications/imagesoft/mainwnd.c trunk/reactos/base/applications/imagesoft/misc.c trunk/reactos/base/applications/imagesoft/precomp.h trunk/reactos/base/applications/imagesoft/resource.h Modified: trunk/reactos/base/applications/imagesoft/about.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/about.c (original) +++ trunk/reactos/base/applications/imagesoft/about.c Tue Apr 11 23:47:04 2006 @@ -15,7 +15,7 @@ case WM_INITDIALOG: hIcon = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_ICON), + MAKEINTRESOURCE(IDI_IMAGESOFTICON), IMAGE_ICON, 16, 16, Modified: trunk/reactos/base/applications/imagesoft/floatwindow.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/floatwindow.c (original) +++ trunk/reactos/base/applications/imagesoft/floatwindow.c Tue Apr 11 23:47:04 2006 @@ -3,6 +3,33 @@ static const TCHAR szFloatWndClass[] = TEXT("ImageSoftFloatWndClass"); #define ID_TIMER 1 + +TBBUTTON ToolsButtons[] = { +/* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ + {TBICON_RECTSEL, ID_RECTSEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_MOVESEL, ID_MOVESEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_LASOO, ID_LASOO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* cut */ + {TBICON_MOVE, ID_MOVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* undo */ + {TBICON_ECLIPSESEL, ID_ECLIPSESEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* save */ + {TBICON_ZOOM, ID_ZOOM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_MAGICWAND, ID_MAGICWAND, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* paste */ + {TBICON_TEXT, ID_TEXT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_PAINTBRUSH, ID_PAINTBRUSH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_ERASER, ID_ERASER, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* print */ + {TBICON_PENCIL, ID_PENCIL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_COLORPICKER, ID_COLORPICKER, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ + {TBICON_CLONESTAMP, ID_CLONESTAMP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ + {TBICON_RECOLORING, ID_RECOLORING, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_PAINTBUCKET, ID_PAINTBUCKET, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_LINE, ID_LINE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* copy */ + {TBICON_RECTANGLE, ID_RECTANGLE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_ROUNDRECT, ID_ROUNDRECT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_ECLIPSE, ID_ECLIPSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* open */ + {TBICON_FREEFORM, ID_FREEFORM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* print preview */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, +}; + BOOL ShowHideWindow(HWND hwnd) @@ -15,6 +42,77 @@ return Hidden; } + +VOID +FloatToolbarCreateToolsGui(PFLT_WND FltTools) +{ + HWND hTb; + HIMAGELIST hImageList; + INT NumButtons; + + NumButtons = sizeof(ToolsButtons) / sizeof(ToolsButtons[0]); + + hTb = CreateWindowEx(0, + TOOLBARCLASSNAME, + NULL, + WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_WRAPABLE | CCS_NODIVIDER, + 0, 0, 32, 200, + FltTools->hSelf, + NULL, + hInstance, + NULL); + + SendMessage(hTb, + TB_SETEXTENDEDSTYLE, + 0, + TBSTYLE_EX_HIDECLIPPEDBUTTONS); + + SendMessage(hTb, + TB_BUTTONSTRUCTSIZE, + sizeof(ToolsButtons[0]), + 0); + + SendMessage(hTb, + TB_SETBITMAPSIZE, + 0, + (LPARAM)MAKELONG(16, 16)); + + hImageList = InitImageList(20, + IDB_TOOLSRECTSEL); + + ImageList_Destroy((HIMAGELIST)SendMessage(hTb, + TB_SETIMAGELIST, + 0, + (LPARAM)hImageList)); + + SendMessage(hTb, + TB_ADDBUTTONS, + NumButtons, + (LPARAM)ToolsButtons); + + SendMessage(hTb, + TB_AUTOSIZE, + 0, + 0); + + return; +} + + +VOID +FloatToolbarCreateColorsGui(PFLT_WND FltColors) +{ + + return; +} + + +VOID +FloatToolbarCreateHistoryGui(PFLT_WND FltHistory) +{ + + return; +} LRESULT CALLBACK FloatToolbarWndProc(HWND hwnd, @@ -112,9 +210,33 @@ switch(LOWORD(wParam)) { - case IDC_PRESS: - MessageBox(hwnd, _T("Kapow!"), _T("Hit test"), - MB_OK | MB_ICONEXCLAMATION); + case ID_NEW: + MessageBox(hwnd, _T("Kapow!"), _T("Hit test"), MB_OK | MB_ICONEXCLAMATION); + break; + + case ID_CLONESTAMP: + case ID_COLORPICKER: + case ID_ECLIPSE: + case ID_ECLIPSESEL: + case ID_ERASER: + case ID_FREEFORM: + case ID_LASOO: + case ID_LINE: + case ID_MAGICWAND: + case ID_MOVE: + case ID_MOVESEL: + case ID_PAINTBRUSH: + case ID_PAINTBUCKET: + case ID_PENCIL: + case ID_RECOLORING: + case ID_RECTANGLE: + case ID_ROUNDRECT: + case ID_TEXT: + case ID_ZOOM: + /*SendMessage(Info->hSelf, + LOWORD(wParam), + wParam, + lParam);*/ break; } break; Modified: trunk/reactos/base/applications/imagesoft/imagesoft.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.c (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.c Tue Apr 11 23:47:04 2006 @@ -32,7 +32,7 @@ return 1; } - len = _tcslen(lpAppName) + _tcslen(lpVersion); + len = (int)_tcslen(lpAppName) + (int)_tcslen(lpVersion); lpTitle = HeapAlloc(ProcessHeap, 0, (len + 2) * sizeof(TCHAR)); Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rc (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rc Tue Apr 11 23:47:04 2006 @@ -10,36 +10,56 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 24 DISCARDABLE "manifest.xml" - + STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ImageSoft" IDS_VERSION "v0.1" END -IDI_ICON ICON "res/imagesoft.ico" +IDI_IMAGESOFTICON ICON "res/imagesoft.ico" /* main toolbar icons */ -IDB_MAINCOPYICON BITMAP DISCARDABLE "res/icons/MainCopyIcon.bmp" -IDB_MAINCUTICON BITMAP DISCARDABLE "res/icons/MainCutIcon.bmp" -IDB_MAINPASTEICON BITMAP DISCARDABLE "res/icons/MainPasteIcon.bmp" -IDB_MAINREDOICON BITMAP DISCARDABLE "res/icons/MainRedoIcon.bmp" -IDB_MAINUNDOICON BITMAP DISCARDABLE "res/icons/MainUndoIcon.bmp" -IDB_MAINNEWICON BITMAP DISCARDABLE "res/icons/MainNewIcon.bmp" -IDB_MAINOPENICON BITMAP DISCARDABLE "res/icons/MainOpenIcon.bmp" -IDB_MAINPRINTICON BITMAP DISCARDABLE "res/icons/MainPrintIcon.bmp" -IDB_MAINPRINTPREICON BITMAP DISCARDABLE "res/icons/MainPrintPreIcon.bmp" -IDB_MAINSAVEICON BITMAP DISCARDABLE "res/icons/MainSaveIcon.bmp" +IDB_MAINCOPYICON BITMAP DISCARDABLE "res/icons/std/MainCopyIcon.bmp" +IDB_MAINCUTICON BITMAP DISCARDABLE "res/icons/std/MainCutIcon.bmp" +IDB_MAINPASTEICON BITMAP DISCARDABLE "res/icons/std/MainPasteIcon.bmp" +IDB_MAINREDOICON BITMAP DISCARDABLE "res/icons/std/MainRedoIcon.bmp" +IDB_MAINUNDOICON BITMAP DISCARDABLE "res/icons/std/MainUndoIcon.bmp" +IDB_MAINNEWICON BITMAP DISCARDABLE "res/icons/std/MainNewIcon.bmp" +IDB_MAINOPENICON BITMAP DISCARDABLE "res/icons/std/MainOpenIcon.bmp" +IDB_MAINPRINTICON BITMAP DISCARDABLE "res/icons/std/MainPrintIcon.bmp" +IDB_MAINPRINTPREICON BITMAP DISCARDABLE "res/icons/std/MainPrintPreIcon.bmp" +IDB_MAINSAVEICON BITMAP DISCARDABLE "res/icons/std/MainSaveIcon.bmp" /* text toolbar icons */ -IDB_TEXTBOLD BITMAP DISCARDABLE "res/icons/TextBoldIcon.bmp" -IDB_TEXTITALIC BITMAP DISCARDABLE "res/icons/TextItalicIcon.bmp" -IDB_TEXTULINE BITMAP DISCARDABLE "res/icons/TextUnderlineIcon.bmp" -IDB_TEXTLEFT BITMAP DISCARDABLE "res/icons/TextAlignLeftIcon.bmp" -IDB_TEXTCENTER BITMAP DISCARDABLE "res/icons/TextAlignCenterIcon.bmp" -IDB_TEXTRIGHT BITMAP DISCARDABLE "res/icons/TextAlignRightIcon.bmp" +IDB_TEXTBOLD BITMAP DISCARDABLE "res/icons/text/TextBoldIcon.bmp" +IDB_TEXTITALIC BITMAP DISCARDABLE "res/icons/text/TextItalicIcon.bmp" +IDB_TEXTULINE BITMAP DISCARDABLE "res/icons/text/TextUnderlineIcon.bmp" +IDB_TEXTLEFT BITMAP DISCARDABLE "res/icons/text/TextAlignLeftIcon.bmp" +IDB_TEXTCENTER BITMAP DISCARDABLE "res/icons/text/TextAlignCenterIcon.bmp" +IDB_TEXTRIGHT BITMAP DISCARDABLE "res/icons/text/TextAlignRightIcon.bmp" /* tools window icons */ +IDB_TOOLSCLONESTAMP BITMAP DISCARDABLE "res/icons/tools/ToolsCloneStamp.bmp" +IDB_TOOLSCOLORPICKER BITMAP DISCARDABLE "res/icons/tools/ToolsColorPicker.bmp" +IDB_TOOLSECLIPSE BITMAP DISCARDABLE "res/icons/tools/ToolsEllipse.bmp" +IDB_TOOLSECLIPSESEL BITMAP DISCARDABLE "res/icons/tools/ToolsEllipseSelect.bmp" +IDB_TOOLSERASER BITMAP DISCARDABLE "res/icons/tools/ToolsEraser.bmp" +IDB_TOOLSFREEFORM BITMAP DISCARDABLE "res/icons/tools/ToolsFreeformShape.bmp" +IDB_TOOLSLASOO BITMAP DISCARDABLE "res/icons/tools/ToolsLassoSelect.bmp" +IDB_TOOLSLINE BITMAP DISCARDABLE "res/icons/tools/ToolsLine.bmp" +IDB_TOOLSMAGICWAND BITMAP DISCARDABLE "res/icons/tools/ToolsMagicWand.bmp" +IDB_TOOLSMOVE BITMAP DISCARDABLE "res/icons/tools/ToolsMove.bmp" +IDB_TOOLSMOVESEL BITMAP DISCARDABLE "res/icons/tools/ToolsMoveSelection.bmp" +IDB_TOOLSPAINTBRUSH BITMAP DISCARDABLE "res/icons/tools/ToolsPaintBrush.bmp" +IDB_TOOLSPAINTBUCKET BITMAP DISCARDABLE "res/icons/tools/ToolsPaintBucket.bmp" +IDB_TOOLSPENCIL BITMAP DISCARDABLE "res/icons/tools/ToolsPencil.bmp" +IDB_TOOLSRECOLORING BITMAP DISCARDABLE "res/icons/tools/ToolsRecoloring.bmp" +IDB_TOOLSRECTANGLE BITMAP DISCARDABLE "res/icons/tools/ToolsRectangle.bmp" +IDB_TOOLSRECTSEL BITMAP DISCARDABLE "res/icons/tools/ToolsRectangleSelect.bmp" +IDB_TOOLSROUNDRECT BITMAP DISCARDABLE "res/icons/tools/ToolsRoundedRectangle.bmp" +IDB_TOOLSTEXT BITMAP DISCARDABLE "res/icons/tools/ToolsText.bmp" +IDB_TOOLSZOOM BITMAP DISCARDABLE "res/icons/tools/ToolsZoom.bmp" /* cursors */ Modified: trunk/reactos/base/applications/imagesoft/imgedwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imgedwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/imgedwnd.c Tue Apr 11 23:47:04 2006 @@ -511,13 +511,13 @@ wc.lpfnWndProc = ImageEditWndProc; wc.hInstance = hInstance; wc.hIcon = LoadIcon(hInstance, - MAKEINTRESOURCE(IDI_ICON)); + MAKEINTRESOURCE(IDI_IMAGESOFTICON)); wc.hCursor = LoadCursor(hInstance, MAKEINTRESOURCE(IDC_PAINTBRUSHCURSOR)); wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); wc.lpszClassName = szImageEditWndClass; wc.hIconSm = (HICON)LoadImage(hInstance, - MAKEINTRESOURCE(IDI_ICON), + MAKEINTRESOURCE(IDI_IMAGESOFTICON), IMAGE_ICON, 16, 16, Modified: trunk/reactos/base/applications/imagesoft/mainwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/mainwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/mainwnd.c Tue Apr 11 23:47:04 2006 @@ -71,9 +71,9 @@ }; static FLT_WND FloatingWindow[NUM_FLT_WND] = { - {NULL, NULL, 0, 0, 55, 300}, - {NULL, NULL, 0, 0, 200, 200}, - {NULL, NULL, 0, 0, 150, 150} + {NULL, NULL, 0, 0, 53, 300}, /* tools */ + {NULL, NULL, 0, 0, 200, 200}, /* colors */ + {NULL, NULL, 0, 0, 150, 150} /* history */ }; @@ -95,55 +95,6 @@ {ID_TOOLBAR_TEXT, szToolbarText, IDS_TOOLBAR_TEXT, TOP_DOCK}, }; - -static HIMAGELIST -InitImageList(UINT NumButtons, UINT StartResource) -{ - HBITMAP hBitmap; - HIMAGELIST hImageList; - INT i, k, Ret; - - - /* Create the toolbar icon image list */ - hImageList = ImageList_Create(TB_BMP_WIDTH, - TB_BMP_HEIGHT, - ILC_MASK | ILC_COLOR24, - NumButtons, - 0); - if (! hImageList) - return NULL; - - /* Add all icons to the image list */ - for (i = StartResource, k = 0; k < NumButtons; i++, k++) - { - hBitmap = LoadImage(hInstance, - MAKEINTRESOURCE(i), - IMAGE_BITMAP, - TB_BMP_WIDTH, - TB_BMP_HEIGHT, - LR_LOADTRANSPARENT); - - Ret = ImageList_AddMasked(hImageList, - hBitmap, - RGB(255, 255, 254)); - - DeleteObject(hBitmap); - } - - return hImageList; - -} - -/* -static BOOL -DestroyImageList(HIMAGELIST hImageList) -{ - if (! ImageList_Destroy(hImageList)) - return FALSE; - else - return TRUE; -} -*/ static BOOL CALLBACK MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks, @@ -530,9 +481,8 @@ MainWndCreateFloatWindows(PMAIN_WND_INFO Info) { RECT rect; - const TBBUTTON *Buttons = NULL; - UINT Res, NumButtons = 2; - INT i = 0; + UINT Res; + INT i = TOOLS; if (! GetWindowRect(Info->hMdiClient, &rect)) @@ -541,16 +491,16 @@ } /* tools datum */ - FloatingWindow[0].x = rect.left + 5; - FloatingWindow[0].y = rect.top + 5; + FloatingWindow[TOOLS].x = rect.left + 5; + FloatingWindow[TOOLS].y = rect.top + 5; /* colors datum */ - FloatingWindow[1].x = rect.left + 5; - FloatingWindow[1].y = rect.bottom - FloatingWindow[1].Height - 5; + FloatingWindow[COLORS].x = rect.left + 5; + FloatingWindow[COLORS].y = rect.bottom - FloatingWindow[1].Height - 5; /* history datum */ - FloatingWindow[2].x = rect.right - FloatingWindow[2].Width - 5; - FloatingWindow[2].y = rect.top + 5; + FloatingWindow[HISTORY].x = rect.right - FloatingWindow[2].Width - 5; + FloatingWindow[HISTORY].y = rect.top + 5; for (Res = IDS_FLT_TOOLS; Res < IDS_FLT_TOOLS + NUM_FLT_WND; Res++, i++) { @@ -561,8 +511,6 @@ FloatingWindow[i].lpName = NULL; } - - /* create the 'tools' toolbar */ FloatingWindow[i].hSelf = CreateWindowEx(WS_EX_TOOLWINDOW, TEXT("ImageSoftFloatWndClass"), FloatingWindow[i].lpName, @@ -578,39 +526,21 @@ } - if (Info->hFloatTools != NULL) - { - HIMAGELIST hFloatToolsImageList; - - SendMessage(Info->hFloatTools, - TB_SETEXTENDEDSTYLE, - 0, - TBSTYLE_EX_HIDECLIPPEDBUTTONS); - - /* Send the TB_BUTTONSTRUCTSIZE message, which is required for backward compatibility */ - SendMessage(Info->hFloatTools, - TB_BUTTONSTRUCTSIZE, - sizeof(Buttons[0]), - 0); - - SendMessage(Info->hFloatTools, - TB_SETBITMAPSIZE, - 0, - (LPARAM)MAKELONG(TB_BMP_WIDTH, TB_BMP_HEIGHT)); - - hFloatToolsImageList = InitImageList(2, - IDB_MAINNEWICON); - - SendMessage(Info->hFloatTools, - TB_SETIMAGELIST, - 0, - (LPARAM)hFloatToolsImageList); - - SendMessage(Info->hFloatTools, - TB_ADDBUTTONS, - NumButtons, - (LPARAM)&StdButtons); - + + + if (FloatingWindow[TOOLS].hSelf != NULL) + { + FloatToolbarCreateToolsGui(&FloatingWindow[TOOLS]); + } + + if (FloatingWindow[COLORS].hSelf != NULL) + { + FloatToolbarCreateColorsGui(&FloatingWindow[COLORS]); + } + + if (FloatingWindow[HISTORY].hSelf != NULL) + { + FloatToolbarCreateHistoryGui(&FloatingWindow[HISTORY]); } } @@ -846,6 +776,9 @@ CreateImageEditWindow(Info, &OpenInfo); + + /* FIXME: move flt wnd's if scroll bars show + MainWndResetFloatingWindows(Info->hMdiClient); */ } } @@ -998,7 +931,7 @@ lParam); break; - case WM_NCLBUTTONUP : + case WM_NCLBUTTONUP: bLBMouseDown = FALSE; DefWindowProc(hwnd, @@ -1325,14 +1258,14 @@ wc.lpfnWndProc = MainWndProc; wc.hInstance = hInstance; wc.hIcon = LoadIcon(hInstance, - MAKEINTRESOURCE(IDI_ICON)); + MAKEINTRESOURCE(IDI_IMAGESOFTICON)); wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAINMENU); wc.lpszClassName = szMainWndClass; wc.hIconSm = (HICON)LoadImage(hInstance, - MAKEINTRESOURCE(IDI_ICON), + MAKEINTRESOURCE(IDI_IMAGESOFTICON), IMAGE_ICON, 16, 16, Modified: trunk/reactos/base/applications/imagesoft/misc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/misc.c (original) +++ trunk/reactos/base/applications/imagesoft/misc.c Tue Apr 11 23:47:04 2006 @@ -203,10 +203,6 @@ } -VOID MessageBoxInt(INT num) -{ - MessageBox(NULL, _itot(num, NULL, 10), NULL, 0); -} /* * Toolbar custom control routines @@ -373,3 +369,53 @@ return FALSE; } + + +HIMAGELIST +InitImageList(UINT NumImages, UINT StartResource) +{ + HBITMAP hBitmap; + HIMAGELIST hImageList; + INT i, k, Ret; + + + /* Create the toolbar icon image list */ + hImageList = ImageList_Create(TB_BMP_WIDTH, + TB_BMP_HEIGHT, + ILC_MASK | ILC_COLOR24, + NumImages, + 0); + if (! hImageList) + return NULL; + + /* Add all icons to the image list */ + for (i = StartResource, k = 0; k < NumImages; i++, k++) + { + hBitmap = LoadImage(hInstance, + MAKEINTRESOURCE(i), + IMAGE_BITMAP, + TB_BMP_WIDTH, + TB_BMP_HEIGHT, + LR_LOADTRANSPARENT); + + Ret = ImageList_AddMasked(hImageList, + hBitmap, + RGB(255, 255, 254)); + + DeleteObject(hBitmap); + } + + return hImageList; + +} + +/* +static BOOL +DestroyImageList(HIMAGELIST hImageList) +{ + if (! ImageList_Destroy(hImageList)) + return FALSE; + else + return TRUE; +} +*/ Modified: trunk/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/precomp.h (original) +++ trunk/reactos/base/applications/imagesoft/precomp.h Tue Apr 11 23:47:04 2006 @@ -28,6 +28,10 @@ #define NUM_MAINTB_IMAGES 10 #define TB_BMP_WIDTH 16 #define TB_BMP_HEIGHT 16 + +#define TOOLS 0 +#define COLORS 1 +#define HISTORY 2 #define MONOCHROMEBITS 1 #define GREYSCALEBITS 8 @@ -338,8 +342,6 @@ VOID GetError(DWORD err); -VOID MessageBoxInt(INT num); - BOOL ToolbarDeleteControlSpace(HWND hWndToolbar, const TBBUTTON *ptbButton); @@ -355,9 +357,14 @@ INT iCmd, BOOL HideVertical); +HIMAGELIST InitImageList(UINT NumButtons, + UINT StartResource); + /* opensave.c */ VOID FileInitialize(HWND hwnd); -BOOL DoOpenFile(HWND hwnd, LPTSTR lpFileName, LPTSTR lpName); +BOOL DoOpenFile(HWND hwnd, + LPTSTR lpFileName, + LPTSTR lpName); BOOL DoSaveFile(HWND hwnd); /* floattoolbar.c */ @@ -372,6 +379,9 @@ BOOL bOpaque; } FLT_WND, *PFLT_WND; +VOID FloatToolbarCreateToolsGui(PFLT_WND FltTools); +VOID FloatToolbarCreateColorsGui(PFLT_WND FltColors); +VOID FloatToolbarCreateHistoryGui(PFLT_WND FltHistory); BOOL InitFloatWndClass(VOID); VOID UninitFloatWndImpl(VOID); BOOL ShowHideWindow(HWND hwnd); Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainCopyIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainCutIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainNewIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainOpenIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainPasteIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainPrintIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainPrintPreIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainRedoIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainSaveIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainUndoIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignCenterIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignLeftIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignRightIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/TextBoldIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/TextItalicIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/applications/imagesoft/res/icons/TextUnderlineIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainCopyIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainCopyIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainCutIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainCutIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainNewIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainNewIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainOpenIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainOpenIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainPasteIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainPasteIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainPrintIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainPrintIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainPrintPreIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainPrintPreIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainRedoIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainRedoIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainSaveIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainSaveIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainUndoIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainUndoIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignCenterIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignCenterIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignLeftIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignLeftIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignRightIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignRightIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/text/TextBoldIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/text/TextBoldIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/text/TextItalicIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/text/TextItalicIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/text/TextUnderlineIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/text/TextUnderlineIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsCloneStamp.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsCloneStamp.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsColorPicker.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsColorPicker.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEllipse.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEllipse.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEllipseSelect.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEllipseSelect.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEraser.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEraser.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsFreeformShape.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsFreeformShape.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsLassoSelect.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsLassoSelect.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsLine.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsLine.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMagicWand.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMagicWand.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMove.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMove.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMoveSelection.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMoveSelection.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPaintBrush.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPaintBrush.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPaintBucket.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPaintBucket.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPencil.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPencil.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRecoloring.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRecoloring.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRectangle.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRectangle.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRectangleSelect.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRectangleSelect.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRoundedRectangle.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRoundedRectangle.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsText.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsText.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsZoom.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsZoom.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/applications/imagesoft/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/resource.h (original) +++ trunk/reactos/base/applications/imagesoft/resource.h Tue Apr 11 23:47:04 2006 @@ -1,55 +1,180 @@ #define IDC_STATIC -1 -#define IDC_TOOLBAR 1001 -#define IDC_FLOATTOOLBAR 1002 -#define IDC_STATUSBAR 1003 -#define IDC_MAIN_MDI 1004 - -#define IDD_FLOATTOOLS 1100 -#define IDC_PRESS 1101 -#define IDC_OTHER 1102 - -#define ID_NEW 2000 -#define ID_OPEN 2001 -#define ID_CLOSE 2002 -#define ID_CLOSEALL 2003 -#define ID_SAVE 2004 -#define ID_SAVEAS 2005 -#define ID_PRINTPRE 2006 -#define ID_PRINT 2007 -#define ID_PROP 2008 -#define ID_CUT 2009 -#define ID_COPY 2010 -#define ID_PASTE 2011 -#define ID_PASTENEWIMAGE 2012 -#define ID_UNDO 2013 -#define ID_REDO 2014 -#define ID_SELALL 2015 -#define ID_EXIT 2016 -#define ID_EDITCOLOURS 2017 -#define ID_TOOLS 2018 -#define ID_STATUSBAR 2019 -#define ID_BOLD 2030 -#define ID_ITALIC 2031 -#define ID_ULINE 2032 -#define ID_TXTLEFT 2033 -#define ID_TXTCENTER 2034 -#define ID_TXTRIGHT 2035 -#define ID_TXTFONTNAME 2036 - -#define ID_REFRESH 3000 -#define ID_HELP 3001 -#define ID_WINDOW_TILE_HORZ 3002 -#define ID_WINDOW_TILE_VERT 3003 -#define ID_WINDOW_CASCADE 3004 -#define ID_WINDOW_NEXT 3005 -#define ID_WINDOW_ARRANGE 3006 - -/* Menu */ -#define IDR_MAINMENU 102 -#define IDR_POPUP 103 -#define ID_ABOUT 4031 - +/* Main Windows */ +#define IDC_TOOLBAR 10 +#define IDC_STATUSBAR 11 +#define IDC_MAIN_MDI 12 +/* these need to be kept consecutive */ +#define IDS_FLT_TOOLS 20 +#define IDS_FLT_COLORS 21 +#define IDS_FLT_HISTORY 22 + +/* Program icon */ +#define IDI_IMAGESOFTICON 50 + +/* Menus */ +#define IDR_MAINMENU 102 +#define IDR_POPUP 103 + +/* COMMANDS */ +/* main */ +#define ID_NEW 2000 +#define ID_OPEN 2001 +#define ID_CLOSE 2002 +#define ID_CLOSEALL 2003 +#define ID_SAVE 2004 +#define ID_SAVEAS 2005 +#define ID_PRINTPRE 2006 +#define ID_PRINT 2007 +#define ID_PROP 2008 +#define ID_CUT 2009 +#define ID_COPY 2010 +#define ID_PASTE 2011 +#define ID_PASTENEWIMAGE 2012 +#define ID_UNDO 2013 +#define ID_REDO 2014 +#define ID_SELALL 2015 +#define ID_EXIT 2016 +#define ID_EDITCOLOURS 2017 +#define ID_TOOLS 2018 +#define ID_STATUSBAR 2019 + +/* text */ +#define ID_BOLD 2030 +#define ID_ITALIC 2031 +#define ID_ULINE 2032 +#define ID_TXTLEFT 2033 +#define ID_TXTCENTER 2034 +#define ID_TXTRIGHT 2035 +#define ID_TXTFONTNAME 2036 + +/* tools */ +#define ID_CLONESTAMP 2050 +#define ID_COLORPICKER 2051 +#define ID_ECLIPSE 2052 +#define ID_ECLIPSESEL 2053 +#define ID_ERASER 2054 +#define ID_FREEFORM 2055 +#define ID_LASOO 2056 +#define ID_LINE 2057 +#define ID_MAGICWAND 2058 +#define ID_MOVE 2059 +#define ID_MOVESEL 2060 +#define ID_PAINTBRUSH 2061 +#define ID_PAINTBUCKET 2062 +#define ID_PENCIL 2063 +#define ID_RECOLORING 2064 +#define ID_RECTANGLE 2065 +#define ID_RECTSEL 2066 +#define ID_ROUNDRECT 2067 +#define ID_TEXT 2068 +#define ID_ZOOM 2069 + +#define ID_ABOUT 2100 + +#define ID_REFRESH 3000 +#define ID_HELP 3001 +#define ID_WINDOW_TILE_HORZ 3002 +#define ID_WINDOW_TILE_VERT 3003 +#define ID_WINDOW_CASCADE 3004 +#define ID_WINDOW_NEXT 3005 +#define ID_WINDOW_ARRANGE 3006 + +/* menu hints */ +#define IDS_HINT_EXIT 20001 + +/* system menu hints */ +#define IDS_HINT_SYS_RESTORE 21001 +#define IDS_HINT_SYS_MOVE 21002 +#define IDS_HINT_SYS_SIZE 21003 +#define IDS_HINT_SYS_MINIMIZE 21004 +#define IDS_HINT_SYS_MAXIMIZE 21005 +#define IDS_HINT_SYS_CLOSE 21006 +#define IDS_HINT_SYS_NEXT 21007 + + +/* Toolbar button bitmaps. + * These must be numbered consecutively + * See loop in InitImageList (misc.c) + */ +#define IDB_MAINNEWICON 10000 +#define IDB_MAINOPENICON 10001 +#define IDB_MAINSAVEICON 10002 +#define IDB_MAINPRINTICON 10003 +#define IDB_MAINPRINTPREICON 10004 +#define IDB_MAINCUTICON 10005 +#define IDB_MAINCOPYICON 10006 +#define IDB_MAINPASTEICON 10007 +#define IDB_MAINUNDOICON 10008 +#define IDB_MAINREDOICON 10009 + +#define IDB_TEXTBOLD 10020 +#define IDB_TEXTITALIC 10021 +#define IDB_TEXTULINE 10022 +#define IDB_TEXTLEFT 10023 +#define IDB_TEXTCENTER 10024 +#define IDB_TEXTRIGHT 10025 + +#define IDB_TOOLSRECTSEL 10030 +#define IDB_TOOLSMOVESEL 10031 +#define IDB_TOOLSLASOO 10032 +#define IDB_TOOLSMOVE 10033 +#define IDB_TOOLSECLIPSESEL 10034 +#define IDB_TOOLSZOOM 10035 +#define IDB_TOOLSMAGICWAND 10036 +#define IDB_TOOLSTEXT 10037 +#define IDB_TOOLSPAINTBRUSH 10038 +#define IDB_TOOLSERASER 10039 +#define IDB_TOOLSPENCIL 10040 +#define IDB_TOOLSCOLORPICKER 10041 +#define IDB_TOOLSCLONESTAMP 10042 +#define IDB_TOOLSRECOLORING 10043 +#define IDB_TOOLSPAINTBUCKET 10044 +#define IDB_TOOLSLINE 10045 +#define IDB_TOOLSRECTANGLE 10046 +#define IDB_TOOLSROUNDRECT 10047 +#define IDB_TOOLSECLIPSE 10048 +#define IDB_TOOLSFREEFORM 10049 + +/* toolbar buttons */ +#define TBICON_NEW 0 +#define TBICON_OPEN 1 +#define TBICON_SAVE 2 +#define TBICON_PRINT 3 +#define TBICON_PRINTPRE 4 +#define TBICON_CUT 5 +#define TBICON_COPY 6 +#define TBICON_PASTE 7 +#define TBICON_UNDO 8 +#define TBICON_REDO 9 + +#define TBICON_BOLD 0 +#define TBICON_ITALIC 1 +#define TBICON_ULINE 2 +#define TBICON_TXTLEFT 3 +#define TBICON_TXTCENTER 4 +#define TBICON_TXTRIGHT 5 + +#define TBICON_RECTSEL 0 +#define TBICON_MOVESEL 1 +#define TBICON_LASOO 2 +#define TBICON_MOVE 3 +#define TBICON_ECLIPSESEL 4 +#define TBICON_ZOOM 5 +#define TBICON_MAGICWAND 6 +#define TBICON_TEXT 7 +#define TBICON_PAINTBRUSH 8 +#define TBICON_ERASER 9 +#define TBICON_PENCIL 10 +#define TBICON_COLORPICKER 11 +#define TBICON_CLONESTAMP 12 +#define TBICON_RECOLORING 13 +#define TBICON_PAINTBUCKET 14 +#define TBICON_LINE 15 +#define TBICON_RECTANGLE 16 +#define TBICON_ROUNDRECT 17 +#define TBICON_ECLIPSE 18 +#define TBICON_FREEFORM 19 /* tooltips */ #define IDS_TOOLTIP_NEW 6000 @@ -63,58 +188,12 @@ #define IDS_TOOLTIP_UNDO 6008 #define IDS_TOOLTIP_REDO 6009 -#define IDI_ICON 50 -#define IDB_BUTTONS 51 - -/* these need to be kept consecutive */ -#define IDS_FLT_TOOLS 60 -#define IDS_FLT_COLORS 61 -#define IDS_FLT_HISTORY 62 - -/* toolbar buttons */ -#define TBICON_PROP 0 -#define TBICON_REFRESH 1 -#define TBICON_EXPORT 2 -#define TBICON_CREATE 3 -#define TBICON_START 4 -#define TBICON_STOP 5 -#define TBICON_PAUSE 6 -#define TBICON_RESTART 7 -#define TBICON_HELP 8 -#define TBICON_EXIT 9 - -#define TBICON_BOLD 0 -#define TBICON_ITALIC 1 -#define TBICON_ULINE 2 -#define TBICON_TXTLEFT 3 -#define TBICON_TXTCENTER 4 -#define TBICON_TXTRIGHT 5 - -/* about box info */ -#define IDD_ABOUTBOX 200 -#define IDC_LICENSE_EDIT 201 - -#define IDS_APPNAME 101 -#define IDS_VERSION 102 -#define IDS_LICENSE 103 -#define IDS_READY 104 -#define IDS_TOOLBAR_STANDARD 201 -#define IDS_TOOLBAR_TEST 202 -#define IDS_TOOLBAR_TEXT 203 -#define IDS_IMAGE_NAME 210 - -/* menu hints */ -#define IDS_HINT_EXIT 20001 - -/* system menu hints */ -#define IDS_HINT_SYS_RESTORE 21001 -#define IDS_HINT_SYS_MOVE 21002 -#define IDS_HINT_SYS_SIZE 21003 -#define IDS_HINT_SYS_MINIMIZE 21004 -#define IDS_HINT_SYS_MAXIMIZE 21005 -#define IDS_HINT_SYS_CLOSE 21006 -#define IDS_HINT_SYS_NEXT 21007 - +/* cursors */ +#define IDC_PAINTBRUSHCURSOR 20001 +#define IDC_PAINTBRUSHCURSORMOUSEDOWN 20002 + + +/* DIALOGS */ /* image property dialog */ #define IDD_IMAGE_PROP 4000 @@ -140,41 +219,14 @@ #define IDS_UNIT_MB 4109 #define IDS_UNIT_KB 4110 - -/* toolbar buttons resources - * these must be numbered consecutively - * see loop in InitImageList */ -#define IDB_MAINNEWICON 10000 -#define IDB_MAINOPENICON 10001 -#define IDB_MAINSAVEICON 10002 -#define IDB_MAINPRINTICON 10003 -#define IDB_MAINPRINTPREICON 10004 -#define IDB_MAINCUTICON 10005 -#define IDB_MAINCOPYICON 10006 -#define IDB_MAINPASTEICON 10007 -#define IDB_MAINUNDOICON 10008 -#define IDB_MAINREDOICON 10009 -#define IDB_TEXTBOLD 10020 -#define IDB_TEXTITALIC 10021 -#define IDB_TEXTULINE 10022 -#define IDB_TEXTLEFT 10023 -#define IDB_TEXTCENTER 10024 -#define IDB_TEXTRIGHT 10025 - - -/* toolbar buttons */ -#define TBICON_NEW 0 -#define TBICON_OPEN 1 -#define TBICON_SAVE 2 -#define TBICON_PRINT 3 -#define TBICON_PRINTPRE 4 -#define TBICON_CUT 5 -#define TBICON_COPY 6 -#define TBICON_PASTE 7 -#define TBICON_UNDO 8 -#define TBICON_REDO 9 - - -/* cursors */ -#define IDC_PAINTBRUSHCURSOR 20001 -#define IDC_PAINTBRUSHCURSORMOUSEDOWN 20002 +/* about box info */ +#define IDD_ABOUTBOX 4200 +#define IDC_LICENSE_EDIT 4201 +#define IDS_APPNAME 4202 +#define IDS_VERSION 4203 +#define IDS_LICENSE 4204 +#define IDS_READY 4205 +#define IDS_TOOLBAR_STANDARD 4206 +#define IDS_TOOLBAR_TEST 4207 +#define IDS_TOOLBAR_TEXT 4208 +#define IDS_IMAGE_NAME 4209

1 0

[gedmurphy] 21551: add Thomas' rebar fix back. I need this fix for imagesoft.
by gedmurphy＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: gedmurphy Date: Tue Apr 11 23:09:26 2006 New Revision: 21551 URL: http://svn.reactos.ru/svn/reactos?rev=21551&view=rev Log: add Thomas' rebar fix back. I need this fix for imagesoft. Modified: trunk/reactos/dll/win32/comctl32/rebar.c Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c?… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c Tue Apr 11 23:09:26 2006 @@ -1918,7 +1918,7 @@ y = clientcy; } if (infoPtr->dwStyle & CCS_VERT) { - if( x < REBAR_MINSIZE ) + if( infoPtr->uNumBands != 0 && x < REBAR_MINSIZE ) x = REBAR_MINSIZE; infoPtr->calcSize.cx = x; infoPtr->calcSize.cy = clientcy; @@ -1927,7 +1927,7 @@ if (notify && (x != origheight)) infoPtr->fStatus |= NTF_HGHTCHG; } else { - if( y < REBAR_MINSIZE ) + if( infoPtr->uNumBands != 0 && y < REBAR_MINSIZE ) y = REBAR_MINSIZE; infoPtr->calcSize.cx = clientcx; infoPtr->calcSize.cy = y;

1 0

[gedmurphy] 21550: revert comctl32 Wine sync. There are some issues with it and I don't have time to fix it at the moment.
by gedmurphy＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: gedmurphy Date: Tue Apr 11 23:03:09 2006 New Revision: 21550 URL: http://svn.reactos.ru/svn/reactos?rev=21550&view=rev Log: revert comctl32 Wine sync. There are some issues with it and I don't have time to fix it at the moment. Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/comctl_Cn.rc trunk/reactos/dll/win32/comctl32/comctl_Cs.rc trunk/reactos/dll/win32/comctl32/comctl_De.rc trunk/reactos/dll/win32/comctl32/comctl_En.rc trunk/reactos/dll/win32/comctl32/comctl_Es.rc trunk/reactos/dll/win32/comctl32/comctl_Fr.rc trunk/reactos/dll/win32/comctl32/comctl_Hu.rc trunk/reactos/dll/win32/comctl32/comctl_It.rc trunk/reactos/dll/win32/comctl32/comctl_Ja.rc trunk/reactos/dll/win32/comctl32/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/comctl_Nl.rc trunk/reactos/dll/win32/comctl32/comctl_Pl.rc trunk/reactos/dll/win32/comctl32/comctl_Pt.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/comctl_Si.rc trunk/reactos/dll/win32/comctl32/comctl_Th.rc trunk/reactos/dll/win32/comctl32/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/progress.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/treeview.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.spec (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.spec Tue Apr 11 23:03:09 2006 @@ -106,13 +106,13 @@ 412 stdcall -noname RemoveWindowSubclass(long ptr long) 413 stdcall -noname DefSubclassProc(long long long long) 414 stdcall -noname MirrorIcon(ptr ptr) -415 stdcall -noname DrawTextWrap(long wstr long ptr long) user32.DrawTextW -416 stdcall -noname DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW -417 stdcall -noname ExtTextOutWrap(long long long long ptr wstr long ptr) gdi32.ExtTextOutW -418 stdcall -noname GetCharWidthWrap(long long long long) gdi32.GetCharWidthW -419 stdcall -noname GetTextExtentPointWrap(long wstr long ptr) gdi32.GetTextExtentPointW -420 stdcall -noname GetTextExtentPoint32Wrap(long wstr long ptr) gdi32.GetTextExtentPoint32W -421 stdcall -noname TextOutWrap(long long long wstr long) gdi32.TextOutW +415 stdcall DrawTextWrap(long wstr long ptr long) user32.DrawTextW +416 stdcall DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW +417 stdcall ExtTextOutWrap(long long long long ptr wstr long ptr) gdi32.ExtTextOutW +418 stdcall GetCharWidthWrap(long long long long) gdi32.GetCharWidthW +419 stdcall GetTextExtentPointWrap(long wstr long ptr) gdi32.GetTextExtentPointW +420 stdcall GetTextExtentPoint32Wrap(long wstr long ptr) gdi32.GetTextExtentPoint32W +421 stdcall TextOutWrap(long long long wstr long) gdi32.TextOutW # Functions imported by name Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32undoc.c (original) +++ trunk/reactos/dll/win32/comctl32/comctl32undoc.c Tue Apr 11 23:03:09 2006 @@ -386,8 +386,10 @@ UINT i; LPSTR dataA = NULL; - if (!mp->extview.lpfnCompare) + if (!mp->extview.lpfnCompare) { + ERR("MRU list not properly created. No compare procedure.\n"); return -1; + } if(!(mp->extview.dwFlags & MRUF_BINARY_LIST) && !mp->isUnicode) { DWORD len = WideCharToMultiByte(CP_ACP, 0, lpData, -1, Modified: trunk/reactos/dll/win32/comctl32/comctl_Cn.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_C… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Cn.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Cn.rc Tue Apr 11 23:03:09 2006 @@ -1,90 +1,90 @@ -/* - * Copyright 2002 Tisheng Chen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(936) - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "ÊôÐÔ " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "È·¶¨", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "È¡Ïû", IDCANCEL,58,122,50,14 - PUSHBUTTON "Ó¦ÓÃ(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "°ïÖú", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< ÉÏÒ»²½(&B)", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "ÏÂÒ»²½(&N) >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "½áÊø", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "È¡Ïû", IDCANCEL,178,138,50,14 - PUSHBUTTON "°ïÖú", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "×Ô¶¨Òå¹¤¾ßÀ¸" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "¹Ø±Õ(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "ÖØÖÃ(&e)", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "°ïÖú(&H)", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "ÉÏÒÆ(&U)", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "ÏÂÒÆ(&D)", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "¿ÉÓÃ¹¤¾ßÀ¸°´Å¥(&V):", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "Ìí¼Ó(&A) ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- É¾³ý(&R)", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "µ±Ç°¹¤¾ßÀ¸°´Å¥(&T):", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "¹Ø±Õ" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Today:" - IDM_GOTODAY "Go to today" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "·Ö¸ô·û" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "None" -} - -#pragma code_page(default) +/* + * Copyright 2002 Tisheng Chen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +#pragma code_page(936) + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "ÊôÐÔ " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "È·¶¨", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "È¡Ïû", IDCANCEL,58,122,50,14 + PUSHBUTTON "Ó¦ÓÃ(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "°ïÖú", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< ÉÏÒ»²½(&B)", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "ÏÂÒ»²½(&N) >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "½áÊø", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "È¡Ïû", IDCANCEL,178,138,50,14 + PUSHBUTTON "°ïÖú", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "×Ô¶¨Òå¹¤¾ßÀ¸" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "¹Ø±Õ(&C)", IDCANCEL,308,6,44,14 + PUSHBUTTON "ÖØÖÃ(&e)", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "°ïÖú(&H)", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "ÉÏÒÆ(&U)", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "ÏÂÒÆ(&D)", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "¿ÉÓÃ¹¤¾ßÀ¸°´Å¥(&V):", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "Ìí¼Ó(&A) ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- É¾³ý(&R)", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "µ±Ç°¹¤¾ßÀ¸°´Å¥(&T):", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "¹Ø±Õ" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Today:" + IDM_GOTODAY "Go to today" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "·Ö¸ô·û" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "None" +} + +#pragma code_page(default) Modified: trunk/reactos/dll/win32/comctl32/comctl_Cs.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_C… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Cs.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Cs.rc Tue Apr 11 23:03:09 2006 @@ -1,93 +1,90 @@ -/* Hey, Emacs, open this file with -*- coding: cp1250 -*- - * - * Copyright 1999 Eric Kohl - * - * Czech resources for comctl32 - * Copyright 2004 David Kredba - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -/* Czech strings in CP1250 */ - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Vlastnosti " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Storno", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Pouít", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Nápovìda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Prùvodce" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Zpìt", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Dalí >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Dokonèit", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Storno", IDCANCEL,178,138,50,14 - PUSHBUTTON "Nápovìda", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Nastavení panelu" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Zavøít", IDCANCEL,308,6,44,14 - PUSHBUTTON "&Výchozí", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Nápovìda", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Nahor&u", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "&Dolù", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "D&ostupná tlaèítka:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "Pøid&at ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- Odeb&rat", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Tlaèítka panelu:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Zavøít" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Dnes:" - IDM_GOTODAY "Jdi na dneek" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Oddìlovaè" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "ádný" -} +/* + * Copyright 1999 Eric Kohl + * + * Czech resources for comctl32 + * Copyright 2004 David Kredba + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Vlastnosti " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Storno", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Pou¾ít", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Nápovìda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Prùvodce" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Zpìt", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Dal¹í >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Dokonèit", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Storno", IDCANCEL,178,138,50,14 + PUSHBUTTON "Nápovìda", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Nastavení panelu" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Zavøít", IDCANCEL,308,6,44,14 + PUSHBUTTON "&Výchozí", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Nápovìda", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Nahor&u", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "&Dolù", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "D&ostupná tlaèítka:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "Pøid&at ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- Odeb&rat", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Tlaèítka panelu:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Zavøít" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Dnes:" + IDM_GOTODAY "Jdi na dne¹ek" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Oddìlovaè" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "®ádný" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_D… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_De.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_De.rc Tue Apr 11 23:03:09 2006 @@ -1,87 +1,87 @@ -/* - * Copyright 2000 Uwe Bonnes - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Schließen" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Heute:" - IDM_GOTODAY "Gehe zu Heute" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Trennzeichen" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "Keiner" -} - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Eigenschaften für " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "A&bbrechen", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Anwenden", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "&Hilfe", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Zurück", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Abbrechen", IDCANCEL,178,138,50,14 - PUSHBUTTON "&Hilfe", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Toolbar einrichten" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Schließen", IDCANCEL,308,6,44,14 - PUSHBUTTON "&Zurücksetzen", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Hilfe", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Nach &Oben verschieben", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Nach &Unten verschieben", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "&Vorhandene Knöpfe:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "H&inzufügen ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Löschen", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Toolbarknöpfe:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END +/* + * Copyright 2000 Uwe Bonnes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Schließen" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Heute:" + IDM_GOTODAY "Gehe zu Heute" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Trennzeichen" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Keiner" +} + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Eigenschaften für " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "A&bbrechen", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Anwenden", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "&Hilfe", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Zurück", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Abbrechen", IDCANCEL,178,138,50,14 + PUSHBUTTON "&Hilfe", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Toolbar einrichten" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Schließen", IDCANCEL,308,6,44,14 + PUSHBUTTON "&Zurücksetzen", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Hilfe", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Nach &Oben verschieben", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Nach &Unten verschieben", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Vorhandene Knöpfe:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "H&inzufügen ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Löschen", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Toolbarknöpfe:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END Modified: trunk/reactos/dll/win32/comctl32/comctl_En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_E… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_En.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_En.rc Tue Apr 11 23:03:09 2006 @@ -1,87 +1,87 @@ -/* - * Copyright 1999 Eric Kohl - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Apply", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Back", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Finish", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Cancel", IDCANCEL,178,138,50,14 - PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Customize Toolbar" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Close", IDCANCEL,308,6,44,14 - PUSHBUTTON "R&eset", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Help", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Move &Up", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Move &Down", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "A&vailable buttons:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Add ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Remove", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Toolbar buttons:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Close" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Today:" - IDM_GOTODAY "Go to today" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Separator" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "None" -} +/* + * Copyright 1999 Eric Kohl + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Properties for " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Apply", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Back", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Finish", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Cancel", IDCANCEL,178,138,50,14 + PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Customize Toolbar" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Close", IDCANCEL,308,6,44,14 + PUSHBUTTON "R&eset", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Help", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Move &Up", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Move &Down", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "A&vailable buttons:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Add ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Remove", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Toolbar buttons:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Close" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Today:" + IDM_GOTODAY "Go to today" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Separator" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "None" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_E… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Es.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Es.rc Tue Apr 11 23:03:09 2006 @@ -1,87 +1,87 @@ -/* - * Copyright 2003 José Manuel Ferrer Ortiz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propiedades de " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Ayuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ayudante" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Anterior", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Siguiente >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Terminar", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14 - PUSHBUTTON "Ayuda", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Personalizar barra de herramientas" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Cerrar", IDCANCEL,308,6,44,14 - PUSHBUTTON "R&estaurar", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Ayuda", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Mover A&rriba", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Mover A&bajo", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "Botones &disponibles:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "A&ñadir ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Eliminar", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "B&otones de la barra:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Cerrar" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Hoy:" - IDM_GOTODAY "Ir a hoy" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Separador" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "Ninguno" -} +/* + * Copyright 2003 José Manuel Ferrer Ortiz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Propiedades de " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Ayuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Ayudante" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Anterior", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Siguiente >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Terminar", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14 + PUSHBUTTON "Ayuda", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Personalizar barra de herramientas" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Cerrar", IDCANCEL,308,6,44,14 + PUSHBUTTON "R&estaurar", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Ayuda", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Mover A&rriba", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Mover A&bajo", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "Botones &disponibles:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "A&ñadir ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Eliminar", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "B&otones de la barra:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Cerrar" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Hoy:" + IDM_GOTODAY "Ir a hoy" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Separador" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Ninguno" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_F… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Fr.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Fr.rc Tue Apr 11 23:03:09 2006 @@ -1,91 +1,91 @@ -/* - * Comctl32 - * French language support - * - * Copyright 1999 Eric Kohl - * Copyright 2003 Vincent Béron - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriétés pour " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Annuler", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Appliquer", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Aide", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "onglet", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Assistant" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Précédent", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Suivant >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Terminer", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Annuler", IDCANCEL,178,138,50,14 - PUSHBUTTON "Aide", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Onglet", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Personnaliser la barre d'outils" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Fermer", IDCANCEL,308,6,44,14 - PUSHBUTTON "&Réinitialiser", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Aide", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "&Monter", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "&Descendre", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "Boutons disponibles :", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "A&jouter ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Enlever", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Boutons de la barre d'outils :", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Fermer" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Aujourd'hui:" - IDM_GOTODAY "Aller à aujourd'hui" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Séparateur" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "Aucun" -} +/* + * Comctl32 + * French language support + * + * Copyright 1999 Eric Kohl + * Copyright 2003 Vincent Béron + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Propriétés pour " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Annuler", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Appliquer", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Aide", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "onglet", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Assistant" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Précédent", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Suivant >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Terminer", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Annuler", IDCANCEL,178,138,50,14 + PUSHBUTTON "Aide", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Onglet", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Personnaliser la barre d'outils" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Fermer", IDCANCEL,308,6,44,14 + PUSHBUTTON "&Réinitialiser", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Aide", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "&Monter", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "&Descendre", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "Boutons disponibles :", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "A&jouter ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Enlever", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Boutons de la barre d'outils :", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Fermer" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Aujourd'hui:" + IDM_GOTODAY "Aller à aujourd'hui" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Séparateur" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Aucun" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_H… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Hu.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Hu.rc Tue Apr 11 23:03:09 2006 @@ -1,5 +1,8 @@ /* - * Copyright 2006 Andras Kovacs + * Hungarian resources for comctl32 + * + * Copyright 1999 Eric Kohl + * Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,33 +19,33 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Tulajdonságok: " +CAPTION "Beállítások " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP PUSHBUTTON "Mégse", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Alkalmazás", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Súgó", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Fül", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 + PUSHBUTTON "&Alkalmaz", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "&Súgó", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Varázsló" +CAPTION "Telepítõ" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "< &Elõzõ", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Következõ >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Kész", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "< &Vissza", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Tovább >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Befejezés", IDC_FINISH_BUTTON,121,138,50,14 PUSHBUTTON "Mégse", IDCANCEL,178,138,50,14 PUSHBUTTON "Súgó", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Fül", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE END @@ -52,36 +55,36 @@ CAPTION "Eszköztár testreszabása" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Bezárás", IDCANCEL,308,6,44,14 - PUSHBUTTON "Alaph&elyzet", IDC_RESET_BTN,308,23,44,14 + DEFPUSHBUTTON "&Bezár", IDCANCEL,308,6,44,14 + PUSHBUTTON "V&isszaállít", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "&Súgó", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "&Fel", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "&Le", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "El&érhetõ gombok:", -1,4,5,84,10 + LTEXT "&Elérhetõ gombok:", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Hozzáad ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- El&vesz", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "E&szköztár gombok:", -1,182,5,78,10 + PUSHBUTTON "<- &Töröl", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "Eszköz&tár gombjai:", -1,182,5,78,10 LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END STRINGTABLE DISCARDABLE { - IDS_CLOSE "Bezárás" + IDS_CLOSE "Bezár" } STRINGTABLE DISCARDABLE { IDM_TODAY "Ma:" - IDM_GOTODAY "Ugrás mára" + IDM_GOTODAY "Mai nap" } STRINGTABLE DISCARDABLE { - IDS_SEPARATOR "Elválasztó" + IDS_SEPARATOR "Separator" } STRINGTABLE DISCARDABLE { - HKY_NONE "Nincs" + HKY_NONE "Ismeretlen" } Modified: trunk/reactos/dll/win32/comctl32/comctl_It.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_I… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_It.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_It.rc Tue Apr 11 23:03:09 2006 @@ -1,88 +1,88 @@ -/* - * Copyright 1999 Eric Kohl - * Copyright 2003 Ivan Leo Puoti - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Proprietà per " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Annulla", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Applica", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Aiuto", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Linguetta", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Indietro", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Avanti >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Fine", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Anulla", IDCANCEL,178,138,50,14 - PUSHBUTTON "Aiuto", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Linguetta", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Personalitta la barra degli strumenti" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Chiudi", IDCANCEL,308,6,44,14 - PUSHBUTTON "R&eimpostare", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Aiuto", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Muovi &Su", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Muovi &giù", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "&Tasti disponibili:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Aggiungi ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Rimuovi", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Tast della barra degli strumenti:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Chiudi" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Oggi:" - IDM_GOTODAY "Vai a oggi" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Separatore" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "Nessuno" -} +/* + * Copyright 1999 Eric Kohl + * Copyright 2003 Ivan Leo Puoti + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Proprietà per " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Annulla", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Applica", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Aiuto", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Linguetta", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Indietro", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Avanti >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Fine", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Anulla", IDCANCEL,178,138,50,14 + PUSHBUTTON "Aiuto", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Linguetta", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Personalitta la barra degli strumenti" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Chiudi", IDCANCEL,308,6,44,14 + PUSHBUTTON "R&eimpostare", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Aiuto", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Muovi &Su", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Muovi &giù", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Tasti disponibili:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Aggiungi ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Rimuovi", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Tast della barra degli strumenti:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Chiudi" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Oggi:" + IDM_GOTODAY "Vai a oggi" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Separatore" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Nessuno" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Ja.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_J… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Ja.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ja.rc Tue Apr 11 23:03:09 2006 @@ -1,87 +1,87 @@ -/* - * Copyright 2003 Hajime Segawa - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " -FONT 9, "MS UI Gothic" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "LZ", IDCANCEL,58,122,50,14 - PUSHBUTTON "Kp(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "wv", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" -FONT 9, "MS UI Gothic" -BEGIN - PUSHBUTTON "< ßé(&B)", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "iÞ(&N) >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "®¹", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "LZ", IDCANCEL,178,138,50,14 - PUSHBUTTON "wv", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Customize Toolbar" -FONT 9, "MS UI Gothic" -BEGIN - DEFPUSHBUTTON "Â¶é(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "Zbg(R&)", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "wv(&H)", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "ãÖ (&U)", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "ºÖ (&D)", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "A&vailable buttons:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "ÇÁ(&A) ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- í(&R)", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Toolbar buttons:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Close" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Today:" - IDM_GOTODAY "Go to today" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Separator" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "None" -} +/* + * Copyright 2003 Hajime Segawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Properties for " +FONT 9, "MS UI Gothic" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "LZ", IDCANCEL,58,122,50,14 + PUSHBUTTON "Kp(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "wv", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "^u", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "EBU[h" +FONT 9, "MS UI Gothic" +BEGIN + PUSHBUTTON "< ßé(&B)", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "iÞ(&N) >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "®¹", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "LZ", IDCANCEL,178,138,50,14 + PUSHBUTTON "wv", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "^u", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "c[ o[ÌJX^}CY" +FONT 9, "MS UI Gothic" +BEGIN + DEFPUSHBUTTON "Â¶é(&C)", IDCANCEL,308,6,44,14 + PUSHBUTTON "Zbg(&E)", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "wv(&H)", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "ãÖ (&U)", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "ºÖ (&D)", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "gpÅ«é{^(&V):", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "ÇÁ(&A) ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- í(&R)", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "c[ o[Ì{^(&T):", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Â¶é" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "¡ú:" + IDM_GOTODAY "¡úÖÚ®" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "æØèü" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Èµ" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_K… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Ko.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ko.rc Tue Apr 11 23:03:09 2006 @@ -1,83 +1,83 @@ -/* - * Copyright 2002 Won-kyu Park <wkpark(a)kldp.org> - * Copyright 2005 YunSong Hwang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "¼Ó¼º" -FONT 9, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "È®ÀÎ", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Ãë¼Ò", IDCANCEL,58,122,50,14 - PUSHBUTTON "Àû¿ë(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "µµ¿ò¸»", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "ÅÇ", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "¸¶¹ý»ç" -FONT 9, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< ÀÌÀü(&B)", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "´ÙÀ½(&N) >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Á¾·á", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Ãë¼Ò", IDCANCEL,178,138,50,14 - PUSHBUTTON "µµ¿ò¸»", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "ÅÇ", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "µµ±¸¹Ù »ç¿ëÀÚ Á¤ÀÇ" -FONT 9, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "´Ý±â(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "´Ù½Ã(&e)", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "µµ¿ò¸»(&H)", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "À§·Î ÀÌµ¿(&U)", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "¾Æ·¡·Î ÀÌµ¿(&D)", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "°¡´ÉÇÑ ¹öÆ°(&v)", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "´õÇÏ±â(&A) ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- Á¦°ÅÇÏ±â(&R)", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "µµ±¸¹Ù ¹öÆ°(&T):", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "´Ý±â" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "¿À´Ã:" - IDM_GOTODAY "¿À´Ã·Î °¡±â" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "ºÐ¸®ÀÚ" -} +/* + * Copyright 2002 Won-kyu Park <wkpark(a)kldp.org> + * Copyright 2005 YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "¼Ó¼º" +FONT 9, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "È®ÀÎ", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Ãë¼Ò", IDCANCEL,58,122,50,14 + PUSHBUTTON "Àû¿ë(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "µµ¿ò¸»", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "ÅÇ", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "¸¶¹ý»ç" +FONT 9, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< ÀÌÀü(&B)", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "´ÙÀ½(&N) >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Á¾·á", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Ãë¼Ò", IDCANCEL,178,138,50,14 + PUSHBUTTON "µµ¿ò¸»", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "ÅÇ", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "µµ±¸¹Ù »ç¿ëÀÚ Á¤ÀÇ" +FONT 9, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "´Ý±â(&C)", IDCANCEL,308,6,44,14 + PUSHBUTTON "´Ù½Ã(&e)", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "µµ¿ò¸»(&H)", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "À§·Î ÀÌµ¿(&U)", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "¾Æ·¡·Î ÀÌµ¿(&D)", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "°¡´ÉÇÑ ¹öÆ°(&v)", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "´õÇÏ±â(&A) ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- Á¦°ÅÇÏ±â(&R)", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "µµ±¸¹Ù ¹öÆ°(&T):", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "´Ý±â" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "¿À´Ã:" + IDM_GOTODAY "¿À´Ã·Î °¡±â" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "ºÐ¸®ÀÚ" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_N… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Nl.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Nl.rc Tue Apr 11 23:03:09 2006 @@ -1,89 +1,89 @@ -/* - * comctl (Dutch resources) - * - * Copyright 2003 Hans Leidekker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Eigenschappen van " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Annuleren", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Toepassen", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tabblad", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Assistent" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< V&orige", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Volgende >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "BeÃ«indigen", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Annuleren", IDCANCEL,178,138,50,14 - PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tabblad", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Gereedschappenbalk aanpassen" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Afsluiten", IDCANCEL,308,6,44,14 - PUSHBUTTON "&Reset", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Help", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Verplaats Om&hoog", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Verplaats Om&laag", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "&Beschikbare knoppen:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Toevoegen ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Verwijderen", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Knoppen:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Sluiten" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Vandaag:" - IDM_GOTODAY "Ga vandaag naar" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Scheidingsteken" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "Geen" -} +/* + * comctl (Dutch resources) + * + * Copyright 2003 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Eigenschappen van " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Annuleren", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Toepassen", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tabblad", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Assistent" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< V&orige", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Volgende >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "BeÃ«indigen", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Annuleren", IDCANCEL,178,138,50,14 + PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tabblad", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Gereedschappenbalk aanpassen" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Afsluiten", IDCANCEL,308,6,44,14 + PUSHBUTTON "&Reset", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Help", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Verplaats Om&hoog", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Verplaats Om&laag", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Beschikbare knoppen:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Toevoegen ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Verwijderen", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Knoppen:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Sluiten" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Vandaag:" + IDM_GOTODAY "Ga vandaag naar" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Scheidingsteken" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Geen" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Pl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_P… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Pl.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Pl.rc Tue Apr 11 23:03:09 2006 @@ -1,83 +1,83 @@ -/* - * Copyright 1999 Eric Kohl - * Copyright 2002 Jacek Bator - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "W³aciwoci " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Anuluj", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Zastosuj", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Pomoc", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Kreator" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Wstecz", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Dalej >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Zakoñcz", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Anuluj", IDCANCEL,178,138,50,14 - PUSHBUTTON "Pomoc", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Dostosowywanie paska narzêdzi" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Zamknij", IDCANCEL,308,6,44,14 - PUSHBUTTON "Z&resetuj", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Pomoc", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Przenie &w górê", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Przenie w &dó³", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "Do&stêpne przyciski:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "D&odaj ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Usuñ", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Przyciski paska narzêdzi:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Zamknij" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Dzi:" - IDM_GOTODAY "Id do dzi" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Odstêp" -} +/* + * Copyright 1999 Eric Kohl + * Copyright 2002 Jacek Bator + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "W³aciwoci " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Anuluj", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Zastosuj", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Pomoc", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Kreator" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Wstecz", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Dalej >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Zakoñcz", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Anuluj", IDCANCEL,178,138,50,14 + PUSHBUTTON "Pomoc", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Dostosowywanie paska narzêdzi" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Zamknij", IDCANCEL,308,6,44,14 + PUSHBUTTON "Z&resetuj", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Pomoc", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Przenie &w górê", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Przenie w &dó³", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "Do&stêpne przyciski:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "D&odaj ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Usuñ", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Przyciski paska narzêdzi:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Zamknij" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Dzi:" + IDM_GOTODAY "Id do dzi" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Odstêp" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_P… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Pt.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Pt.rc Tue Apr 11 23:03:09 2006 @@ -1,87 +1,87 @@ -/* - * Copyright 2003 Marcelo Duarte - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriedades para " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Assistente" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Voltar", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Avançar >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Finalizar", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14 - PUSHBUTTON "Ajuda", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Personalizar barra de ferramentas" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Fechar", IDCANCEL,308,6,44,14 - PUSHBUTTON "R&estaurar", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Ajuda", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "A&cima", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "A&baixo", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "Botões &disponíveis:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Adicionar ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Remover", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Botões da barra de ferramentas:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Fechar" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Hoje:" - IDM_GOTODAY "Ir para hoje" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Separador" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "Nenhum" -} +/* + * Copyright 2003 Marcelo Duarte + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Propriedades para " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Assistente" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Voltar", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Avançar >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Finalizar", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14 + PUSHBUTTON "Ajuda", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Personalizar barra de ferramentas" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Fechar", IDCANCEL,308,6,44,14 + PUSHBUTTON "R&estaurar", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Ajuda", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "A&cima", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "A&baixo", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "Botões &disponíveis:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Adicionar ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Remover", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Botões da barra de ferramentas:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Fechar" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Hoje:" + IDM_GOTODAY "Ir para hoje" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Separador" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Nenhum" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_R… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Ru.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ru.rc Tue Apr 11 23:03:09 2006 @@ -1,89 +1,89 @@ -/* - * comctl (Russian resources) - * - * Copyright 2003 Igor Stepin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ñâîéñòâà äëÿ " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Îòìåíà", IDCANCEL,58,122,50,14 - PUSHBUTTON "Ïðè&ìåíèòü", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "&Ñïðàâêà", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ìàñòåð" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Äàëåå >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Çàâåðøèòü", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Îòìåíà", IDCANCEL,178,138,50,14 - PUSHBUTTON "&Ñïðàâêà", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Íàñòðîéêà ïàíåëè èíñòðóìåíòîâ" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Çàêðûòü", IDCANCEL,308,6,44,14 - PUSHBUTTON "Ñ&áðîñèòü", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Ñïðàâêà", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Ïåðåìåñòèòü &ââåðõ", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Ïåðåìåñòèòü &âíèç", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "&Äîñòóïíûå êíîïêè:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Äîáàâèòü ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Óäàëèòü", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Êíîïêè ïàíåëè èíñòðóìåíòîâ:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Çàêðûòü" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Ñåãîäíÿ:" - IDM_GOTODAY "Òåêóùàÿ äàòà" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Ðàçäåëèòåëü" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "Íåò" -} +/* + * comctl (Russian resources) + * + * Copyright 2003 Igor Stepin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Ñâîéñòâà äëÿ " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Îòìåíà", IDCANCEL,58,122,50,14 + PUSHBUTTON "Ïðè&ìåíèòü", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "&Ñïðàâêà", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Ìàñòåð" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Äàëåå >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Çàâåðøèòü", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Îòìåíà", IDCANCEL,178,138,50,14 + PUSHBUTTON "&Ñïðàâêà", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Íàñòðîéêà ïàíåëè èíñòðóìåíòîâ" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Çàêðûòü", IDCANCEL,308,6,44,14 + PUSHBUTTON "Ñ&áðîñèòü", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Ñïðàâêà", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Ïåðåìåñòèòü &ââåðõ", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Ïåðåìåñòèòü &âíèç", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Äîñòóïíûå êíîïêè:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Äîáàâèòü ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Óäàëèòü", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Êíîïêè ïàíåëè èíñòðóìåíòîâ:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Çàêðûòü" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Ñåãîäíÿ:" + IDM_GOTODAY "Òåêóùàÿ äàòà" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Ðàçäåëèòåëü" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Íåò" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_S… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Si.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Si.rc Tue Apr 11 23:03:09 2006 @@ -1,82 +1,82 @@ -/* - * Copyright 2002-2003 Rok Mandeljc <rok.mandeljc(a)gimb.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Lastnosti" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "V redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Preklièi", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Uporabi", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Pomoè", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Èarovnik" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< Na&zaj", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "Naprej >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Dokonèaj", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Preklièi", IDCANCEL,178,138,50,14 - PUSHBUTTON "Pomoè", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Prilagoditev orodne vrstice" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Zapri", IDCANCEL,308,6,44,14 - PUSHBUTTON "Po&nastavi", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Pomoè", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "N&avzgor", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Na&vzdol", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "&Gumbi na voljo:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Dodaj ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Odstrani", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "G&umbi orodne vrstice:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Zapri" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Danes:" - IDM_GOTODAY "&Poglejte danes" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Loèilo" -} +/* + * Copyright 2002-2003 Rok Mandeljc <rok.mandeljc(a)gimb.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Lastnosti" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "V redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Preklièi", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Uporabi", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Pomoè", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Èarovnik" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< Na&zaj", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "Naprej >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Dokonèaj", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Preklièi", IDCANCEL,178,138,50,14 + PUSHBUTTON "Pomoè", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Prilagoditev orodne vrstice" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Zapri", IDCANCEL,308,6,44,14 + PUSHBUTTON "Po&nastavi", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Pomoè", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "N&avzgor", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Na&vzdol", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Gumbi na voljo:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Dodaj ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Odstrani", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "G&umbi orodne vrstice:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Zapri" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Danes:" + IDM_GOTODAY "&Poglejte danes" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Loèilo" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Th.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_T… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Th.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Th.rc Tue Apr 11 23:03:09 2006 @@ -1,87 +1,87 @@ -/* - * Copyright 2003 Jon Griffiths - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_THAI, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "µ¡Å§", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL,58,122,50,14 - PUSHBUTTON "ÁÕ¼Å·Ñ¹·Õ", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "ªèÇÂàËÅÕÍ", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< ÂéÍ¹¡ÅÑº", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "µèÍä» >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "·íÒãËéàÊÃç¨", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL,178,138,50,14 - PUSHBUTTON "ªèÇÂàËÅÕÍ", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "»ÃÑºáµè§á¶ºà¤Ã×èÍ§Á×Í" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "»Ô´", IDCANCEL,308,6,44,14 - PUSHBUTTON "á¡éÍÍ¡", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "ªèÇÂàËÅÕÍ", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "ÂéÒÂ¢Öé¹", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "ÂéÒÂÅ§", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "·ÕàÅ×Í¡ä´é:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "ºÇ¡ ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- ¶Í´ÍÍ¡", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "¡ÒÃ¡ÃÐ·íÒá¶ºà¤Ã×èÍ§Á×Í:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "»Õ´" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "ÇÑ¹¹Õé:" - IDM_GOTODAY "ä»¶Ö§ÇÑ¹¹Õé" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Separator" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "äÁèÁÕàÅÂ" -} +/* + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "µ¡Å§", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL,58,122,50,14 + PUSHBUTTON "ÁÕ¼Å·Ñ¹·Õ", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "ªèÇÂàËÅÕÍ", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< ÂéÍ¹¡ÅÑº", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "µèÍä» >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "·íÒãËéàÊÃç¨", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL,178,138,50,14 + PUSHBUTTON "ªèÇÂàËÅÕÍ", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "»ÃÑºáµè§á¶ºà¤Ã×èÍ§Á×Í" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "»Ô´", IDCANCEL,308,6,44,14 + PUSHBUTTON "á¡éÍÍ¡", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "ªèÇÂàËÅÕÍ", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "ÂéÒÂ¢Öé¹", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "ÂéÒÂÅ§", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "·ÕàÅ×Í¡ä´é:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "ºÇ¡ ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- ¶Í´ÍÍ¡", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "¡ÒÃ¡ÃÐ·íÒá¶ºà¤Ã×èÍ§Á×Í:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "»Õ´" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "ÇÑ¹¹Õé:" + IDM_GOTODAY "ä»¶Ö§ÇÑ¹¹Õé" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Separator" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "äÁèÁÕàÅÂ" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_U… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Uk.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Uk.rc Tue Apr 11 23:03:09 2006 @@ -1,89 +1,89 @@ -/* - * comctl (Ukrainian resources) - * - * Copyright 2004 Ilya Korniyko - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Âëàñòèâîñò³ äëÿ " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&Â³äì³íà", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Çàñòîñóâàòè", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "&Äîâ³äêà", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ìàñòåð" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Äàë³ >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "&Çàâåðøèòè", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "&Â³äì³íà", IDCANCEL,178,138,50,14 - PUSHBUTTON "&Äîâ³äêà", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Íàñòðîéêà ïàíåë³ ³íñòðóìåíò³â" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Çàêðèòè", IDCANCEL,308,6,44,14 - PUSHBUTTON "&Ñêèíóòè", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Äîâ³äêà", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Ïåðåñóíóòè â&ãîðó", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Ïåðåñóíóòè äî&íèçó", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "Íà&ÿâí³ êíîïêè:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Äîäàòè ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Ïðèáðàòè", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Êíîïêè ïàíåë³ ³íñòðóìåíò³â:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Çàêðèòè" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Ñüîãîäí³:" - IDM_GOTODAY "Ïîòî÷íà äàòà" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Ðîçä³ëüíèê" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "Íåìà" -} +/* + * comctl (Ukrainian resources) + * + * Copyright 2004 Ilya Korniyko + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Âëàñòèâîñò³ äëÿ " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&Â³äì³íà", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Çàñòîñóâàòè", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "&Äîâ³äêà", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Ìàñòåð" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Äàë³ >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Çàâåðøèòè", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "&Â³äì³íà", IDCANCEL,178,138,50,14 + PUSHBUTTON "&Äîâ³äêà", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Íàñòðîéêà ïàíåë³ ³íñòðóìåíò³â" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Çàêðèòè", IDCANCEL,308,6,44,14 + PUSHBUTTON "&Ñêèíóòè", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Äîâ³äêà", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Ïåðåñóíóòè â&ãîðó", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Ïåðåñóíóòè äî&íèçó", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "Íà&ÿâí³ êíîïêè:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Äîäàòè ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Ïðèáðàòè", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Êíîïêè ïàíåë³ ³íñòðóìåíò³â:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Çàêðèòè" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Ñüîãîäí³:" + IDM_GOTODAY "Ïîòî÷íà äàòà" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Ðîçä³ëüíèê" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Íåìà" +} Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/header.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/header.c (original) +++ trunk/reactos/dll/win32/comctl32/header.c Tue Apr 11 23:03:09 2006 @@ -166,7 +166,6 @@ RECT r; INT oldBkMode, cxEdge = GetSystemMetrics(SM_CXEDGE); HTHEME theme = GetWindowTheme (hwnd); - NMCUSTOMDRAW nmcd; TRACE("DrawItem(iItem %d bHotTrack %d unicode flag %d)\n", iItem, bHotTrack, infoPtr->bUnicode); @@ -206,24 +205,22 @@ r.left -= cxEdge; r.right += cxEdge; - /* Set the colors before sending NM_CUSTOMDRAW so that it can change them */ - SetTextColor (hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); - SetBkColor(hdc, GetSysColor(COLOR_3DFACE)); - - nmcd.hdr.hwndFrom = hwnd; - nmcd.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); - nmcd.hdr.code = NM_CUSTOMDRAW; - nmcd.dwDrawStage = CDDS_PREPAINT | CDDS_ITEM | CDDS_ITEMPOSTERASE; - nmcd.hdc = hdc; - nmcd.dwItemSpec = iItem; - nmcd.rc = r; - nmcd.uItemState = phdi->bDown ? CDIS_SELECTED : 0; - nmcd.lItemlParam = phdi->lParam; - - SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (phdi->fmt & HDF_OWNERDRAW) { DRAWITEMSTRUCT dis; + NMCUSTOMDRAW nmcd; + + nmcd.hdr.hwndFrom = hwnd; + nmcd.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); + nmcd.hdr.code = NM_CUSTOMDRAW; + nmcd.dwDrawStage = CDDS_PREPAINT | CDDS_ITEM | CDDS_ITEMPOSTERASE; + nmcd.hdc = hdc; + nmcd.dwItemSpec = iItem; + nmcd.rc = r; + nmcd.uItemState = phdi->bDown ? CDIS_SELECTED : 0; + nmcd.lItemlParam = phdi->lParam; + + SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, + (WPARAM)nmcd.hdr.idFrom, (LPARAM)&nmcd); dis.CtlType = ODT_HEADER; dis.CtlID = GetWindowLongPtrW (hwnd, GWLP_ID); @@ -252,14 +249,6 @@ rw = r.right - r.left; rh = r.bottom - r.top; - if (theme == NULL) { - HBRUSH hbr = CreateSolidBrush(GetBkColor(hdc)); - RECT rcBackground = r; - - rcBackground.right -= cxEdge; - FillRect(hdc, &rcBackground, hbr); - DeleteObject(hbr); - } if (phdi->fmt & HDF_STRING) { RECT textRect; @@ -330,8 +319,8 @@ if (iw || bw) { HDC hClipDC = GetDC(hwnd); HRGN hClipRgn = CreateRectRgn(r.left, r.top, r.right, r.bottom); + SelectClipRgn(hClipDC, hClipRgn); - if (bw) { HDC hdcBitmap = CreateCompatibleDC (hClipDC); SelectObject (hdcBitmap, phdi->hbm); @@ -355,6 +344,7 @@ HDF_BITMAP_ON_RIGHT|HDF_IMAGE)))) /* no explicit format specified? */ && (phdi->pszText)) { oldBkMode = SetBkMode(hdc, TRANSPARENT); + SetTextColor (hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); r.left = tx; r.right = tx + tw; DrawTextW (hdc, phdi->pszText, -1, Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/listview… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c (original) +++ trunk/reactos/dll/win32/comctl32/listview.c Tue Apr 11 23:03:09 2006 @@ -172,6 +172,7 @@ #include <assert.h> #include <ctype.h> #include <string.h> +#include <stddef.h> #include <stdlib.h> #include <stdarg.h> #include <stdio.h> @@ -396,7 +397,7 @@ TRACE("hwndSelf=%p, ntmH=%d, icSz.cx=%ld, icSz.cy=%ld, icSp.cx=%ld, icSp.cy=%ld, notifyFmt=%d\n", \ iP->hwndSelf, iP->ntmHeight, iP->iconSize.cx, iP->iconSize.cy, \ iP->iconSpacing.cx, iP->iconSpacing.cy, iP->notifyFormat); \ - TRACE("hwndSelf=%p, rcList=%s\n", iP->hwndSelf, wine_dbgstr_rect(&iP->rcList)); \ + TRACE("hwndSelf=%p, rcList=%s\n", iP->hwndSelf, debugrect(&iP->rcList)); \ } while(0) static const WCHAR themeClass[] = {'L','i','s','t','V','i','e','w',0}; @@ -564,15 +565,40 @@ static inline const char* debugrange(const RANGE *lprng) { - if (!lprng) return "(null)"; - return wine_dbg_sprintf("[%d, %d)", lprng->lower, lprng->upper); + if (lprng) + { + char* buf = debug_getbuf(); + snprintf(buf, DEBUG_BUFFER_SIZE, "[%d, %d)", lprng->lower, lprng->upper); + return buf; + } else return "(null)"; +} + +static inline const char* debugpoint(const POINT *lppt) +{ + if (lppt) + { + char* buf = debug_getbuf(); + snprintf(buf, DEBUG_BUFFER_SIZE, "(%ld, %ld)", lppt->x, lppt->y); + return buf; + } else return "(null)"; +} + +static inline const char* debugrect(const RECT *rect) +{ + if (rect) + { + char* buf = debug_getbuf(); + snprintf(buf, DEBUG_BUFFER_SIZE, "[(%ld, %ld);(%ld, %ld)]", + rect->left, rect->top, rect->right, rect->bottom); + return buf; + } else return "(null)"; } static const char* debugscrollinfo(const SCROLLINFO *pScrollInfo) { char* buf = debug_getbuf(), *text = buf; int len, size = DEBUG_BUFFER_SIZE; - + if (pScrollInfo == NULL) return "(null)"; len = snprintf(buf, size, "{cbSize=%d, ", pScrollInfo->cbSize); if (len == -1) goto end; buf += len; size -= len; @@ -602,11 +628,15 @@ static const char* debugnmlistview(const NMLISTVIEW *plvnm) { - if (!plvnm) return "(null)"; - return wine_dbg_sprintf("iItem=%d, iSubItem=%d, uNewState=0x%x," + if (plvnm) + { + char* buf = debug_getbuf(); + snprintf(buf, DEBUG_BUFFER_SIZE, "iItem=%d, iSubItem=%d, uNewState=0x%x," " uOldState=0x%x, uChanged=0x%x, ptAction=%s, lParam=%ld\n", plvnm->iItem, plvnm->iSubItem, plvnm->uNewState, plvnm->uOldState, - plvnm->uChanged, wine_dbgstr_point(&plvnm->ptAction), plvnm->lParam); + plvnm->uChanged, debugpoint(&plvnm->ptAction), plvnm->lParam); + return buf; + } else return "(null)"; } static const char* debuglvitem_t(const LVITEMW *lpLVItem, BOOL isW) @@ -687,10 +717,13 @@ static const char* debuglvhittestinfo(const LVHITTESTINFO *lpht) { - if (!lpht) return "(null)"; - - return wine_dbg_sprintf("{pt=%s, flags=0x%x, iItem=%d, iSubItem=%d}", - wine_dbgstr_point(&lpht->pt), lpht->flags, lpht->iItem, lpht->iSubItem); + if (lpht) + { + char* buf = debug_getbuf(); + snprintf(buf, DEBUG_BUFFER_SIZE, "{pt=%s, flags=0x%x, iItem=%d, iSubItem=%d}", + debugpoint(&lpht->pt), lpht->flags, lpht->iItem, lpht->iSubItem); + return buf; + } else return "(null)"; } /* Return the corresponding text for a given scroll value */ @@ -1202,7 +1235,7 @@ LISTVIEW_GetOrigin(infoPtr, &Origin); - TRACE("(lprc=%s)\n", wine_dbgstr_rect(lprc)); + TRACE("(lprc=%s)\n", debugrect(lprc)); OffsetRect(&frame, -Origin.x, -Origin.y); if (uView == LVS_ICON || uView == LVS_SMALLICON) @@ -1373,7 +1406,7 @@ static inline void LISTVIEW_InvalidateRect(LISTVIEW_INFO *infoPtr, const RECT* rect) { if(!is_redrawing(infoPtr)) return; - TRACE(" invalidating rect=%s\n", wine_dbgstr_rect(rect)); + TRACE(" invalidating rect=%s\n", debugrect(rect)); InvalidateRect(infoPtr->hwndSelf, rect, TRUE); } @@ -1950,7 +1983,7 @@ State.bottom += infoPtr->iconStateSize.cy; } if (lprcState) *lprcState = State; - TRACE(" - state=%s\n", wine_dbgstr_rect(&State)); + TRACE(" - state=%s\n", debugrect(&State)); } else State.right = 0; @@ -1985,7 +2018,7 @@ Icon.bottom = Icon.top + infoPtr->nItemHeight; } if(lprcIcon) *lprcIcon = Icon; - TRACE(" - icon=%s\n", wine_dbgstr_rect(&Icon)); + TRACE(" - icon=%s\n", debugrect(&Icon)); } else Icon.right = 0; @@ -2050,7 +2083,8 @@ infoPtr->iconSize.cy + ICON_BOTTOM_PADDING; Label.right = Label.left + labelSize.cx; Label.bottom = Label.top + infoPtr->nItemHeight; - if (!oversizedBox && labelSize.cy > infoPtr->ntmHeight) + if (!oversizedBox && labelSize.cy > infoPtr->ntmHeight && + infoPtr->ntmHeight) { labelSize.cy = min(Box.bottom - Label.top, labelSize.cy); labelSize.cy /= infoPtr->ntmHeight; @@ -2068,7 +2102,7 @@ } if (lprcLabel) *lprcLabel = Label; - TRACE(" - label=%s\n", wine_dbgstr_rect(&Label)); + TRACE(" - label=%s\n", debugrect(&Label)); } /* Fix the Box if necessary */ @@ -2077,7 +2111,7 @@ if (oversizedBox) UnionRect(lprcBox, &Box, &Label); else *lprcBox = Box; } - TRACE(" - box=%s\n", wine_dbgstr_rect(&Box)); + TRACE(" - box=%s\n", debugrect(&Box)); } /*** @@ -2335,7 +2369,7 @@ LISTVIEW_GetAreaRect(infoPtr, lprcView); OffsetRect(lprcView, ptOrigin.x, ptOrigin.y); - TRACE("lprcView=%s\n", wine_dbgstr_rect(lprcView)); + TRACE("lprcView=%s\n", debugrect(lprcView)); return TRUE; } @@ -3646,7 +3680,7 @@ { if (!infoPtr->hBkBrush) return FALSE; - TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, debugrect(lprcBox), infoPtr->hBkBrush); return FillRect(hdc, lprcBox, infoPtr->hBkBrush); } @@ -3677,9 +3711,8 @@ NMLVCUSTOMDRAW nmlvcd; HIMAGELIST himl; LVITEMW lvItem; - HFONT hOldFont; - - TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, wine_dbgstr_point(&pos)); + + TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, debugpoint(&pos)); /* get information needed for drawing the item */ lvItem.mask = LVIF_TEXT | LVIF_IMAGE; @@ -3700,7 +3733,7 @@ /* now check if we need to update the focus rectangle */ lprcFocus = infoPtr->bFocus && (lvItem.state & LVIS_FOCUSED) ? &infoPtr->rcFocus : 0; - + if (!lprcFocus) lvItem.state &= ~LVIS_FOCUSED; LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, &rcState, &rcIcon, &rcLabel); OffsetRect(&rcBox, pos.x, pos.y); @@ -3708,13 +3741,11 @@ OffsetRect(&rcIcon, pos.x, pos.y); OffsetRect(&rcLabel, pos.x, pos.y); TRACE(" rcBox=%s, rcState=%s, rcIcon=%s. rcLabel=%s\n", - wine_dbgstr_rect(&rcBox), wine_dbgstr_rect(&rcState), - wine_dbgstr_rect(&rcIcon), wine_dbgstr_rect(&rcLabel)); + debugrect(&rcBox), debugrect(&rcState), debugrect(&rcIcon), debugrect(&rcLabel)); /* fill in the custom draw structure */ customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem); - hOldFont = GetCurrentObject(hdc, OBJ_FONT); if (nSubItem > 0) cdmode = infoPtr->cditemmode; if (cdmode & CDRF_NOTIFYITEMDRAW) cdsubitemmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); @@ -3792,8 +3823,6 @@ postpaint: if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); - if (cdsubitemmode & CDRF_NEWFONT) - SelectObject(hdc, hOldFont); return TRUE; } @@ -3849,7 +3878,7 @@ dis.rcItem.bottom = dis.rcItem.top + infoPtr->nItemHeight; dis.itemData = item.lParam; - TRACE("item=%s, rcItem=%s\n", debuglvitem_t(&item, TRUE), wine_dbgstr_rect(&dis.rcItem)); + TRACE("item=%s, rcItem=%s\n", debuglvitem_t(&item, TRUE), debugrect(&dis.rcItem)); /* * Even if we do not send the CDRF_NOTIFYITEMDRAW we need to fill the nmlvcd @@ -4471,10 +4500,10 @@ rcScroll.right = rcScroll.left + infoPtr->nItemWidth; rcScroll.bottom = nPerCol * infoPtr->nItemHeight; OffsetRect(&rcScroll, Origin.x, Origin.y); - TRACE("rcScroll=%s, dx=%d\n", wine_dbgstr_rect(&rcScroll), dir * infoPtr->nItemHeight); + TRACE("rcScroll=%s, dx=%d\n", debugrect(&rcScroll), dir * infoPtr->nItemHeight); if (IntersectRect(&rcScroll, &rcScroll, &infoPtr->rcList)) { - TRACE("Scrolling rcScroll=%s, rcList=%s\n", wine_dbgstr_rect(&rcScroll), wine_dbgstr_rect(&infoPtr->rcList)); + TRACE("Scrolling rcScroll=%s, rcList=%s\n", debugrect(&rcScroll), debugrect(&infoPtr->rcList)); ScrollWindowEx(infoPtr->hwndSelf, 0, dir * infoPtr->nItemHeight, &rcScroll, &rcScroll, 0, 0, SW_ERASE | SW_INVALIDATE); } @@ -5432,7 +5461,7 @@ lpptPosition->x += Origin.x; lpptPosition->y += Origin.y; - TRACE (" lpptPosition=%s\n", wine_dbgstr_point(lpptPosition)); + TRACE (" lpptPosition=%s\n", debugpoint(lpptPosition)); return TRUE; } @@ -5568,7 +5597,7 @@ OffsetRect(lprc, Position.x + Origin.x, Position.y + Origin.y); - TRACE(" rect=%s\n", wine_dbgstr_rect(lprc)); + TRACE(" rect=%s\n", debugrect(lprc)); return TRUE; } @@ -5819,7 +5848,7 @@ } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_UP; - SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); + ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt); while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) { if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) @@ -5854,7 +5883,7 @@ } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_DOWN; - SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); + ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt); while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) { if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) @@ -5890,7 +5919,7 @@ } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_LEFT; - SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); + ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt); while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) { if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) @@ -5926,7 +5955,7 @@ } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_RIGHT; - SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); + ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt); while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) { if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) @@ -5988,7 +6017,7 @@ lpptOrigin->x -= nHorzPos; lpptOrigin->y -= nVertPos; - TRACE(" origin=%s\n", wine_dbgstr_point(lpptOrigin)); + TRACE(" origin=%s\n", debugpoint(lpptOrigin)); } /*** @@ -6054,7 +6083,7 @@ ITERATOR i; INT iItem; - TRACE("(pt=%s, subitem=%d, select=%d)\n", wine_dbgstr_point(&lpht->pt), subitem, select); + TRACE("(pt=%s, subitem=%d, select=%d)\n", debugpoint(&lpht->pt), subitem, select); lpht->flags = 0; lpht->iItem = -1; @@ -6111,7 +6140,7 @@ rcBounds = rcBox; else UnionRect(&rcBounds, &rcIcon, &rcLabel); - TRACE("rcBounds=%s\n", wine_dbgstr_rect(&rcBounds)); + TRACE("rcBounds=%s\n", debugrect(&rcBounds)); if (!PtInRect(&rcBounds, opt)) return -1; if (PtInRect(&rcIcon, opt)) @@ -6211,7 +6240,7 @@ if (infoPtr->dwStyle & LVS_OWNERDATA) return infoPtr->nItemCount++; /* make sure it's an item, and not a subitem; cannot insert a subitem */ - if (!lpLVItem || lpLVItem->iSubItem) return -1; + if (!lpLVItem || lpLVItem->iItem < 0 || lpLVItem->iSubItem) return -1; if (!is_assignable_item(lpLVItem, infoPtr->dwStyle)) return -1; @@ -6223,8 +6252,6 @@ is_sorted = (infoPtr->dwStyle & (LVS_SORTASCENDING | LVS_SORTDESCENDING)) && !(infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && (LPSTR_TEXTCALLBACKW != lpLVItem->pszText); - - if (lpLVItem->iItem < 0 && !is_sorted) return -1; nItem = is_sorted ? infoPtr->nItemCount : min(lpLVItem->iItem, infoPtr->nItemCount); TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); @@ -6466,7 +6493,7 @@ /* retrieve the layout of the header */ GetClientRect(infoPtr->hwndSelf, &rcHeader); - TRACE("start cxy=%d rcHeader=%s\n", lphdi->cxy, wine_dbgstr_rect(&rcHeader)); + TRACE("start cxy=%d rcHeader=%s\n", lphdi->cxy, debugrect(&rcHeader)); lphdi->cxy = (rcHeader.right - rcHeader.left) - lphdi->cxy; } @@ -6740,7 +6767,7 @@ hdi.mask = HDI_TEXT; hdi.cchTextMax = DISP_TEXT_SIZE; hdi.pszText = szDispText; - if (Header_GetItemW(infoPtr->hwndHeader, nColumn, &hdi)) + if (Header_GetItemW(infoPtr->hwndHeader, nColumn, (LPARAM)&hdi)) { HDC hdc = GetDC(infoPtr->hwndSelf); HFONT old_font = SelectObject(hdc, (HFONT)SendMessageW(infoPtr->hwndHeader, WM_GETFONT, 0, 0)); @@ -6762,7 +6789,7 @@ hdi.mask = HDI_WIDTH; hdi.cxy = cx; TRACE("hdi.cxy=%d\n", hdi.cxy); - return Header_SetItemW(infoPtr->hwndHeader, nColumn, &hdi); + return Header_SetItemW(infoPtr->hwndHeader, nColumn, (LPARAM)&hdi); } /*** @@ -6961,7 +6988,7 @@ return oldspacing; } -static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) +static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL _small) { INT cx, cy; @@ -6972,8 +6999,8 @@ } else { - size->cx = GetSystemMetrics(small ? SM_CXSMICON : SM_CXICON); - size->cy = GetSystemMetrics(small ? SM_CYSMICON : SM_CYICON); + size->cx = GetSystemMetrics(_small ? SM_CXSMICON : SM_CXICON); + size->cy = GetSystemMetrics(_small ? SM_CYSMICON : SM_CYICON); } } @@ -7150,7 +7177,7 @@ UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; POINT Origin; - TRACE("(nItem=%d, &pt=%s\n", nItem, wine_dbgstr_point(&pt)); + TRACE("(nItem=%d, &pt=%s\n", nItem, debugpoint(&pt)); if (nItem < 0 || nItem >= infoPtr->nItemCount || !(uView == LVS_ICON || uView == LVS_SMALLICON)) return FALSE; @@ -7390,9 +7417,11 @@ LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)lParam; ITEM_INFO* lv_first = (ITEM_INFO*) DPA_GetPtr( (HDPA)first, 0 ); ITEM_INFO* lv_second = (ITEM_INFO*) DPA_GetPtr( (HDPA)second, 0 ); + PFNLVCOMPARE CompareFunction = infoPtr->pfnCompare; /* Forward the call to the client defined callback */ - return (infoPtr->pfnCompare)( lv_first->lParam , lv_second->lParam, infoPtr->lParamSort ); + + return (CompareFunction)( lv_first->lParam , lv_second->lParam, infoPtr->lParamSort ); } /*** @@ -8176,7 +8205,7 @@ lvHitTestInfo.pt.y = y; nItem = LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); - TRACE("at %s, nItem=%d\n", wine_dbgstr_point(&pt), nItem); + TRACE("at %s, nItem=%d\n", debugpoint(&pt), nItem); infoPtr->nEditLabelItem = -1; if ((nItem >= 0) && (nItem < infoPtr->nItemCount)) { @@ -8385,7 +8414,7 @@ HDITEMW hdi; hdi.mask = HDI_WIDTH; - if (!Header_GetItemW(infoPtr->hwndHeader, lpnmh->iItem, &hdi)) return 0; + if (!Header_GetItemW(infoPtr->hwndHeader, lpnmh->iItem, (LPARAM)&hdi)) return 0; cxy = hdi.cxy; } else @@ -8885,7 +8914,7 @@ { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; - TRACE("uView=%d, rcList(old)=%s\n", uView, wine_dbgstr_rect(&infoPtr->rcList)); + TRACE("uView=%d, rcList(old)=%s\n", uView, debugrect(&infoPtr->rcList)); GetClientRect(infoPtr->hwndSelf, &infoPtr->rcList); @@ -8909,14 +8938,14 @@ hl.prc = &infoPtr->rcList; hl.pwpos = &wp; - SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); + Header_Layout(infoPtr->hwndHeader, &hl); SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, wp.flags); infoPtr->rcList.top = max(wp.cy, 0); } - TRACE(" rcList=%s\n", wine_dbgstr_rect(&infoPtr->rcList)); + TRACE(" rcList=%s\n", debugrect(&infoPtr->rcList)); } /*** @@ -8987,7 +9016,7 @@ hl.prc = &infoPtr->rcList; hl.pwpos = &wp; - SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); + Header_Layout(infoPtr->hwndHeader, &hl); SetWindowPos(infoPtr->hwndHeader, infoPtr->hwndSelf, wp.x, wp.y, wp.cx, wp.cy, wp.flags); } @@ -9791,7 +9820,8 @@ hOldFont = SelectObject(hdc, infoPtr->hFont); /*Get String Length in pixels */ - GetTextExtentPoint32W(hdc, text, lstrlenW(text), &sz); + if(!GetTextExtentPoint32W(hdc, text, lstrlenW(text), &sz)) + sz.cx = 0; /*Add Extra spacing for the next character */ GetTextMetricsW(hdc, &textMetric); Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/monthcal… ============================================================================== --- trunk/reactos/dll/win32/comctl32/monthcal.c (original) +++ trunk/reactos/dll/win32/comctl32/monthcal.c Tue Apr 11 23:03:09 2006 @@ -160,10 +160,14 @@ /* make sure that time is valid */ static int MONTHCAL_ValidateTime(SYSTEMTIME time) { - if(time.wMonth < 1 || time.wMonth > 12 ) return FALSE; + if(time.wMonth > 12) return FALSE; if(time.wDayOfWeek > 6) return FALSE; if(time.wDay > MONTHCAL_MonthLength(time.wMonth, time.wYear)) return FALSE; + if(time.wHour > 23) return FALSE; + if(time.wMinute > 59) return FALSE; + if(time.wSecond > 59) return FALSE; + if(time.wMilliseconds > 999) return FALSE; return TRUE; } @@ -930,54 +934,48 @@ } +/* FIXME: are validated times taken from current date/time or simply + * copied? + * FIXME: check whether MCM_GETMONTHRANGE shows correct result after + * adjusting range with MCM_SETRANGE + */ + static LRESULT MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *)lParam; - FILETIME ft_min, ft_max; - - TRACE("%x %lx\n", wParam, lParam); - - if ((wParam & GDTR_MIN && !MONTHCAL_ValidateTime(lprgSysTimeArray[0])) || - (wParam & GDTR_MAX && !MONTHCAL_ValidateTime(lprgSysTimeArray[1]))) - return FALSE; - - if (wParam & GDTR_MIN) - { - MONTHCAL_CopyTime(&lprgSysTimeArray[0], &infoPtr->minDate); - infoPtr->rangeValid |= GDTR_MIN; - } - if (wParam & GDTR_MAX) - { - MONTHCAL_CopyTime(&lprgSysTimeArray[1], &infoPtr->maxDate); - infoPtr->rangeValid |= GDTR_MAX; - } - - /* Only one limit set - we are done */ - if ((infoPtr->rangeValid & (GDTR_MIN | GDTR_MAX)) != (GDTR_MIN | GDTR_MAX)) - return TRUE; - - SystemTimeToFileTime(&infoPtr->maxDate, &ft_max); - SystemTimeToFileTime(&infoPtr->minDate, &ft_min); - - if (CompareFileTime(&ft_min, &ft_max) > 0) - { - if ((wParam & (GDTR_MIN | GDTR_MAX)) == (GDTR_MIN | GDTR_MAX)) - { - /* Native swaps limits only when both limits are being set. */ - SYSTEMTIME st_tmp = infoPtr->minDate; - infoPtr->minDate = infoPtr->maxDate; - infoPtr->maxDate = st_tmp; - } - else - { - /* Reset the other limit. */ - /* FIXME: native sets date&time to 0. Should we do this too? */ - infoPtr->rangeValid &= wParam & GDTR_MIN ? ~GDTR_MAX : ~GDTR_MIN ; - } - } - - return TRUE; + SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *)lParam; + int prev; + + TRACE("%x %lx\n", wParam, lParam); + + if(wParam & GDTR_MAX) { + if(MONTHCAL_ValidateTime(lprgSysTimeArray[1])){ + MONTHCAL_CopyTime(&lprgSysTimeArray[1], &infoPtr->maxDate); + infoPtr->rangeValid|=GDTR_MAX; + } else { + GetSystemTime(&infoPtr->todaysDate); + MONTHCAL_CopyTime(&infoPtr->todaysDate, &infoPtr->maxDate); + } + } + if(wParam & GDTR_MIN) { + if(MONTHCAL_ValidateTime(lprgSysTimeArray[0])) { + MONTHCAL_CopyTime(&lprgSysTimeArray[0], &infoPtr->minDate); + infoPtr->rangeValid|=GDTR_MIN; + } else { + GetSystemTime(&infoPtr->todaysDate); + MONTHCAL_CopyTime(&infoPtr->todaysDate, &infoPtr->minDate); + } + } + + prev = infoPtr->monthRange; + infoPtr->monthRange = infoPtr->maxDate.wMonth - infoPtr->minDate.wMonth; + + if(infoPtr->monthRange!=prev) { + infoPtr->monthdayState = ReAlloc(infoPtr->monthdayState, + infoPtr->monthRange * sizeof(MONTHDAYSTATE)); + } + + return 1; } Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c?… ============================================================================== --- trunk/reactos/dll/win32/comctl32/pager.c (original) +++ trunk/reactos/dll/win32/comctl32/pager.c Tue Apr 11 23:03:09 2006 @@ -59,6 +59,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "windowsx.h" #include "commctrl.h" #include "comctl32.h" #include "wine/debug.h" @@ -1314,7 +1315,7 @@ return PAGER_Destroy (infoPtr); case WM_SIZE: - return PAGER_Size (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); + return PAGER_Size (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); case WM_NCPAINT: return PAGER_NCPaint (infoPtr, (HRGN)wParam); @@ -1329,18 +1330,18 @@ return PAGER_NCCalcSize (infoPtr, wParam, (LPRECT)lParam); case WM_NCHITTEST: - return PAGER_NCHitTest (infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam)); + return PAGER_NCHitTest (infoPtr, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); case WM_MOUSEMOVE: if (infoPtr->bForward && infoPtr->hwndChild) PostMessageW(infoPtr->hwndChild, WM_MOUSEMOVE, wParam, lParam); - return PAGER_MouseMove (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); + return PAGER_MouseMove (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); case WM_LBUTTONDOWN: - return PAGER_LButtonDown (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); + return PAGER_LButtonDown (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); case WM_LBUTTONUP: - return PAGER_LButtonUp (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); + return PAGER_LButtonUp (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); case WM_ERASEBKGND: return PAGER_EraseBackground (infoPtr, (HDC)wParam); Modified: trunk/reactos/dll/win32/comctl32/progress.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/progress… ============================================================================== --- trunk/reactos/dll/win32/comctl32/progress.c (original) +++ trunk/reactos/dll/win32/comctl32/progress.c Tue Apr 11 23:03:09 2006 @@ -131,12 +131,35 @@ /*********************************************************************** * PROGRESS_Invalidate * - * Don't be too clever about invalidating the progress bar. - * InstallShield depends on this simple behaviour. + * Invalide the range between old and new pos. */ static void PROGRESS_Invalidate( PROGRESS_INFO *infoPtr, INT old, INT new ) { - InvalidateRect( infoPtr->Self, NULL, old > new ); + LONG style = GetWindowLongW (infoPtr->Self, GWL_STYLE); + RECT rect; + int oldPos, newPos; + BOOL barSmooth = (style & PBS_SMOOTH) && !GetWindowTheme (infoPtr->Self); + + get_client_rect( infoPtr->Self, &rect ); + + oldPos = get_bar_position( infoPtr, style, &rect, old ); + newPos = get_bar_position( infoPtr, style, &rect, new ); + + if (style & PBS_VERTICAL) + { + rect.top = rect.bottom - max( oldPos, newPos ); + rect.bottom = rect.bottom - min( oldPos, newPos ); + if (!barSmooth) rect.top -= + get_led_size (infoPtr, style, &rect) + get_led_gap (infoPtr); + } + else + { + rect.left = min( oldPos, newPos ); + rect.right = max( oldPos, newPos ); + if (!barSmooth) rect.right += + get_led_size (infoPtr, style, &rect) + get_led_gap (infoPtr); + } + InvalidateRect( infoPtr->Self, &rect, oldPos > newPos ); } /* Information for a progress bar drawing helper */ Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c?… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c Tue Apr 11 23:03:09 2006 @@ -1492,11 +1492,10 @@ cxsep = (cntonrow == 0) ? 0 : SEP_WIDTH; cx = lpBand->lcx; - /* In native, 0 as one of the coordinates means no limit */ if (infoPtr->dwStyle & CCS_VERT) - dobreak = (adjcy && (y + cx + cxsep > adjcy)); + dobreak = (y + cx + cxsep > adjcy); else - dobreak = (adjcx && (x + cx + cxsep > adjcx)); + dobreak = (x + cx + cxsep > adjcx); /* This is the check for whether we need to start a new row */ if ( ( (lpBand->fStyle & RBBS_BREAK) && (i != 0) ) || @@ -1538,14 +1537,14 @@ /* if boundary rect specified then limit mcy */ if (lpRect) { if (infoPtr->dwStyle & CCS_VERT) { - if (adjcx && (x+mcy > adjcx)) { + if (x+mcy > adjcx) { mcy = adjcx - x; TRACE("P1 row %u limiting mcy=%d, adjcx=%d, x=%d\n", i, mcy, adjcx, x); } } else { - if (adjcy && (y+mcy > adjcy)) { + if (y+mcy > adjcy) { mcy = adjcy - y; TRACE("P1 row %u limiting mcy=%d, adjcy=%d, y=%d\n", i, mcy, adjcy, y); @@ -1657,9 +1656,8 @@ /* ******* Start Phase 2 - split rows till adjustment height full ******* */ /* assumes that the following variables contain: */ - /* y/x current height/width of all rows */ - /* adjcy/adjcx adjustment height/width or 0 (as small as possible) */ - if (lpRect && ((infoPtr->dwStyle & CCS_VERT) ? adjcx : adjcy)) { + /* y/x current height/width of all rows */ + if (lpRect) { INT i, prev_rh, new_rh, adj_rh, prev_idx, current_idx; REBAR_BAND *prev, *current, *walk; UINT j; @@ -1920,7 +1918,7 @@ y = clientcy; } if (infoPtr->dwStyle & CCS_VERT) { - if( infoPtr->uNumBands != 0 && x < REBAR_MINSIZE ) + if( x < REBAR_MINSIZE ) x = REBAR_MINSIZE; infoPtr->calcSize.cx = x; infoPtr->calcSize.cy = clientcy; @@ -1929,7 +1927,7 @@ if (notify && (x != origheight)) infoPtr->fStatus |= NTF_HGHTCHG; } else { - if( infoPtr->uNumBands != 0 && y < REBAR_MINSIZE ) + if( y < REBAR_MINSIZE ) y = REBAR_MINSIZE; infoPtr->calcSize.cx = clientcx; infoPtr->calcSize.cy = y; @@ -4503,14 +4501,9 @@ if ((lParam == 0) && (rcClient.right + rcClient.bottom != 0) && (infoPtr->dwStyle & RBS_AUTOSIZE)) { /* on a WM_SIZE to zero and current client not zero and AUTOSIZE */ - /* native seems to use the current parent width for the size */ + /* native seems to use the current client rect for the size */ infoPtr->fStatus |= BAND_NEEDS_LAYOUT; - GetClientRect (GetParent(infoPtr->hwndSelf), &rcClient); - if (infoPtr->dwStyle & CCS_VERT) - rcClient.right = 0; - else - rcClient.bottom = 0; - TRACE("sizing rebar to parent (%ld,%ld) size is zero but AUTOSIZE set\n", + TRACE("sizing rebar to client (%ld,%ld) size is zero but AUTOSIZE set\n", rcClient.right, rcClient.bottom); } else { Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/status.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/status.c (original) +++ trunk/reactos/dll/win32/comctl32/status.c Tue Apr 11 23:03:09 2006 @@ -786,7 +786,6 @@ part->text = ntext; } InvalidateRect(infoPtr->Self, &part->bound, FALSE); - UpdateWindow(infoPtr->Self); return TRUE; } Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/syslink.c (original) +++ trunk/reactos/dll/win32/comctl32/syslink.c Tue Apr 11 23:03:09 2006 @@ -1,7 +1,7 @@ /* * SysLink control * - * Copyright 2004 - 2006 Thomas Weidenmueller <w3seek(a)reactos.com> + * Copyright 2004, 2005 Thomas Weidenmueller <w3seek(a)reactos.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -62,6 +62,7 @@ typedef struct _DOC_ITEM { struct _DOC_ITEM *Next; /* Address to the next item */ + LPWSTR Text; /* Text of the document item */ UINT nText; /* Number of characters of the text */ SL_ITEM_TYPE Type; /* type of the item */ PDOC_TEXTBLOCK Blocks; /* Array of text blocks */ @@ -78,7 +79,6 @@ UINT Dummy; } Text; } u; - WCHAR Text[1]; /* Text of the document item */ } DOC_ITEM, *PDOC_ITEM; typedef struct @@ -117,14 +117,8 @@ { if(DocItem->Type == slLink) { - if (DocItem->u.Link.szID != NULL) - { - Free(DocItem->u.Link.szID); - } - if (DocItem->u.Link.szUrl != NULL) - { - Free(DocItem->u.Link.szUrl); - } + Free(DocItem->u.Link.szID); + Free(DocItem->u.Link.szUrl); } /* we don't free Text because it's just a pointer to a character in the @@ -141,16 +135,16 @@ SL_ITEM_TYPE type, PDOC_ITEM LastItem) { PDOC_ITEM Item; - - textlen = min(textlen, lstrlenW(Text)); - Item = Alloc(FIELD_OFFSET(DOC_ITEM, Text[textlen + 1])); + Item = Alloc(sizeof(DOC_ITEM) + ((textlen + 1) * sizeof(WCHAR))); if(Item == NULL) { ERR("Failed to alloc DOC_ITEM structure!\n"); return NULL; } + textlen = min(textlen, lstrlenW(Text)); Item->Next = NULL; + Item->Text = (LPWSTR)(Item + 1); Item->nText = textlen; Item->Type = type; Item->Blocks = NULL; @@ -165,6 +159,7 @@ } lstrcpynW(Item->Text, Text, textlen + 1); + Item->Text[textlen] = 0; return Item; } @@ -356,11 +351,12 @@ if(lpID != NULL) { nc = min(lenId, strlenW(lpID)); - nc = min(nc, MAX_LINKID_TEXT - 1); - Last->u.Link.szID = Alloc((nc + 1) * sizeof(WCHAR)); + nc = min(nc, MAX_LINKID_TEXT); + Last->u.Link.szID = Alloc((MAX_LINKID_TEXT + 1) * sizeof(WCHAR)); if(Last->u.Link.szID != NULL) { lstrcpynW(Last->u.Link.szID, lpID, nc + 1); + Last->u.Link.szID[nc] = 0; } } else @@ -368,11 +364,12 @@ if(lpUrl != NULL) { nc = min(lenUrl, strlenW(lpUrl)); - nc = min(nc, L_MAX_URL_LENGTH - 1); - Last->u.Link.szUrl = Alloc((nc + 1) * sizeof(WCHAR)); + nc = min(nc, L_MAX_URL_LENGTH); + Last->u.Link.szUrl = Alloc((L_MAX_URL_LENGTH + 1) * sizeof(WCHAR)); if(Last->u.Link.szUrl != NULL) { lstrcpynW(Last->u.Link.szUrl, lpUrl, nc + 1); + Last->u.Link.szUrl[nc] = 0; } } else @@ -434,11 +431,12 @@ if(lpID != NULL) { nc = min(lenId, strlenW(lpID)); - nc = min(nc, MAX_LINKID_TEXT - 1); - Last->u.Link.szID = Alloc((nc + 1) * sizeof(WCHAR)); + nc = min(nc, MAX_LINKID_TEXT); + Last->u.Link.szID = Alloc((MAX_LINKID_TEXT + 1) * sizeof(WCHAR)); if(Last->u.Link.szID != NULL) { lstrcpynW(Last->u.Link.szID, lpID, nc + 1); + Last->u.Link.szID[nc] = 0; } } else @@ -446,11 +444,12 @@ if(lpUrl != NULL) { nc = min(lenUrl, strlenW(lpUrl)); - nc = min(nc, L_MAX_URL_LENGTH - 1); - Last->u.Link.szUrl = Alloc((nc + 1) * sizeof(WCHAR)); + nc = min(nc, L_MAX_URL_LENGTH); + Last->u.Link.szUrl = Alloc((L_MAX_URL_LENGTH + 1) * sizeof(WCHAR)); if(Last->u.Link.szUrl != NULL) { lstrcpynW(Last->u.Link.szUrl, lpUrl, nc + 1); + Last->u.Link.szUrl[nc] = 0; } } else @@ -752,7 +751,6 @@ { Free(bl); bl = NULL; - nBlocks = 0; } break; } @@ -771,12 +769,11 @@ { Free(bl); bl = NULL; - nBlocks = 0; } } else { - bl = Alloc(sizeof(DOC_TEXTBLOCK)); + bl = Alloc((nBlocks + 1) * sizeof(DOC_TEXTBLOCK)); if (bl != NULL) nBlocks++; } @@ -823,6 +820,8 @@ { Current->Blocks = bl; } + else + Current->Blocks = NULL; } SelectObject(hdc, hOldFont); @@ -878,10 +877,10 @@ ExtTextOutW(hdc, bl->rc.left, bl->rc.top, ETO_OPAQUE | ETO_CLIPPED, &bl->rc, tx, bl->nChars, NULL); if((Current->Type == slLink) && (Current->u.Link.state & LIS_FOCUSED) && infoPtr->HasFocus) { - COLORREF PrevTextColor; - PrevTextColor = SetTextColor(hdc, infoPtr->TextColor); + COLORREF PrevColor; + PrevColor = SetBkColor(hdc, OldBkColor); DrawFocusRect(hdc, &bl->rc); - SetTextColor(hdc, PrevTextColor); + SetBkColor(hdc, PrevColor); } tx += bl->nChars; n -= bl->nChars + bl->nSkip; @@ -908,11 +907,8 @@ PAINTSTRUCT ps; hdc = hdcParam ? hdcParam : BeginPaint (infoPtr->Self, &ps); - if (hdc) - { - SYSLINK_Draw (infoPtr, hdc); - if (!hdcParam) EndPaint (infoPtr->Self, &ps); - } + SYSLINK_Draw (infoPtr, hdc); + if (!hdcParam) EndPaint (infoPtr->Self, &ps); return 0; } @@ -976,7 +972,8 @@ /* clear the document */ SYSLINK_ClearDoc(infoPtr); - if(Text == NULL || (textlen = lstrlenW(Text)) == 0) + textlen = lstrlenW(Text); + if(Text == NULL || textlen == 0) { return TRUE; } @@ -986,13 +983,9 @@ { /* Render text position and word wrapping in memory */ HDC hdc = GetDC(infoPtr->Self); - if (hdc != NULL) - { - SYSLINK_Render(infoPtr, hdc); - ReleaseDC(infoPtr->Self, hdc); - - InvalidateRect(infoPtr->Self, NULL, TRUE); - } + SYSLINK_Render(infoPtr, hdc); + SYSLINK_Draw(infoPtr, hdc); + ReleaseDC(infoPtr->Self, hdc); } return TRUE; @@ -1038,10 +1031,8 @@ static LRESULT SYSLINK_SetItem (SYSLINK_INFO *infoPtr, PLITEM Item) { PDOC_ITEM di; - int nc; - PWSTR szId = NULL; - PWSTR szUrl = NULL; BOOL Repaint = FALSE; + BOOL Ret = TRUE; if(!(Item->mask & LIF_ITEMINDEX) || !(Item->mask & (LIF_FLAGSMASK))) { @@ -1055,60 +1046,7 @@ ERR("Link %d couldn't be found\n", Item->iLink); return FALSE; } - - if(Item->mask & LIF_ITEMID) - { - nc = min(lstrlenW(Item->szID), MAX_LINKID_TEXT - 1); - szId = Alloc((nc + 1) * sizeof(WCHAR)); - if(szId) - { - lstrcpynW(szId, Item->szID, nc + 1); - } - else - { - ERR("Unable to allocate memory for link id\n"); - return FALSE; - } - } - - if(Item->mask & LIF_URL) - { - nc = min(lstrlenW(Item->szUrl), L_MAX_URL_LENGTH - 1); - szUrl = Alloc((nc + 1) * sizeof(WCHAR)); - if(szUrl) - { - lstrcpynW(szUrl, Item->szUrl, nc + 1); - } - else - { - if (szId) - { - Free(szId); - } - - ERR("Unable to allocate memory for link url\n"); - return FALSE; - } - } - - if(Item->mask & LIF_ITEMID) - { - if(di->u.Link.szID) - { - Free(di->u.Link.szID); - } - di->u.Link.szID = szId; - } - - if(Item->mask & LIF_URL) - { - if(di->u.Link.szUrl) - { - Free(di->u.Link.szUrl); - } - di->u.Link.szUrl = szUrl; - } - + if(Item->mask & LIF_STATE) { UINT oldstate = di->u.Link.state; @@ -1121,13 +1059,47 @@ /* update the focus */ SYSLINK_SetFocusLink(infoPtr, ((di->u.Link.state & LIS_FOCUSED) ? di : NULL)); } + + if(Item->mask & LIF_ITEMID) + { + if(!di->u.Link.szID) + { + di->u.Link.szID = Alloc((MAX_LINKID_TEXT + 1) * sizeof(WCHAR)); + if(!Item->szID) + { + ERR("Unable to allocate memory for link id\n"); + Ret = FALSE; + } + } + if(di->u.Link.szID) + { + lstrcpynW(di->u.Link.szID, Item->szID, MAX_LINKID_TEXT + 1); + } + } + + if(Item->mask & LIF_URL) + { + if(!di->u.Link.szUrl) + { + di->u.Link.szUrl = Alloc((MAX_LINKID_TEXT + 1) * sizeof(WCHAR)); + if(!Item->szUrl) + { + ERR("Unable to allocate memory for link url\n"); + Ret = FALSE; + } + } + if(di->u.Link.szUrl) + { + lstrcpynW(di->u.Link.szUrl, Item->szUrl, MAX_LINKID_TEXT + 1); + } + } if(Repaint) { SYSLINK_RepaintLink(infoPtr, di); } - return TRUE; + return Ret; } /*********************************************************************** @@ -1165,7 +1137,7 @@ { if(di->u.Link.szID) { - lstrcpyW(Item->szID, di->u.Link.szID); + lstrcpynW(Item->szID, di->u.Link.szID, MAX_LINKID_TEXT + 1); } else { @@ -1177,7 +1149,7 @@ { if(di->u.Link.szUrl) { - lstrcpyW(Item->szUrl, di->u.Link.szUrl); + lstrcpynW(Item->szUrl, di->u.Link.szUrl, L_MAX_URL_LENGTH + 1); } else { @@ -1237,7 +1209,7 @@ HitTest->item.stateMask = 0; if(Current->u.Link.szID) { - lstrcpyW(HitTest->item.szID, Current->u.Link.szID); + lstrcpynW(HitTest->item.szID, Current->u.Link.szID, MAX_LINKID_TEXT + 1); } else { @@ -1245,7 +1217,7 @@ } if(Current->u.Link.szUrl) { - lstrcpyW(HitTest->item.szUrl, Current->u.Link.szUrl); + lstrcpynW(HitTest->item.szUrl, Current->u.Link.szUrl, L_MAX_URL_LENGTH + 1); } else { @@ -1307,7 +1279,7 @@ nml.item.stateMask = 0; if(Link->u.Link.szID) { - lstrcpyW(nml.item.szID, Link->u.Link.szID); + lstrcpynW(nml.item.szID, Link->u.Link.szID, MAX_LINKID_TEXT + 1); } else { @@ -1315,7 +1287,7 @@ } if(Link->u.Link.szUrl) { - lstrcpyW(nml.item.szUrl, Link->u.Link.szUrl); + lstrcpynW(nml.item.szUrl, Link->u.Link.szUrl, L_MAX_URL_LENGTH + 1); } else { Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?re… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tab.c (original) +++ trunk/reactos/dll/win32/comctl32/tab.c Tue Apr 11 23:03:09 2006 @@ -261,11 +261,9 @@ if (iItem >= 0 && iItem < infoPtr->uNumItem) { prevItem=infoPtr->iSelected; - if (infoPtr->iSelected != iItem) { - infoPtr->iSelected=iItem; - TAB_EnsureSelectionVisible(infoPtr); - TAB_InvalidateTabArea(infoPtr); - } + infoPtr->iSelected=iItem; + TAB_EnsureSelectionVisible(infoPtr); + TAB_InvalidateTabArea(infoPtr); } return prevItem; } @@ -1747,19 +1745,13 @@ if(lStyle & TCS_VERTICAL) { center_offset_h = ((drawRect->bottom - drawRect->top) - (cy + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2; - center_offset_v = (drawRect->left + (drawRect->right - drawRect->left) - cx) / 2; + center_offset_v = ((drawRect->right - drawRect->left) - (cx + infoPtr->uVItemPadding)) / 2; } else { center_offset_h = ((drawRect->right - drawRect->left) - (cx + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2; - center_offset_v = (drawRect->top + (drawRect->bottom - drawRect->top) - cy) / 2; + center_offset_v = ((drawRect->bottom - drawRect->top) - (cy + infoPtr->uVItemPadding)) / 2; } - - /* if an item is selected, the icon is shifted up instead of down */ - if (iItem == infoPtr->iSelected) - center_offset_v -= infoPtr->uVItemPadding / 2; - else - center_offset_v += infoPtr->uVItemPadding / 2; if (lStyle & TCS_FIXEDWIDTH && lStyle & (TCS_FORCELABELLEFT | TCS_FORCEICONLEFT)) center_offset_h = infoPtr->uHItemPadding; Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltips… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c Tue Apr 11 23:03:09 2006 @@ -2025,8 +2025,7 @@ else { if ( (toolPtr->lpszText) && !IS_INTRESOURCE(toolPtr->lpszText) ) { - if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) - Free (toolPtr->lpszText); + Free (toolPtr->lpszText); toolPtr->lpszText = NULL; } if (lpToolInfo->lpszText) { @@ -2083,8 +2082,7 @@ else { if ( (toolPtr->lpszText) && !IS_INTRESOURCE(toolPtr->lpszText) ) { - if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) - Free (toolPtr->lpszText); + Free (toolPtr->lpszText); toolPtr->lpszText = NULL; } if (lpToolInfo->lpszText) { @@ -2210,8 +2208,7 @@ else { if ( (toolPtr->lpszText) && !IS_INTRESOURCE(toolPtr->lpszText) ) { - if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) - Free (toolPtr->lpszText); + Free (toolPtr->lpszText); toolPtr->lpszText = NULL; } if (lpToolInfo->lpszText) { @@ -2268,8 +2265,7 @@ else { if ( (toolPtr->lpszText) && !IS_INTRESOURCE(toolPtr->lpszText) ) { - if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) - Free (toolPtr->lpszText); + Free (toolPtr->lpszText); toolPtr->lpszText = NULL; } if (lpToolInfo->lpszText) { Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c Tue Apr 11 23:03:09 2006 @@ -2316,14 +2316,11 @@ { HPEN hOldPen, hNewPen; HTREEITEM parent; - LOGBRUSH lb; /* * Get a dotted grey pen */ - lb.lbStyle = BS_SOLID; - lb.lbColor = infoPtr->clrLine; - hNewPen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &lb, 0, NULL); + hNewPen = CreatePen(PS_ALTERNATE, 0, infoPtr->clrLine); hOldPen = SelectObject(hdc, hNewPen); MoveToEx(hdc, item->stateOffset, centery, NULL); @@ -2824,8 +2821,6 @@ } } - TREEVIEW_UpdateScrollBars(infoPtr); - if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect); @@ -3330,6 +3325,7 @@ } } } + TREEVIEW_UpdateScrollBars(infoPtr); return TRUE; }

1 0

[greatlrd] 21549: First HEL support that is working for one dx apps I got in windows
by greatlrd＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: greatlrd Date: Tue Apr 11 19:06:54 2006 New Revision: 21549 URL: http://svn.reactos.ru/svn/reactos?rev=21549&view=rev Log: First HEL support that is working for one dx apps I got in windows Modified: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/ddraw… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c Tue Apr 11 19:06:54 2006 @@ -16,104 +16,8 @@ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; /* HAL Startup process */ - DEVMODE devmode; - HBITMAP hbmp; - const UINT bmiSize = sizeof(BITMAPINFOHEADER) + 0x10; - UCHAR *pbmiData; - BITMAPINFO *pbmi; - DWORD *pMasks; BOOL newmode = FALSE; - /* - Get Display mode res and caps - We need fill the mDDrawGlobal - vmidata struct right - - this code is from Steffen Schulze - 1. Add the mpModeInfos to inisate - */ - This->mcModeInfos = 1; - This->mpModeInfos = (DDHALMODEINFO*) DxHeapMemAlloc(This->mcModeInfos * sizeof(DDHALMODEINFO)); - - if (This->mpModeInfos == NULL) - { - return DD_FALSE; - } - - EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); - - This->mpModeInfos[0].dwWidth = devmode.dmPelsWidth; - This->mpModeInfos[0].dwHeight = devmode.dmPelsHeight; - This->mpModeInfos[0].dwBPP = devmode.dmBitsPerPel; - This->mpModeInfos[0].lPitch = (devmode.dmPelsWidth*devmode.dmBitsPerPel)/8; - This->mpModeInfos[0].wRefreshRate = (WORD)devmode.dmDisplayFrequency; - - /* - Create HDC - we need it for doing the Call to GdiEntry1 - */ - This->hdc = CreateDCW(L"DISPLAY",L"DISPLAY",NULL,NULL); - - if (This->hdc == NULL) - { - return DD_FALSE; - } - - /* Do not release HDC it is mapen in kernel mode - we can only release it at exit of ddraw.dll - */ - - /* - Dectect RGB bit mask - this code is from Steffen Schulze - why it need I do not know yet but it - will allown us to create any type of - surface later - */ - - hbmp = CreateCompatibleBitmap(This->hdc, 1, 1); - if (hbmp==NULL) - { - DxHeapMemFree(This->mpModeInfos); - DeleteDC(This->hdc); - return DD_FALSE; - } - - pbmiData = (UCHAR *) DxHeapMemAlloc(bmiSize); - pbmi = (BITMAPINFO*)pbmiData; - - if (pbmiData==NULL) - { - DxHeapMemFree(This->mpModeInfos); - DeleteDC(This->hdc); - DeleteObject(hbmp); - return DDERR_UNSUPPORTED; - } - - pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbmi->bmiHeader.biBitCount = (WORD)devmode.dmBitsPerPel; - pbmi->bmiHeader.biCompression = BI_BITFIELDS; - pbmi->bmiHeader.biWidth = 1; - pbmi->bmiHeader.biHeight = 1; - - GetDIBits(This->hdc, hbmp, 0, 0, NULL, pbmi, 0); - DeleteObject(hbmp); - - pMasks = (DWORD*)(pbmiData + sizeof(BITMAPINFOHEADER)); - This->mpModeInfos[0].dwRBitMask = pMasks[0]; - This->mpModeInfos[0].dwGBitMask = pMasks[1]; - This->mpModeInfos[0].dwBBitMask = pMasks[2]; - This->mpModeInfos[0].dwAlphaBitMask = pMasks[3]; - - DxHeapMemFree(pbmiData); - - /* - prepare start up the DX Draw HAL interface now - */ - - memset(&This->mDDrawGlobal, 0, sizeof(DDRAWI_DIRECTDRAW_GBL)); - memset(&This->mHALInfo, 0, sizeof(DDHALINFO)); - memset(&This->mCallbacks, 0, sizeof(DDHAL_CALLBACKS)); /* Startup DX HAL step one of three @@ -121,8 +25,7 @@ if (!DdCreateDirectDrawObject(&This->mDDrawGlobal, This->hdc)) { DxHeapMemFree(This->mpModeInfos); - DeleteDC(This->hdc); - DeleteObject(hbmp); + DeleteDC(This->hdc); return DD_FALSE; } @@ -132,21 +35,10 @@ if (!DdReenableDirectDrawObject(&This->mDDrawGlobal, &newmode)) { DxHeapMemFree(This->mpModeInfos); - DeleteDC(This->hdc); - DeleteObject(hbmp); - return DD_FALSE; - } - - /* - Setup the DirectDraw Local - */ - - This->mDDrawLocal.lpDDCB = &This->mCallbacks; - This->mDDrawLocal.lpGbl = &This->mDDrawGlobal; - This->mDDrawLocal.dwProcessId = GetCurrentProcessId(); - - This->mDDrawGlobal.lpDDCBtmp = &This->mCallbacks; - This->mDDrawGlobal.lpExclusiveOwner = &This->mDDrawLocal; + DeleteDC(This->hdc); + return DD_FALSE; + } + /* Startup DX HAL step two of three @@ -165,8 +57,7 @@ NULL)) { DxHeapMemFree(This->mpModeInfos); - DeleteDC(This->hdc); - DeleteObject(hbmp); + DeleteDC(This->hdc); // FIXME Close DX fristcall and second call return DD_FALSE; } @@ -176,8 +67,7 @@ if (This->mpvmList == NULL) { DxHeapMemFree(This->mpModeInfos); - DeleteDC(This->hdc); - DeleteObject(hbmp); + DeleteDC(This->hdc); // FIXME Close DX fristcall and second call return DD_FALSE; } @@ -188,8 +78,7 @@ { DxHeapMemFree(This->mpvmList); DxHeapMemFree(This->mpModeInfos); - DeleteDC(This->hdc); - DeleteObject(hbmp); + DeleteDC(This->hdc); // FIXME Close DX fristcall and second call return DD_FALSE; } @@ -201,8 +90,7 @@ DxHeapMemFree( This->mpFourCC); DxHeapMemFree( This->mpvmList); DxHeapMemFree( This->mpModeInfos); - DeleteDC(This->hdc); - DeleteObject(hbmp); + DeleteDC(This->hdc); // FIXME Close DX fristcall and second call return DD_FALSE; } @@ -229,8 +117,7 @@ DxHeapMemFree(This->mpFourCC); DxHeapMemFree(This->mpvmList); DxHeapMemFree(This->mpModeInfos); - DeleteDC(This->hdc); - DeleteObject(hbmp); + DeleteDC(This->hdc); // FIXME Close DX fristcall and second call return DD_FALSE; } @@ -256,8 +143,7 @@ This->mDDrawGlobal.hInstance = This->mHALInfo.hInstance; This->mDDrawGlobal.lp16DD = &This->mDDrawGlobal; - - DeleteObject(hbmp); + //DeleteDC(This->hdc); DDHAL_GETDRIVERINFODATA DriverInfo; Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Apr 11 19:06:54 2006 @@ -70,6 +70,16 @@ WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) { + DWORD hal_ret; + DWORD hel_ret; + DEVMODE devmode; + HBITMAP hbmp; + const UINT bmiSize = sizeof(BITMAPINFOHEADER) + 0x10; + UCHAR *pbmiData; + BITMAPINFO *pbmi; + DWORD *pMasks; + + DX_WINDBG_trace(); IDirectDrawImpl* This = (IDirectDrawImpl*)iface; @@ -95,15 +105,91 @@ /* cObsolete is undoc in msdn it being use in CreateDCA */ RtlCopyMemory(&This->mDDrawGlobal.cObsolete,&"DISPLAY",7); RtlCopyMemory(&This->mDDrawGlobal.cDriverName,&"DISPLAY",7); - - - - // call software first - Hal_DirectDraw_Initialize (iface); - - Hel_DirectDraw_Initialize (iface); - This->mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - + + /* Same for HEL and HAL */ + This->mcModeInfos = 1; + This->mpModeInfos = (DDHALMODEINFO*) DxHeapMemAlloc(This->mcModeInfos * sizeof(DDHALMODEINFO)); + + if (This->mpModeInfos == NULL) + { + return DD_FALSE; + } + + EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); + + This->mpModeInfos[0].dwWidth = devmode.dmPelsWidth; + This->mpModeInfos[0].dwHeight = devmode.dmPelsHeight; + This->mpModeInfos[0].dwBPP = devmode.dmBitsPerPel; + This->mpModeInfos[0].lPitch = (devmode.dmPelsWidth*devmode.dmBitsPerPel)/8; + This->mpModeInfos[0].wRefreshRate = (WORD)devmode.dmDisplayFrequency; + + This->hdc = CreateDCW(L"DISPLAY",L"DISPLAY",NULL,NULL); + + if (This->hdc == NULL) + { + return DDERR_OUTOFMEMORY ; + } + + hbmp = CreateCompatibleBitmap(This->hdc, 1, 1); + if (hbmp==NULL) + { + DxHeapMemFree(This->mpModeInfos); + DeleteDC(This->hdc); + return DDERR_OUTOFMEMORY; + } + + pbmiData = (UCHAR *) DxHeapMemAlloc(bmiSize); + pbmi = (BITMAPINFO*)pbmiData; + + if (pbmiData==NULL) + { + DxHeapMemFree(This->mpModeInfos); + DeleteDC(This->hdc); + DeleteObject(hbmp); + return DDERR_OUTOFMEMORY; + } + + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biBitCount = (WORD)devmode.dmBitsPerPel; + pbmi->bmiHeader.biCompression = BI_BITFIELDS; + pbmi->bmiHeader.biWidth = 1; + pbmi->bmiHeader.biHeight = 1; + + GetDIBits(This->hdc, hbmp, 0, 0, NULL, pbmi, 0); + DeleteObject(hbmp); + + pMasks = (DWORD*)(pbmiData + sizeof(BITMAPINFOHEADER)); + This->mpModeInfos[0].dwRBitMask = pMasks[0]; + This->mpModeInfos[0].dwGBitMask = pMasks[1]; + This->mpModeInfos[0].dwBBitMask = pMasks[2]; + This->mpModeInfos[0].dwAlphaBitMask = pMasks[3]; + + DxHeapMemFree(pbmiData); + + /* Startup HEL and HAL */ + RtlZeroMemory(&This->mDDrawGlobal, sizeof(DDRAWI_DIRECTDRAW_GBL)); + RtlZeroMemory(&This->mHALInfo, sizeof(DDHALINFO)); + RtlZeroMemory(&This->mCallbacks, sizeof(DDHAL_CALLBACKS)); + + This->mDDrawLocal.lpDDCB = &This->mCallbacks; + This->mDDrawLocal.lpGbl = &This->mDDrawGlobal; + This->mDDrawLocal.dwProcessId = GetCurrentProcessId(); + + This->mDDrawGlobal.lpDDCBtmp = &This->mCallbacks; + This->mDDrawGlobal.lpExclusiveOwner = &This->mDDrawLocal; + + hal_ret = Hal_DirectDraw_Initialize (iface); + hel_ret = Hel_DirectDraw_Initialize (iface); + if ((hal_ret!=DD_OK) && (hel_ret!=DD_OK)) + { + return DDERR_NODIRECTDRAWSUPPORT; + } + + /* + Try figout which api we shall use, first we try see if HAL exits + if it does not we select HEL instead + */ + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) { This->mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; @@ -123,10 +209,11 @@ { This->mDdCreateSurface.CreateSurface = This->mCallbacks.HELDD.CreateSurface; } - - This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; - This->mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - + + /* Setup calback struct so we do not need refill same info again */ + This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; + This->mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + return DD_OK; }

1 0

[hpoussin] 21548: Add more documentation about ntoskrnl/io/pnpmgr.c
by hpoussin＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: hpoussin Date: Tue Apr 11 17:00:08 2006 New Revision: 21548 URL: http://svn.reactos.ru/svn/reactos?rev=21548&view=rev Log: Add more documentation about ntoskrnl/io/pnpmgr.c Modified: trunk/documentation/audit/ntoskrnl/io/pnpmgr.txt Modified: trunk/documentation/audit/ntoskrnl/io/pnpmgr.txt URL: http://svn.reactos.ru/svn/reactos/trunk/documentation/audit/ntoskrnl/io/pnp… ============================================================================== --- trunk/documentation/audit/ntoskrnl/io/pnpmgr.txt (original) +++ trunk/documentation/audit/ntoskrnl/io/pnpmgr.txt Tue Apr 11 17:00:08 2006 @@ -11,8 +11,11 @@ Result: Clean (<5 lines) IopQueryDeviceCapabilities() -Info: Google reports only references to ReactOS's source code, no results in msdn search too -Result: Author needs to be contacted, however function implementation seems to be rather small and has a few comments +Info: + Google reports only references to ReactOS's source code, no results in msdn search too. + IRP_MN_QUERY_CAPABILITIES and DEVICE_CAPABILITIES structure are described here: http://www.osronline.com/DDKx/kmarch/k112_22r6.htm + Uses IopInitiatePnpIrp to send the IRP_MJ_PNP Irp +Result: Clean IoInvalidateDeviceRelations() Result: Clean (<5 lines) @@ -34,8 +37,10 @@ Result: <5 lines of actual code -> Clean IopGetBusTypeGuidIndex() -Info: Only ReactOS source code got in results of Google search. Function is heavily commented. There is a goto usage, however it's obvious and doesn't seem to come - from reverse engineering. +Info: + Searches BusTypeGuid entry in the IopBusTypeGuidList list. If it is not found, create a new entry in the list and return its index + Only ReactOS source code got in results of Google search. Function is heavily commented. There is a goto usage, however it's obvious and doesn't seem to come + from reverse engineering. Result: ? IopCreateDeviceNode() / IopFreeDeviceNode() @@ -43,8 +48,11 @@ Result: ? IopInitiatePnpIrp() -Info: Google finds only ReactOS results. I haven't checked other information sources -Result: ? +Info: + Google finds only ReactOS results. + Sends a IRP_MJ_PNP Irp to a device stack. + Method to send a synchronous Irp is well documented on the Web, and all used methods are documented +Result: Clean IopTraverseDeviceTreeNode() / IopTraverseDeviceTree() Info: Google finds only ReactOS results. I haven't checked other information sources @@ -59,16 +67,25 @@ Result: ? IopAssignDeviceResources() -Info: Google finds only ReactOS results. I haven't checked other information sources. This function seems to be absolutely ReactOS-specific (especially the irq-hacks/etc) -Result: Probably Clean? +Info: + Google finds only ReactOS results. + Creates a allocated resource list by using the resource requirements list. It doesn't do resource arbitration. + Structures are documented at http://www.osronline.com/DDKx/kmarch/k112_5quq.htm and http://www.osronline.com/DDKx/kmarch/k112_92k2.htm + There is a goto usage, to prevent duplication of resources cleanup code +Result: Clean IopGetParentIdPrefix() -Info: Google finds only ReactOS results. I haven't checked other information sources -Result: ? +Info: + Google finds only ReactOS results. + Creates a prefix for the device instance string, when it may be not unique on the whole computer. + The prefix is the crc32 of the instance path of the parent device node. +Result: Clean IopActionInterrogateDeviceStack() -Info: Google finds only ReactOS results. I haven't checked other information sources -Result: ? +Info: + Google finds only ReactOS results. I haven't checked other information sources + Sends lots of IRP_MJ_PNP Irps to fill the device node structure +Result: Probably clean IopActionConfigureChildServices() / IopActionInitChildServices() Info: Google finds only ReactOS results. I haven't checked other information sources @@ -84,7 +101,7 @@ Result: Clean (<5 LOC) IopInvalidateDeviceRelations() -Info: hpoussin worked on it, and also I remember there are sources of documentation for it +Info: Fireball remembers there are sources of documentation for it Result: probably Clean IopSetRootDeviceInstanceData()

1 0

[tretiakov] 21547: Added winemine.
by tretiakov＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: tretiakov Date: Tue Apr 11 15:14:06 2006 New Revision: 21547 URL: http://svn.reactos.ru/svn/reactos?rev=21547&view=rev Log: Added winemine. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=2… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Tue Apr 11 15:14:06 2006 @@ -26,6 +26,7 @@ work to import a new dll. The following build tools are shared with Wine. + reactos/tools/unicode # Synced to Wine-0_9_5 reactos/tools/wpp # Synced to Wine-0_9_5 reactos/tools/bin2res # Resource to binary converter @@ -85,9 +86,11 @@ reactos/dll/directx/dxdiagn # Synced to Wine-0_9_5 ReactOS shares the following programs with Winehq. -reactos/base/applications/regedit # Out of sync -reactos/base/system/expand # Out of sync -reactos/base/system/msiexec # Synced to Wine-0_9_3 + +reactos/base/applications/games/winemine # Out of sync +reactos/base/applications/regedit # Out of sync +reactos/base/system/expand # Out of sync +reactos/base/system/msiexec # Synced to Wine-0_9_3 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

1 0

[greatlrd] 21546: more redesign of ddraw. move hal and hel detection of cancreatesurface and createsurface HEL and HAL and use HAL if it found, if HAL not found use HEL
by greatlrd＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: greatlrd Date: Tue Apr 11 11:43:29 2006 New Revision: 21546 URL: http://svn.reactos.ru/svn/reactos?rev=21546&view=rev Log: more redesign of ddraw. move hal and hel detection of cancreatesurface and createsurface HEL and HAL and use HAL if it found, if HAL not found use HEL Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Apr 11 11:43:29 2006 @@ -102,7 +102,31 @@ Hal_DirectDraw_Initialize (iface); Hel_DirectDraw_Initialize (iface); - + This->mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + { + This->mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; + } + else + { + This->mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HELDD.CanCreateSurface; + } + + This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) + { + This->mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + } + else + { + This->mDdCreateSurface.CreateSurface = This->mCallbacks.HELDD.CreateSurface; + } + + This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; + This->mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + return DD_OK; } @@ -348,48 +372,24 @@ //IDirectDrawImpl* This = (IDirectDrawImpl*)iface; //IDirectDrawSurfaceImpl* That = ppSurf; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + - mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) - { - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - } - else - { - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HELDD.CanCreateSurface; - } - - mDdCreateSurface.lpDD = &This->mDDrawGlobal; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) - { - mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - } - else - { - mDdCreateSurface.CreateSurface = This->mCallbacks.HELDD.CreateSurface; - } - - mDdCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; - - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; + This->mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + + if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { return DDERR_NOTINITIALIZED; } - if (mDdCanCreateSurface.ddRVal != DD_OK) + if (This->mDdCanCreateSurface.ddRVal != DD_OK) { return DDERR_NOTINITIALIZED; } @@ -420,19 +420,19 @@ - mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; - mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; - mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; + This->mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + This->mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; + This->mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + if (This->mDdCreateSurface.CreateSurface(&This->mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { return DDERR_NOTINITIALIZED; } - if (mDdCreateSurface.ddRVal != DD_OK) + if (This->mDdCreateSurface.ddRVal != DD_OK) { - return mDdCreateSurface.ddRVal; + return This->mDdCreateSurface.ddRVal; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Tue Apr 11 11:43:29 2006 @@ -77,6 +77,10 @@ /* internal counter */ ULONG ref; + + /* Callbacks info */ + DDHAL_CREATESURFACEDATA mDdCreateSurface; + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; } IDirectDrawImpl;

1 0

[greatlrd] 21545: Start redesgin ddraw. so we can resue code betwin HEL and HAL interface. Todo so we create HEL Callbacks in HEL Callbacks shall the software version of the api be implement.
by greatlrd＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: greatlrd Date: Tue Apr 11 10:24:29 2006 New Revision: 21545 URL: http://svn.reactos.ru/svn/reactos?rev=21545&view=rev Log: Start redesgin ddraw. so we can resue code betwin HEL and HAL interface. Todo so we create HEL Callbacks in HEL Callbacks shall the software version of the api be implement. Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c trunk/reactos/dll/directx/ddraw/soft/surface_hel.c Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Tue Apr 11 10:24:29 2006 @@ -11,282 +11,7 @@ #include "rosdraw.h" -HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter) -{ - // UINT i; - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - IDirectDrawSurfaceImpl* That = ppSurf; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - - - mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) - { - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - } - else - { - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HELDD.CanCreateSurface; - } - - mDdCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - - if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - - memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); - That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; - - if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - memset(&That->Surf->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - That->Surf->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - That->Surf->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; - That->Surf->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; - That->Surf->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; - That->Surf->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; - That->Surf->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; - - memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - That->Surf->mPrimaryLocal.lpGbl = &That->Surf->mPrimaryGlobal; - That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; - That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); - - /* - FIXME Check the flags if we shall create a primaresurface for overlay or something else - Examine windows which flags are being set for we assume this is right unsue I think - */ - //That->Surf->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; - That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; - That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; - - - - mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; - mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; - mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; - - - if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - - /* FIXME fill in this if they are avali - DDSD_BACKBUFFERCOUNT - DDSD_CKDESTBLT - DDSD_CKDESTOVERLAY - DDSD_CKSRCBLT - DDSD_CKSRCOVERLAY - DDSD_LINEARSIZE - DDSD_LPSURFACE - DDSD_MIPMAPCOUNT - DDSD_ZBUFFERBITDEPTH - */ - - That->Surf->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; - RtlCopyMemory(&That->Surf->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); - RtlCopyMemory(&That->Surf->mddsdPrimary.ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); - - //RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); - //RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); - - if (This->mDDrawGlobal.vmiData.dwDisplayHeight != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_HEIGHT ; - That->Surf->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; - } - - if (This->mDDrawGlobal.vmiData.dwDisplayWidth != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_WIDTH ; - That->Surf->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; - } - - if (This->mDDrawGlobal.vmiData.lDisplayPitch != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_PITCH ; - That->Surf->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; - } - - if ( This->mDDrawGlobal.dwMonitorFrequency != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; - That->Surf->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; - } - - if (This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; - That->Surf->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; - } - - return DD_OK; - - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) - { - // DX_STUB_str( "Can not create overlay surface"); - // memset(&That->Surf->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); - // memcpy(&That->Surf->mddsdOverlay,pDDSD,sizeof(DDSURFACEDESC)); - // That->Surf->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); - //That->Surf->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; - - //That->Surf->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - - //That->Surf->mddsdOverlay.dwWidth = 100; //pels; - //That->Surf->mddsdOverlay.dwHeight = 100; // lines; - //That->Surf->mddsdOverlay.dwBackBufferCount = 1; //cBuffers; - - //That->Surf->mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - //That->Surf->mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; - //That->Surf->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; - - //mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - //mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - //mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - //mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay; // pDDSD; - - - //if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - //{ - // return DDERR_NOTINITIALIZED; - //} - - //if (mDdCanCreateSurface.ddRVal != DD_OK) - //{ - // return DDERR_NOTINITIALIZED; - //} - - //memset(&That->Surf->mOverlayGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - //That->Surf->mOverlayGlobal.dwGlobalFlags = 0; - //That->Surf->mOverlayGlobal.lpDD = &This->mDDrawGlobal; - //That->Surf->mOverlayGlobal.lpDDHandle = &This->mDDrawGlobal; - //That->Surf->mOverlayGlobal.wWidth = (WORD)That->Surf->mddsdOverlay.dwWidth; - //That->Surf->mOverlayGlobal.wHeight = (WORD)That->Surf->mddsdOverlay.dwHeight; - //That->Surf->mOverlayGlobal.lPitch = -1; - //That->Surf->mOverlayGlobal.ddpfSurface = That->Surf->mddsdOverlay.ddpfPixelFormat; - - //// setup front- and backbuffer surfaces - //UINT cSurfaces = That->Surf->mddsdOverlay.dwBackBufferCount + 1; - //for (i = 0; i < cSurfaces; i++) - //{ - // memset(&That->Surf->mOverlayMore[i], 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - // That->Surf->mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - // memset(&That->Surf->mOverlayLocal[i], 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - // That->Surf->mOverlayLocal[i].lpGbl = &That->Surf->mOverlayGlobal; - // That->Surf->mOverlayLocal[i].lpSurfMore = &That->Surf->mOverlayMore[i]; - // That->Surf->mOverlayLocal[i].dwProcessId = GetCurrentProcessId(); - // That->Surf->mOverlayLocal[i].dwFlags = (i == 0) ? - // (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER): - // (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER); - - // That->Surf->mOverlayLocal[i].dwFlags |= DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| DDRAWISURF_HASPIXELFORMAT| DDRAWISURF_HASOVERLAYDATA; - - // That->Surf->mOverlayLocal[i].ddsCaps.dwCaps = That->Surf->mddsdOverlay.ddsCaps.dwCaps; - // That->Surf->mpOverlayLocals[i] = &That->Surf->mOverlayLocal[i]; - //} - - //for (i = 0; i < cSurfaces; i++) - //{ - // UINT j = (i + 1) % cSurfaces; - // if (!DdAttachSurface(That->Surf->mpOverlayLocals[i], That->Surf->mpOverlayLocals[j])) - // { - // // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); - // return DD_FALSE; - // } - //} - - //mDdCreateSurface.lpDD = &This->mDDrawGlobal; - //mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - //mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay;//pDDSD; - //mDdCreateSurface.lplpSList = That->Surf->mpOverlayLocals; //cSurfaces; - //mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; - - //if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - //{ - // return DDERR_NOTINITIALIZED; - //} - - //if (mDdCreateSurface.ddRVal != DD_OK) - //{ - // return mDdCreateSurface.ddRVal; - //} - - //DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; - //mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; - //mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; - //mDdUpdateOverlay.lpDDDestSurface = That->Surf->mpPrimaryLocals[0]; - //mDdUpdateOverlay.lpDDSrcSurface = That->Surf->mpOverlayLocals[0];//pDDSurface; - //mDdUpdateOverlay.dwFlags = DDOVER_SHOW; - - //mDdUpdateOverlay.rDest.top = 0; - //mDdUpdateOverlay.rDest.left = 0; - //mDdUpdateOverlay.rDest.right = 50; - //mDdUpdateOverlay.rDest.bottom = 50; - - //mDdUpdateOverlay.rSrc.top = 0; - //mDdUpdateOverlay.rSrc.left = 0; - //mDdUpdateOverlay.rSrc.right = 50; - //mDdUpdateOverlay.rSrc.bottom = 50; - - //if (mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) - //{ - // return DDERR_NOTINITIALIZED; - //} - - //if (mDdUpdateOverlay.ddRVal != DD_OK) - //{ - // return mDdUpdateOverlay.ddRVal; - //} - - return DD_OK; - return DDERR_INVALIDSURFACETYPE; - - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) - { - DX_STUB_str( "Can not create backbuffer surface"); - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - { - DX_STUB_str( "Can not create texture surface"); - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - { - DX_STUB_str( "Can not create zbuffer surface"); - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) - { - DX_STUB_str( "Can not create offscreenplain surface"); - } - - return DDERR_INVALIDSURFACETYPE; -} HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest, LPDIRECTDRAWSURFACE7 src, LPRECT rSrc, DWORD dwFlags, LPDDBLTFX lpbltfx) Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Apr 11 10:24:29 2006 @@ -298,7 +298,6 @@ { DX_WINDBG_trace(); - HRESULT ret; DxSurf *surf; if (pUnkOuter!=NULL) @@ -328,8 +327,7 @@ return E_OUTOFMEMORY; } - - + That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; *ppSurf = (LPDIRECTDRAWSURFACE7)That; @@ -346,20 +344,290 @@ That->Surf = surf; - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) - { - ret = Hal_DirectDraw_CreateSurface (iface, pDDSD, That, pUnkOuter); - } - else - { - ret = Hel_DirectDraw_CreateSurface (iface, pDDSD, ppSurf, pUnkOuter); - } - - //This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)&This->mPrimaryLocal; - - // the real surface object creation + // UINT i; + //IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + //IDirectDrawSurfaceImpl* That = ppSurf; + + DDHAL_CREATESURFACEDATA mDdCreateSurface; + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + + mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + { + mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; + } + else + { + mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HELDD.CanCreateSurface; + } + + mDdCreateSurface.lpDD = &This->mDDrawGlobal; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) + { + mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + } + else + { + mDdCreateSurface.CreateSurface = This->mCallbacks.HELDD.CreateSurface; + } + + mDdCreateSurface.lpDD = &This->mDDrawGlobal; + mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + + memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); + That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; + mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + + if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + return DDERR_NOTINITIALIZED; + } + + memset(&That->Surf->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + That->Surf->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + That->Surf->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; + That->Surf->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; + That->Surf->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; + That->Surf->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; + That->Surf->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; + + memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + That->Surf->mPrimaryLocal.lpGbl = &That->Surf->mPrimaryGlobal; + That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; + That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); + + /* + FIXME Check the flags if we shall create a primaresurface for overlay or something else + Examine windows which flags are being set for we assume this is right unsue I think + */ + //That->Surf->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; + That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; + That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; + + + + mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; + mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; + + + if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCreateSurface.ddRVal != DD_OK) + { + return mDdCreateSurface.ddRVal; + } + + + /* FIXME fill in this if they are avali + DDSD_BACKBUFFERCOUNT + DDSD_CKDESTBLT + DDSD_CKDESTOVERLAY + DDSD_CKSRCBLT + DDSD_CKSRCOVERLAY + DDSD_LINEARSIZE + DDSD_LPSURFACE + DDSD_MIPMAPCOUNT + DDSD_ZBUFFERBITDEPTH + */ + + That->Surf->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; + RtlCopyMemory(&That->Surf->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); + RtlCopyMemory(&That->Surf->mddsdPrimary.ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); + + //RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); + //RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); + + if (This->mDDrawGlobal.vmiData.dwDisplayHeight != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_HEIGHT ; + That->Surf->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; + } + + if (This->mDDrawGlobal.vmiData.dwDisplayWidth != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_WIDTH ; + That->Surf->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; + } + + if (This->mDDrawGlobal.vmiData.lDisplayPitch != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_PITCH ; + That->Surf->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; + } + + if ( This->mDDrawGlobal.dwMonitorFrequency != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; + That->Surf->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; + } + + if (This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; + That->Surf->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; + } + + return DD_OK; + + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) + { + // DX_STUB_str( "Can not create overlay surface"); + // memset(&That->Surf->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); + // memcpy(&That->Surf->mddsdOverlay,pDDSD,sizeof(DDSURFACEDESC)); + // That->Surf->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); + //That->Surf->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; + + //That->Surf->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + + //That->Surf->mddsdOverlay.dwWidth = 100; //pels; + //That->Surf->mddsdOverlay.dwHeight = 100; // lines; + //That->Surf->mddsdOverlay.dwBackBufferCount = 1; //cBuffers; + + //That->Surf->mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + //That->Surf->mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; + //That->Surf->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; + + //mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + //mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; + //mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; + //mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay; // pDDSD; - return DD_OK; + + //if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //if (mDdCanCreateSurface.ddRVal != DD_OK) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //memset(&That->Surf->mOverlayGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + //That->Surf->mOverlayGlobal.dwGlobalFlags = 0; + //That->Surf->mOverlayGlobal.lpDD = &This->mDDrawGlobal; + //That->Surf->mOverlayGlobal.lpDDHandle = &This->mDDrawGlobal; + //That->Surf->mOverlayGlobal.wWidth = (WORD)That->Surf->mddsdOverlay.dwWidth; + //That->Surf->mOverlayGlobal.wHeight = (WORD)That->Surf->mddsdOverlay.dwHeight; + //That->Surf->mOverlayGlobal.lPitch = -1; + //That->Surf->mOverlayGlobal.ddpfSurface = That->Surf->mddsdOverlay.ddpfPixelFormat; + + //// setup front- and backbuffer surfaces + //UINT cSurfaces = That->Surf->mddsdOverlay.dwBackBufferCount + 1; + //for (i = 0; i < cSurfaces; i++) + //{ + // memset(&That->Surf->mOverlayMore[i], 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + // That->Surf->mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + // memset(&That->Surf->mOverlayLocal[i], 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + // That->Surf->mOverlayLocal[i].lpGbl = &That->Surf->mOverlayGlobal; + // That->Surf->mOverlayLocal[i].lpSurfMore = &That->Surf->mOverlayMore[i]; + // That->Surf->mOverlayLocal[i].dwProcessId = GetCurrentProcessId(); + // That->Surf->mOverlayLocal[i].dwFlags = (i == 0) ? + // (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER): + // (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER); + + // That->Surf->mOverlayLocal[i].dwFlags |= DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| DDRAWISURF_HASPIXELFORMAT| DDRAWISURF_HASOVERLAYDATA; + + // That->Surf->mOverlayLocal[i].ddsCaps.dwCaps = That->Surf->mddsdOverlay.ddsCaps.dwCaps; + // That->Surf->mpOverlayLocals[i] = &That->Surf->mOverlayLocal[i]; + //} + + //for (i = 0; i < cSurfaces; i++) + //{ + // UINT j = (i + 1) % cSurfaces; + // if (!DdAttachSurface(That->Surf->mpOverlayLocals[i], That->Surf->mpOverlayLocals[j])) + // { + // // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); + // return DD_FALSE; + // } + //} + + //mDdCreateSurface.lpDD = &This->mDDrawGlobal; + //mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + //mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay;//pDDSD; + //mDdCreateSurface.lplpSList = That->Surf->mpOverlayLocals; //cSurfaces; + //mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; + + //if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //if (mDdCreateSurface.ddRVal != DD_OK) + //{ + // return mDdCreateSurface.ddRVal; + //} + + //DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; + //mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; + //mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; + //mDdUpdateOverlay.lpDDDestSurface = That->Surf->mpPrimaryLocals[0]; + //mDdUpdateOverlay.lpDDSrcSurface = That->Surf->mpOverlayLocals[0];//pDDSurface; + //mDdUpdateOverlay.dwFlags = DDOVER_SHOW; + + //mDdUpdateOverlay.rDest.top = 0; + //mDdUpdateOverlay.rDest.left = 0; + //mDdUpdateOverlay.rDest.right = 50; + //mDdUpdateOverlay.rDest.bottom = 50; + + //mDdUpdateOverlay.rSrc.top = 0; + //mDdUpdateOverlay.rSrc.left = 0; + //mDdUpdateOverlay.rSrc.right = 50; + //mDdUpdateOverlay.rSrc.bottom = 50; + + //if (mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //if (mDdUpdateOverlay.ddRVal != DD_OK) + //{ + // return mDdUpdateOverlay.ddRVal; + //} + + return DD_OK; + return DDERR_INVALIDSURFACETYPE; + + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) + { + DX_STUB_str( "Can not create backbuffer surface"); + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE) + { + DX_STUB_str( "Can not create texture surface"); + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + DX_STUB_str( "Can not create zbuffer surface"); + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) + { + DX_STUB_str( "Can not create offscreenplain surface"); + } + + return DDERR_INVALIDSURFACETYPE; + } HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, DWORD dwFlags, Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Tue Apr 11 10:24:29 2006 @@ -173,7 +173,6 @@ HRESULT Hal_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD ); HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); -HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter); HRESULT Hal_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event); HRESULT Hal_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags); HRESULT Hal_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey); @@ -190,7 +189,6 @@ HRESULT Hel_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 , DWORD , DWORD ,DWORD , DWORD , DWORD ); HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); -HRESULT Hel_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter); HRESULT Hel_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event); HRESULT Hel_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey); HRESULT Hel_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect); @@ -200,6 +198,7 @@ /* HEL CALLBACK */ DWORD CALLBACK HelDdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA pccsd); +DWORD CALLBACK HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface); /* Setting for HEL should be move to ros special reg key ? */ Modified: trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Tue Apr 11 10:24:29 2006 @@ -18,10 +18,11 @@ This->HELMemoryAvilable = HEL_GRAPHIC_MEMORY_MAX; - This->mCallbacks.HELDD.dwFlags = DDHAL_CB32_CANCREATESURFACE; This->mCallbacks.HELDD.CanCreateSurface = HelDdCanCreateSurface; + This->mCallbacks.HELDD.dwFlags = DDHAL_CB32_CREATESURFACE; + This->mCallbacks.HELDD.CreateSurface = HelDdCreateSurface; return DD_OK; } Modified: trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c Tue Apr 11 10:24:29 2006 @@ -138,3 +138,8 @@ pccsd->ddRVal = DD_OK; return DDHAL_DRIVER_HANDLED; } + +DWORD CALLBACK HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface) +{ + DX_STUB; +} Modified: trunk/reactos/dll/directx/ddraw/soft/surface_hel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_hel.c Tue Apr 11 10:24:29 2006 @@ -11,10 +11,7 @@ #include "rosdraw.h" -HRESULT Hel_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) -{ - DX_STUB; -} + HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx)

1 0

[greatlrd] 21544: see fireball last commit msg about this file, patch from w3seek : Use RtlComputeCrc32 instead of yet another inline implementation for calculating a CRC32 checksum. The attached patch fixes this. bug : 1342
by greatlrd＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: greatlrd Date: Mon Apr 10 23:57:47 2006 New Revision: 21544 URL: http://svn.reactos.ru/svn/reactos?rev=21544&view=rev Log: see fireball last commit msg about this file, patch from w3seek : Use RtlComputeCrc32 instead of yet another inline implementation for calculating a CRC32 checksum. The attached patch fixes this. bug : 1342 Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Mon Apr 10 23:57:47 2006 @@ -273,6 +273,14 @@ RtlCaptureContext(OUT PCONTEXT ContextRecord); NTSYSAPI +ULONG +NTAPI +RtlComputeCrc32( + IN ULONG Initial, + IN PUCHAR Data, + IN ULONG Length); + +NTSYSAPI PVOID NTAPI RtlEncodePointer(IN PVOID Pointer); Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr.c?rev=21… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c Mon Apr 10 23:57:47 2006 @@ -24,78 +24,6 @@ PDRIVER_OBJECT IopRootDriverObject; PIO_BUS_TYPE_GUID_LIST IopBusTypeGuidList = NULL; - -// Static CRC table -ULONG crc32Table[256] = -{ - 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, - 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, - 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, - 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, - 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, - 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, - 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, - 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, - 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, - 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, - 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, - 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, - 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, - 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, - 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, - 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, - - 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, - 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, - 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, - 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, - 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, - 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, - 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, - 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, - 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, - 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, - 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, - 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, - 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, - 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, - 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, - 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, - - 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, - 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, - 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, - 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, - 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, - 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, - 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, - 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, - 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, - 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, - 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, - 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, - 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, - 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, - 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, - 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, - - 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, - 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, - 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, - 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, - 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, - 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, - 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, - 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, - 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, - 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, - 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, - 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, - 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, - 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, - 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, - 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D, -}; static NTSTATUS INIT_FUNCTION IopSetRootDeviceInstanceData(PDEVICE_NODE DeviceNode); @@ -1390,9 +1318,7 @@ UNICODE_STRING ValueName; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hKey = INVALID_HANDLE_VALUE; - PBYTE currentByte; - ULONG crc32 = 0; - ULONG i; + ULONG crc32; NTSTATUS Status; /* HACK: As long as some devices have a NULL device @@ -1446,10 +1372,10 @@ } /* 2. Create the ParentIdPrefix value */ - currentByte = (PBYTE)DeviceNode->Parent->InstancePath.Buffer; - for (i = 0; i < DeviceNode->Parent->InstancePath.Length; i++, currentByte++) - crc32 = (crc32 >> 8) ^ crc32Table[*currentByte ^ (crc32 & 0xff)]; - crc32 = ~crc32; + crc32 = RtlComputeCrc32(0, + (PUCHAR)DeviceNode->Parent->InstancePath.Buffer, + DeviceNode->Parent->InstancePath.Length); + swprintf((PWSTR)ParentIdPrefixInformation->Data, L"%lx&%lx", DeviceNode->Parent->Level, crc32); RtlInitUnicodeString(&KeyValue, (PWSTR)ParentIdPrefixInformation->Data);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs