Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 34296: Add two more query window types.
by jimtabor＠svn.reactos.org 04 Jul '08

04 Jul '08

Author: jimtabor Date: Fri Jul 4 13:52:22 2008 New Revision: 34296 URL: http://svn.reactos.org/svn/reactos?rev=34296&view=rev Log: Add two more query window types. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Fri Jul 4 13:52:22 2008 @@ -1903,6 +1903,8 @@ #define QUERY_WINDOW_UNIQUE_PROCESS_ID 0x00 #define QUERY_WINDOW_UNIQUE_THREAD_ID 0x01 +#define QUERY_WINDOW_ACTIVE 0x02 +#define QUERY_WINDOW_FOCUS 0x03 #define QUERY_WINDOW_ISHUNG 0x04 DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri Jul 4 13:52:22 2008 @@ -3952,12 +3952,14 @@ 0 = QWUniqueProcessId 1 = QWUniqueThreadId + 2 = QWActiveWindow + 3 = QWFocusWindow 4 = QWIsHung Implements IsHungAppWindow found by KJK::Hyperion. - 9 = QWKillWindow When I called this with hWnd == - DesktopWindow, it shutdown the system - and rebooted. + 9 = QWKillWindow When I called this with hWnd == + DesktopWindow, it shutdown the system + and rebooted. */ /* * @implemented @@ -3985,6 +3987,14 @@ case QUERY_WINDOW_UNIQUE_THREAD_ID: Result = (DWORD)IntGetWndThreadId(Window); + break; + + case QUERY_WINDOW_ACTIVE: + Result = (DWORD)UserGetActiveWindow(); + break; + + case QUERY_WINDOW_FOCUS: + Result = (DWORD)IntGetFocusWindow(); break; case QUERY_WINDOW_ISHUNG:

1 0

[janderwald] 34295: - fix typo
by janderwald＠svn.reactos.org 04 Jul '08

04 Jul '08

Author: janderwald Date: Fri Jul 4 13:10:59 2008 New Revision: 34295 URL: http://svn.reactos.org/svn/reactos?rev=34295&view=rev Log: - fix typo Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] Fri Jul 4 13:10:59 2008 @@ -30,7 +30,7 @@ ; Rich Text Files HKCR,".rtf","",0x00000000,"rtffile" HKCR,".rtf\shellnew","",0x00000000,"" -HKCR,".rft\shellnew","Data",0x00020000,"{\rtf1}" +HKCR,".rtf\shellnew","Data",0x00020000,"{\rtf1}" HKCR,"rtffile","",0x00000000,"Rich Text Document" HKCR,"rtffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\wordpad.exe,-1404" HKCR,"rtffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-2" Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Fri Jul 4 13:10:59 2008 @@ -30,7 +30,7 @@ ; Rich Text Files HKCR,".rtf","",0x00000000,"rtffile" HKCR,".rtf\shellnew","",0x00000000,"" -HKCR,".rft\shellnew","Data",0x00020000,"{\rtf1}" +HKCR,".rtf\shellnew","Data",0x00020000,"{\rtf1}" HKCR,"rtffile","",0x00000000,"Rich Text Document" HKCR,"rtffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\wordpad.exe,-1404" HKCR,"rtffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-2"

1 0

[jimtabor] 34294: Use PostOrSend instead of just Send. Works much better.
by jimtabor＠svn.reactos.org 04 Jul '08

04 Jul '08

Author: jimtabor Date: Fri Jul 4 12:55:56 2008 New Revision: 34294 URL: http://svn.reactos.org/svn/reactos?rev=34294&view=rev Log: Use PostOrSend instead of just Send. Works much better. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Fri Jul 4 12:55:56 2008 @@ -111,7 +111,7 @@ if (cWindow && (IntGetWndThreadId(cWindow) == OldTID)) { // FALSE if the window is being deactivated, // ThreadId that owns the window being activated. - co_IntSendMessage(*phWnd, WM_ACTIVATEAPP, FALSE, (LPARAM)NewTID); + co_IntPostOrSendMessage(*phWnd, WM_ACTIVATEAPP, FALSE, (LPARAM)NewTID); } } for (phWnd = List; *phWnd; ++phWnd) @@ -120,7 +120,7 @@ if (cWindow && (IntGetWndThreadId(cWindow) == NewTID)) { // TRUE if the window is being activated, // ThreadId that owns the window being deactivated. - co_IntSendMessage(*phWnd, WM_ACTIVATEAPP, TRUE, (LPARAM)OldTID); + co_IntPostOrSendMessage(*phWnd, WM_ACTIVATEAPP, TRUE, (LPARAM)OldTID); } } ExFreePool(List);

1 0

[fireball] 34293: Peter Oberndorfer <kumbayo84@arcor.de> - Implement %p for scanf.
by fireball＠svn.reactos.org 04 Jul '08

04 Jul '08

Author: fireball Date: Fri Jul 4 07:39:43 2008 New Revision: 34293 URL: http://svn.reactos.org/svn/reactos?rev=34293&view=rev Log: Peter Oberndorfer <kumbayo84(a)arcor.de> - Implement %p for scanf. Modified: trunk/reactos/lib/sdk/crt/string/scanf.h Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Fri Jul 4 07:39:43 2008 @@ -149,6 +149,8 @@ } /* read type */ switch(*format) { + case 'p': + case 'P': /* pointer. */ case 'x': case 'X': /* hexadecimal integer. */ base = 16; @@ -179,7 +181,7 @@ if (width>0) width--; } /* look for leading indication of base */ - if (width!=0 && nch == '0') { + if (width!=0 && nch == '0' && *format != 'p' && *format != 'P') { nch = _GETC_(file); if (width>0) width--; seendigit=1;

1 0

[fireball] 34292: Dmitry Gorbachev: - FreeLoader first reads entire ntoskrnl.exe (about 20M) into memory, then copies it to other address. Now, freeldr reads it straight to the place, not allocating extra memory for buffer. - Aleksey: This changes should be eventually adopted and merged into winldr's peloader.c. See issue #3447 for more details.
by fireball＠svn.reactos.org 04 Jul '08

04 Jul '08

Author: fireball Date: Fri Jul 4 05:36:03 2008 New Revision: 34292 URL: http://svn.reactos.org/svn/reactos?rev=34292&view=rev Log: Dmitry Gorbachev: - FreeLoader first reads entire ntoskrnl.exe (about 20M) into memory, then copies it to other address. Now, freeldr reads it straight to the place, not allocating extra memory for buffer. - Aleksey: This changes should be eventually adopted and merged into winldr's peloader.c. See issue #3447 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] Fri Jul 4 05:36:03 2008 @@ -113,6 +113,14 @@ PVOID NTAPI +FrLdrReadAndMapImage( + IN FILE *Image, + IN PCHAR ShortName, + IN ULONG ImageType +); + +PVOID +NTAPI FrLdrLoadImage( IN PCHAR szFileName, IN INT nPos, Modified: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] Fri Jul 4 05:36:03 2008 @@ -432,6 +432,174 @@ } return STATUS_SUCCESS; +} + +PVOID +NTAPI +FrLdrReadAndMapImage(IN FILE *Image, + IN PCHAR Name, + IN ULONG ImageType) +{ + PVOID ImageBase, LoadBase, ReadBuffer; + ULONG ImageId = LoaderBlock.ModsCount; + ULONG i, Size, ImageSize, SizeOfHeaders; + PIMAGE_NT_HEADERS NtHeader; + PIMAGE_SECTION_HEADER Section; + NTSTATUS Status = STATUS_SUCCESS; + + /* Try to see, maybe it's loaded already */ + if (LdrGetModuleObject(Name) != NULL) + { + /* It's loaded, return NULL. It would be wise to return + correct LoadBase, but it seems to be ignored almost everywhere */ + return NULL; + } + + /* Set the virtual (image) and physical (load) addresses */ + LoadBase = (PVOID)NextModuleBase; + ImageBase = RVA(LoadBase, KSEG0_BASE); + + /* Allocate a temporary buffer for the read */ + ReadBuffer = MmHeapAlloc(MM_PAGE_SIZE); + if (!ReadBuffer) + { + /* Fail */ + DbgPrint("Failed to allocate a temporary buffer for the read\n"); + return NULL; + } + + /* Set the file pointer to zero */ + FsSetFilePointer(Image, 0); + + /* Load first page of the file image */ + if (!FsReadFile(Image, MM_PAGE_SIZE, NULL, ReadBuffer)) + { + /* Fail */ + DbgPrint("Failed to read image: %s\n", Name); + return NULL; + } + + /* Get image headers */ + NtHeader = RtlImageNtHeader(ReadBuffer); + + /* Allocate memory for the driver */ + ImageSize = NtHeader->OptionalHeader.SizeOfImage; + LoadBase = MmAllocateMemoryAtAddress(ImageSize, LoadBase, LoaderSystemCode); + ASSERT(LoadBase); + + /* Copy headers over */ + SizeOfHeaders = NtHeader->OptionalHeader.SizeOfHeaders; + if (SizeOfHeaders < MM_PAGE_SIZE) + { + RtlMoveMemory(LoadBase, ReadBuffer, SizeOfHeaders); + } + else + { + RtlMoveMemory(LoadBase, ReadBuffer, MM_PAGE_SIZE); + if (!FsReadFile(Image, SizeOfHeaders - MM_PAGE_SIZE, NULL, + (PVOID)((ULONG_PTR)LoadBase + MM_PAGE_SIZE))) + { + DbgPrint("Failed to read image: %s\n", Name); + return NULL; + } + } + + /* Free the temporary buffer */ + MmHeapFree(ReadBuffer); + + /* Get the first section */ + NtHeader = RtlImageNtHeader(LoadBase); + Section = IMAGE_FIRST_SECTION(NtHeader); + + /* Read image sections into virtual section */ + for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) + { + /* Get the size of this section and check if it's valid */ + Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; + if (Size <= ImageSize) + { + if (Section[i].SizeOfRawData) + { + /* Copy the data from the disk to the image */ + FsSetFilePointer(Image, Section[i].PointerToRawData); + if (!FsReadFile(Image, + Section[i].Misc.VirtualSize > + Section[i].SizeOfRawData ? + Section[i].SizeOfRawData : + Section[i].Misc.VirtualSize, + NULL, + (PVOID)((ULONG_PTR)LoadBase + + Section[i].VirtualAddress))) + { + DbgPrint("Failed to read image: %s\n", Name); + return NULL; + } + } + else + { + /* Clear the BSS area */ + RtlZeroMemory((PVOID)((ULONG_PTR)LoadBase + + Section[i].VirtualAddress), + Section[i].Misc.VirtualSize); + } + } + } + + /* Calculate Difference between Real Base and Compiled Base*/ + Status = LdrRelocateImageWithBias(LoadBase, + (ULONG_PTR)ImageBase - + (ULONG_PTR)LoadBase, + "FreeLdr", + STATUS_SUCCESS, + STATUS_UNSUCCESSFUL, + STATUS_UNSUCCESSFUL); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DbgPrint("Failed to relocate image: %s\n", Name); + return NULL; + } + + /* Fill out Module Data Structure */ + reactos_modules[ImageId].ModStart = (ULONG_PTR)ImageBase; + reactos_modules[ImageId].ModEnd = (ULONG_PTR)ImageBase + ImageSize; + strcpy(reactos_module_strings[ImageId], Name); + reactos_modules[ImageId].String = (ULONG_PTR)reactos_module_strings[ImageId]; + LoaderBlock.ModsCount++; + + /* Detect kernel or HAL */ + if (!_stricmp(Name, "ntoskrnl.exe")) + { + KernelData = (PVOID)NextModuleBase; + KernelSize = ImageSize; + } + else if (!_stricmp(Name, "hal.dll")) + { + HalData = (PVOID)NextModuleBase; + HalSize = ImageSize; + } + else + { + DriverName[Drivers] = reactos_module_strings[ImageId]; + DriverData[Drivers] = (PVOID)NextModuleBase; + DriverSize[Drivers] = ImageSize; + Drivers++; + } + + /* Increase the next Load Base */ + NextModuleBase = ROUND_UP(NextModuleBase + ImageSize, PAGE_SIZE); + + /* Perform import fixups */ + if (!NT_SUCCESS(LdrPEFixupImports(LoadBase, Name))) + { + /* Fixup failed, just don't include it in the list */ + // NextModuleBase = OldNextModuleBase; + LoaderBlock.ModsCount = ImageId; + return NULL; + } + + /* Return the final mapped address */ + return LoadBase; } ULONG @@ -519,6 +687,12 @@ /* Allocate a temporary buffer for the read */ ReadBuffer = MmHeapAlloc(ImageSize); + if (!ReadBuffer) + { + /* Fail */ + DbgPrint("Failed to allocate a temporary buffer for the read\n"); + return NULL; + } /* Load the file image */ if (!FsReadFile(Image, ImageSize, NULL, ReadBuffer)) Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Fri Jul 4 05:36:03 2008 @@ -120,7 +120,7 @@ UiDrawStatusText(value); /* Load the driver */ - FrLdrMapImage(FilePointer, szFileName, 0); + FrLdrReadAndMapImage(FilePointer, szFileName, 0); /* Update status and return */ UiDrawProgressBarCenter(nPos, 100, szLoadingMsg); @@ -182,7 +182,7 @@ UiDrawStatusText(szBuffer); /* Do the actual loading */ - LoadBase = FrLdrMapImage(FilePointer, szShortName, ImageType); + LoadBase = FrLdrReadAndMapImage(FilePointer, szShortName, ImageType); /* Update Processbar and return success */ if (!FrLdrBootType) UiDrawProgressBarCenter(nPos, 100, szLoadingMsg); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Fri Jul 4 05:36:03 2008 @@ -82,7 +82,7 @@ UiDrawStatusText(szBuffer); /* Do the actual loading */ - LoadBase = FrLdrMapImage(FilePointer, szShortName, 1); + LoadBase = FrLdrReadAndMapImage(FilePointer, szShortName, 1); /* Get the NT header, kernel base and kernel entry */ NtHeader = RtlImageNtHeader(LoadBase);

1 0

[fireball] 34291: - There is no working strsafe lib yet, so including its header is meaningless.
by fireball＠svn.reactos.org 04 Jul '08

04 Jul '08

Author: fireball Date: Fri Jul 4 03:45:01 2008 New Revision: 34291 URL: http://svn.reactos.org/svn/reactos?rev=34291&view=rev Log: - There is no working strsafe lib yet, so including its header is meaningless. Modified: trunk/reactos/include/dxsdk/DShow.h Modified: trunk/reactos/include/dxsdk/DShow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/DShow.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/DShow.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/DShow.h [iso-8859-1] Fri Jul 4 03:45:01 2008 @@ -20,12 +20,12 @@ #include <olectl.h> #include <ddraw.h> #include <mmsystem.h> - +/* #ifndef NO_DSHOW_STRSAFE #define NO_SHLWAPI_STRFCNS #include <strsafe.h> #endif - +*/ #ifndef NUMELMS #define NUMELMS(aa) (sizeof(aa)/sizeof((aa)[0])) #endif

1 0

[cfinck] 34290: Remove the strsafe library, it was imported from a dubious source, which is incompatible with the LGPL
by cfinck＠svn.reactos.org 04 Jul '08

04 Jul '08

Author: cfinck Date: Fri Jul 4 03:24:37 2008 New Revision: 34290 URL: http://svn.reactos.org/svn/reactos?rev=34290&view=rev Log: Remove the strsafe library, it was imported from a dubious source, which is incompatible with the LGPL Removed: trunk/reactos/include/psdk/strsafe.h trunk/reactos/lib/sdk/strsafe/ Modified: trunk/reactos/lib/sdk/sdk.rbuild Removed: trunk/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/strsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/strsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/strsafe.h (removed) @@ -1,454 +1,0 @@ -/* - * STRSAFE - * - * Copyright 2007 Dmitry Chapyshev <dmitry(a)reactos.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 - */ -#ifndef _STRSAFE_H_INCLUDED_ -#define _STRSAFE_H_INCLUDED_ - -#ifdef __cplusplus -#define _STRSAFE_EXTERN_C extern "C" -extern "C" { -#else -#define _STRSAFE_EXTERN_C extern -#endif - -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include <windows.h> - -#define STRSAFE_INLINE_API __inline HRESULT __stdcall -#define STRSAFEAPI _STRSAFE_EXTERN_C HRESULT __stdcall - -#ifndef _NTSTRSAFE_H_INCLUDED_ - -#define STRSAFE_MAX_CCH 2147483647 - -#define STRSAFE_FILL_BEHIND_NULL 0x00000200 -#define STRSAFE_IGNORE_NULLS 0x00000100 -#define STRSAFE_FILL_ON_FAILURE 0x00000400 -#define STRSAFE_NULL_ON_FAILURE 0x00000800 -#define STRSAFE_NO_TRUNCATION 0x00001000 -#define STRSAFE_IGNORE_NULL_UNICODE_STRINGS 0x00010000 -#define STRSAFE_UNICODE_STRING_DEST_NULL_TERMINATED 0x00020000 - -#define STRSAFE_VALID_FLAGS (0x000000FF | STRSAFE_IGNORE_NULLS | STRSAFE_FILL_BEHIND_NULL | STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION) -#define STRSAFE_UNICODE_STRING_VALID_FLAGS (STRSAFE_VALID_FLAGS | STRSAFE_IGNORE_NULL_UNICODE_STRINGS | STRSAFE_UNICODE_STRING_DEST_NULL_TERMINATED) -#define STRSAFE_FILL_BYTE(x) ((unsigned long)((x & 0x000000FF) | STRSAFE_FILL_BEHIND_NULL)) -#define STRSAFE_FAILURE_BYTE(x) ((unsigned long)((x & 0x000000FF) | STRSAFE_FILL_ON_FAILURE)) -#define STRSAFE_GET_FILL_PATTERN(dwFlags) ((int)(dwFlags & 0x000000FF)) - -#endif /* _NTSTRSAFE_H_INCLUDED_ */ - -#define STRSAFE_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) -#define STRSAFE_E_INVALID_PARAMETER ((HRESULT)0x80070057L) -#define STRSAFE_E_END_OF_FILE ((HRESULT)0x80070026L) - -#ifndef STRSAFE_NO_CCH_FUNCTIONS -STRSAFEAPI -StringCchCatA(LPTSTR pszDest, - size_t cchDest, - LPCTSTR pszSrc); - -STRSAFEAPI -StringCchCatW(LPWSTR pszDest, - size_t cchDest, - LPCWSTR pszSrc); - -STRSAFEAPI -StringCchCatExA(LPTSTR pszDest, - size_t cchDest, - LPCTSTR pszSrc, - LPTSTR *ppszDestEnd, - size_t* pcchRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCchCatExW(LPWSTR pszDest, - size_t cchDest, - LPCWSTR pszSrc, - LPWSTR *ppszDestEnd, - size_t* pcchRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCchCatNA(LPTSTR pszDest, - size_t cchDest, - LPCTSTR pszSrc, - size_t cchMaxAppend); - -STRSAFEAPI -StringCchCatNW(LPWSTR pszDest, - size_t cchDest, - LPCWSTR pszSrc, - size_t cchMaxAppend); - -STRSAFEAPI -StringCchCatNExA(LPTSTR pszDest, - size_t cchDest, - LPCTSTR pszSrc, - size_t cchMaxAppend, - LPTSTR *ppszDestEnd, - size_t* pcchRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCchCatNExW(LPWSTR pszDest, - size_t cchDest, - LPCWSTR pszSrc, - size_t cchMaxAppend, - LPWSTR *ppszDestEnd, - size_t* pcchRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCchCopyA(LPTSTR pszDest, - size_t cchDest, - LPCTSTR pszSrc); - -STRSAFEAPI -StringCchCopyW(LPWSTR pszDest, - size_t cchDest, - LPCWSTR pszSrc); - -STRSAFEAPI -StringCchCopyExA(LPTSTR pszDest, - size_t cchDest, - LPCTSTR pszSrc, - LPTSTR *ppszDestEnd, - size_t* pcchRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCchCopyExW(LPWSTR pszDest, - size_t cchDest, - LPCWSTR pszSrc, - LPWSTR *ppszDestEnd, - size_t* pcchRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCchCopyNA(LPTSTR pszDest, - size_t cchDest, - LPCTSTR pszSrc, - size_t cchSrc); - -STRSAFEAPI -StringCchCopyNW(LPWSTR pszDest, - size_t cchDest, - LPCWSTR pszSrc, - size_t cchSrc); - -STRSAFEAPI -StringCchCopyNExA(LPTSTR pszDest, - size_t cchDest, - LPCTSTR pszSrc, - size_t cchSrc, - LPTSTR *ppszDestEnd, - size_t* pcchRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCchCopyNExW(LPWSTR pszDest, - size_t cchDest, - LPCWSTR pszSrc, - size_t cchSrc, - LPWSTR *ppszDestEnd, - size_t* pcchRemaining, - unsigned long dwFlags); - -STRSAFE_INLINE_API -StringCchGetsA(LPTSTR pszDest, - size_t cchDest); - -STRSAFE_INLINE_API -StringCchGetsW(LPWSTR pszDest, - size_t cchDest); - -STRSAFE_INLINE_API -StringCchGetsExA(LPTSTR pszDest, - size_t cchDest, - LPTSTR *ppszDestEnd, - size_t* pcchRemaining, - unsigned long dwFlags); - -STRSAFE_INLINE_API -StringCchGetsExW(LPWSTR pszDest, - size_t cchDest, - LPWSTR *ppszDestEnd, - size_t* pcchRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCchVPrintfA(LPTSTR pszDest, - size_t cchDest, - LPCTSTR pszFormat, - va_list argList); - -STRSAFEAPI -StringCchVPrintfW(LPWSTR pszDest, - size_t cchDest, - LPCWSTR pszFormat, - va_list argList); - -STRSAFEAPI -StringCchVPrintfExA(LPTSTR pszDest, - size_t cchDest, - LPTSTR *ppszDestEnd, - size_t* pcchRemaining, - unsigned long dwFlags, - LPCTSTR pszFormat, - va_list argList); - -STRSAFEAPI -StringCchVPrintfExW(LPWSTR pszDest, - size_t cchDest, - LPWSTR *ppszDestEnd, - size_t* pcchRemaining, - unsigned long dwFlags, - LPCWSTR pszFormat, - va_list argList); - -STRSAFEAPI -StringCchLengthA(LPCTSTR psz, - size_t cchMax, - size_t* pcch); - -STRSAFEAPI -StringCchLengthW(LPCWSTR psz, - size_t cchMax, - size_t* pcch); -#endif /* STRSAFE_NO_CCH_FUNCTIONS */ - -/* CB */ -#ifndef STRSAFE_NO_CB_FUNCTIONS -STRSAFEAPI -StringCbCatA(LPTSTR pszDest, - size_t cbDest, - LPCTSTR pszSrc); - -STRSAFEAPI -StringCbCatW(LPWSTR pszDest, - size_t cbDest, - LPCWSTR pszSrc); - -STRSAFEAPI -StringCbCatExA(LPTSTR pszDest, - size_t cbDest, - LPCTSTR pszSrc, - LPTSTR *ppszDestEnd, - size_t* pcbRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCbCatExW(LPWSTR pszDest, - size_t cbDest, - LPCWSTR pszSrc, - LPWSTR *ppszDestEnd, - size_t* pcbRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCbCopyA(LPTSTR pszDest, - size_t cbDest, - LPCTSTR pszSrc); - -STRSAFEAPI -StringCbCopyW(LPWSTR pszDest, - size_t cbDest, - LPCWSTR pszSrc); - -STRSAFEAPI -StringCbCopyExA(LPTSTR pszDest, - size_t cbDest, - LPCTSTR pszSrc, - LPTSTR *ppszDestEnd, - size_t* pcbRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCbCopyExW(LPWSTR pszDest, - size_t cbDest, - LPCWSTR pszSrc, - LPWSTR *ppszDestEnd, - size_t* pcbRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCbCopyNA(LPTSTR pszDest, - size_t cbDest, - LPCTSTR pszSrc, - size_t cbSrc); - -STRSAFEAPI -StringCbCopyNW(LPWSTR pszDest, - size_t cbDest, - LPCWSTR pszSrc, - size_t cbSrc); - -STRSAFEAPI -StringCbCopyNExA(LPTSTR pszDest, - size_t cbDest, - LPCTSTR pszSrc, - size_t cbSrc, - LPTSTR *ppszDestEnd, - size_t* pcbRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCbCopyNExW(LPWSTR pszDest, - size_t cbDest, - LPCWSTR pszSrc, - size_t cbSrc, - LPWSTR *ppszDestEnd, - size_t* pcbRemaining, - unsigned long dwFlags); - -STRSAFE_INLINE_API -StringCbGetsA(LPTSTR pszDest, - size_t cbDest); - -STRSAFE_INLINE_API -StringCbGetsW(LPWSTR pszDest, - size_t cbDest); - -STRSAFE_INLINE_API -StringCbGetsExA(LPTSTR pszDest, - size_t cbDest, - LPTSTR *ppszDestEnd, - size_t* pbRemaining, - unsigned long dwFlags); - -STRSAFE_INLINE_API -StringCbGetsExW(LPWSTR pszDest, - size_t cbDest, - LPWSTR *ppszDestEnd, - size_t* pcbRemaining, - unsigned long dwFlags); - -STRSAFEAPI -StringCbPrintfA(LPTSTR pszDest, - size_t cbDest, - LPCTSTR pszFormat, - ...); - -STRSAFEAPI -StringCbPrintfW(LPWSTR pszDest, - size_t cbDest, - LPCWSTR pszFormat, - ...); - -STRSAFEAPI -StringCbPrintfExA(LPTSTR pszDest, - size_t cbDest, - LPTSTR *ppszDestEnd, - size_t* pcbRemaining, - unsigned long dwFlags, - LPCTSTR pszFormat, - ...); - -STRSAFEAPI -StringCbPrintfExW(LPWSTR pszDest, - size_t cbDest, - LPWSTR *ppszDestEnd, - size_t* pcbRemaining, - unsigned long dwFlags, - LPCWSTR pszFormat, - ...); -#endif /* STRSAFE_NO_CB_FUNCTIONS */ - -#ifdef UNICODE -#ifndef STRSAFE_NO_CCH_FUNCTIONS -#define StringCchCat StringCchCatW -#define StringCchCatEx StringCchCatExW -#define StringCchCatN StringCchCatNW -#define StringCchCatNEx StringCchCatNExW -#define StringCchCopy StringCchCopyW -#define StringCchCopyEx StringCchCopyExW -#define StringCchCopyN StringCchCopyNW -#define StringCchCopyNEx StringCchCopyNExW -#define StringCchGets StringCchGetsW -#define StringCchGetsEx StringCchGetsExW -#define StringCchPrintf StringCchPrintfW -#define StringCchPrintfEx StringCchPrintfExW -#define StringCchVPrintf StringCchVPrintfW -#define StringCchVPrintfEx StringCchVPrintfExW -#define StringCchLength StringCchLengthW -#endif /* STRSAFE_NO_CCH_FUNCTIONS */ - -#ifndef STRSAFE_NO_CB_FUNCTIONS -#define StringCbCat StringCbCatW -#define StringCbCatEx StringCbCatExW -#define StringCbCatN StringCbCatNW -#define StringCbCatNEx StringCbCatNExW -#define StringCbCopy StringCbCopyW -#define StringCbCopyEx StringCbCopyExW -#define StringCbCopyN StringCbCopyNW -#define StringCbCopyNEx StringCbCopyNExW -#define StringCbGets StringCbGetsW -#define StringCbGetsEx StringCbGetsExW -#define StringCbPrintf StringCbPrintfW -#define StringCbPrintfEx StringCbPrintfExW -#define StringCbVPrintf StringCbVPrintfW -#define StringCbVPrintfEx StringCbVPrintfExW -#define StringCbLenght StringCbLenghtW -#endif /* STRSAFE_NO_CB_FUNCTIONS */ - -#else -#ifndef STRSAFE_NO_CCH_FUNCTIONS -#define StringCchCat StringCchCatA -#define StringCchCatEx StringCchCatExA -#define StringCchCatN StringCchCatNA -#define StringCchCatNEx StringCchCatNExA -#define StringCchCopy StringCchCopyA -#define StringCchCopyEx StringCchCopyExA -#define StringCchCopyN StringCchCopyNA -#define StringCchCopyNEx StringCchCopyNExA -#define StringCchGets StringCchGetsA -#define StringCchGetsEx StringCchGetsExA -#define StringCchPrintf StringCchPrintfA -#define StringCchPrintfEx StringCchPrintfExA -#define StringCchVPrintf StringCchVPrintfA -#define StringCchVPrintfEx StringCchVPrintfExA -#define StringCchLength StringCchLengthA -#endif /* STRSAFE_NO_CCH_FUNCTIONS */ - -#ifndef STRSAFE_NO_CB_FUNCTIONS -#define StringCbCat StringCbCatA -#define StringCbCatEx StringCbCatExA -#define StringCbCatN StringCbCatNA -#define StringCbCatNEx StringCbCatNExA -#define StringCbCopy StringCbCopyA -#define StringCbCopyEx StringCbCopyExA -#define StringCbCopyN StringCbCopyNA -#define StringCbCopyNEx StringCbCopyNExA -#define StringCbGets StringCbGetsA -#define StringCbGetsEx StringCbGetsExA -#define StringCbPrintf StringCbPrintfA -#define StringCbPrintfEx StringCbPrintfExA -#define StringCbVPrintf StringCbVPrintfA -#define StringCbVPrintfEx StringCbVPrintfExA -#define StringCbLenght StringCbLenghtA -#endif /* STRSAFE_NO_CB_FUNCTIONS */ -#endif /* UNICODE */ - -#ifdef __cplusplus -} -#endif /* cplusplus */ - -#endif /* _STRSAFE_H_INCLUDED_ */ Modified: trunk/reactos/lib/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/sdk.rbuild?rev=342… ============================================================================== --- trunk/reactos/lib/sdk/sdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/sdk.rbuild [iso-8859-1] Fri Jul 4 03:24:37 2008 @@ -23,7 +23,4 @@ <directory name="scrnsave"> <xi:include href="scrnsave/scrnsave.rbuild" /> </directory> - <directory name="strsafe"> - <xi:include href="strsafe/strsafe.rbuild" /> - </directory> </group>

1 0

[jimtabor] 34289: - Moved WM_ACTIVATEAPP calles before WM_NC/ACTIVATE calls. - Implemented GetLastActivePopup, based on wine. - Fixed DCE, pass all tests, except six clipping and one ROP check, which might be due to DCX_NORESETATTRS flag not being reset during the next GetDCEx call. <Researching>
by jimtabor＠svn.reactos.org 04 Jul '08

04 Jul '08

Author: jimtabor Date: Thu Jul 3 23:55:18 2008 New Revision: 34289 URL: http://svn.reactos.org/svn/reactos?rev=34289&view=rev Log: - Moved WM_ACTIVATEAPP calles before WM_NC/ACTIVATE calls. - Implemented GetLastActivePopup, based on wine. - Fixed DCE, pass all tests, except six clipping and one ROP check, which might be due to DCX_NORESETATTRS flag not being reset during the next GetDCEx call. <Researching> Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Thu Jul 3 23:55:18 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/window.c @@ -916,21 +915,21 @@ /* - * @unimplemented + * @implemented */ HWND STDCALL GetLastActivePopup(HWND hWnd) { - PWINDOW Wnd, WndParent; - HWND Ret = NULL; - WARN("Not fully implemented!"); + PWINDOW Wnd; + HWND Ret = hWnd; + Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) { _SEH_TRY { - WndParent = NULL; - Ret = hWnd; + if (Wnd->hWndLastActive) + Ret = Wnd->hWndLastActive; } _SEH_HANDLE { Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu Jul 3 23:55:18 2008 @@ -153,6 +153,8 @@ UNICODE_STRING WindowName; /* Context help id */ DWORD ContextHelpId; + + HWND hWndLastActive; struct { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Thu Jul 3 23:55:18 2008 @@ -16,7 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id$ */ #include <w32k.h> @@ -85,17 +84,12 @@ co_IntShellHookNotify(HSHELL_WINDOWACTIVATED, (LPARAM) hWnd); } - UserDerefObjectCo(Window); - - /* FIXME: IntIsWindow */ - - CHECKPOINT; - co_IntPostOrSendMessage(hWnd, WM_NCACTIVATE, (WPARAM)(hWnd == UserGetForegroundWindow()), 0); - /* FIXME: WA_CLICKACTIVE */ - co_IntPostOrSendMessage(hWnd, WM_ACTIVATE, - MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, - UserGetWindowLong(hWnd, GWL_STYLE, FALSE) & WS_MINIMIZE), - (LPARAM)hWndPrev); + if (Window->Wnd) + { // Set last active for window and it's owner. + Window->Wnd->hWndLastActive = hWnd; + if (Window->Wnd->Owner) + Window->Wnd->Owner->hWndLastActive = hWnd; + } if (Window && hWndPrev) { @@ -133,6 +127,18 @@ } } } + + UserDerefObjectCo(Window); + + /* FIXME: IntIsWindow */ + + CHECKPOINT; + co_IntPostOrSendMessage(hWnd, WM_NCACTIVATE, (WPARAM)(hWnd == UserGetForegroundWindow()), 0); + /* FIXME: WA_CLICKACTIVE */ + co_IntPostOrSendMessage(hWnd, WM_ACTIVATE, + MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, + UserGetWindowLong(hWnd, GWL_STYLE, FALSE) & WS_MINIMIZE), + (LPARAM)hWndPrev); } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Thu Jul 3 23:55:18 2008 @@ -220,16 +220,6 @@ dce->DCXFlags |= DCX_DCEEMPTY; } } - else - { // Save Users Dc_Attr. - PDC dc = DC_LockDc(dce->hDC); - if(dc) - { - PDC_ATTR Dc_Attr = dc->pDc_Attr; - if(Dc_Attr) MmCopyFromCaller(&dc->Dc_Attr, Dc_Attr, sizeof(DC_ATTR)); - DC_UnlockDc(dc); - } - } dce->DCXFlags &= ~DCX_DCEBUSY; DPRINT("Exit!!!!! DCX_CACHE!!!!!! hDC-> %x \n", dce->hDC); if (!IntGdiSetDCOwnerEx( dce->hDC, GDI_OBJ_HMGR_NONE, FALSE)) @@ -427,17 +417,8 @@ // Window nz, check to see if we still own this or it is just cheap wine tonight. if (!(Flags & DCX_CACHE)) { - if ( Wnd->ti != GetW32ThreadInfo()) Flags |= DCX_CACHE; // Ah~ Not Powned! Forced to be cheap~ - // Can only have one POWNED or CLASS. - if ( !Window->Dce && (Wnd->Class->Style & CS_OWNDC)) - Window->Dce = DceAllocDCE(NULL, DCE_WINDOW_DC); - else - Flags |= DCX_CACHE; - - if ( !Wnd->Class->Dce && (Wnd->Class->Style & CS_CLASSDC)) - Wnd->Class->Dce = DceAllocDCE(NULL, DCE_CLASS_DC); - else - Flags |= DCX_CACHE; + if ( Wnd->ti != GetW32ThreadInfo()) + Flags |= DCX_CACHE; // Ah~ Not Powned! Forced to be cheap~ } DcxFlags = Flags & DCX_CACHECOMPAREMASK; @@ -455,7 +436,10 @@ // Need to test for null here. Not sure if this is a bug or a feature. // First time use hax, need to use DceAllocDCE during window display init. if (!Dce) break; - +// +// The way I understand this, you can have more than one DC per window. +// Only one Owned if one was requested and saved and one Cached. +// if ((Dce->DCXFlags & (DCX_CACHE | DCX_DCEBUSY)) == DCX_CACHE) { DceUnused = Dce; @@ -469,7 +453,6 @@ #if 0 /* FIXME */ UpdateVisRgn = FALSE; #endif - UpdateClipOrigin = TRUE; break; } @@ -531,8 +514,6 @@ /* FIXME: Handle error */ } - Dce->DCXFlags = Flags | DCX_DCEBUSY; - if (!(Flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN)) && ClipRegion) { if (!(Flags & DCX_KEEPCLIPRGN)) @@ -546,6 +527,8 @@ DceDeleteClipRgn(Dce); } #endif + + Dce->DCXFlags = Flags | DCX_DCEBUSY; if (0 != (Flags & DCX_INTERSECTUPDATE) && NULL == ClipRegion) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Jul 3 23:55:18 2008 @@ -1627,6 +1627,7 @@ Wnd->ti = ti; Wnd->pi = ti->kpi; + Wnd->hWndLastActive = hWnd; } DPRINT("Created object with handle %X\n", hWnd);

1 0

[jmorlan] 34288: - BITMAP_Cleanup: Fix leak of DIBSECTION structure; remove redundant ifs. - NtGdi(Get|Set)BitmapDimension: SEHify; set ERROR_INVALID_HANDLE on a bad non-NULL bitmap. - NtGdiGetDCforBitmap: Don't crash on bad bitmap.
by jmorlan＠svn.reactos.org 04 Jul '08

04 Jul '08

Author: jmorlan Date: Thu Jul 3 19:05:31 2008 New Revision: 34288 URL: http://svn.reactos.org/svn/reactos?rev=34288&view=rev Log: - BITMAP_Cleanup: Fix leak of DIBSECTION structure; remove redundant ifs. - NtGdi(Get|Set)BitmapDimension: SEHify; set ERROR_INVALID_HANDLE on a bad non-NULL bitmap. - NtGdiGetDCforBitmap: Don't crash on bad bitmap. Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Thu Jul 3 19:05:31 2008 @@ -133,13 +133,11 @@ { if (pBmp->dib == NULL) { - if (pBmp->SurfObj.pvBits != NULL) - ExFreePool(pBmp->SurfObj.pvBits); + ExFreePool(pBmp->SurfObj.pvBits); } else { - if (pBmp->SurfObj.pvBits != NULL) - EngFreeUserMem(pBmp->SurfObj.pvBits); + EngFreeUserMem(pBmp->SurfObj.pvBits); } if (pBmp->hDIBPalette != NULL) { @@ -152,6 +150,9 @@ ExFreePoolWithTag(pBmp->BitsLock, TAG_BITMAPOBJ); pBmp->BitsLock = NULL; } + + if (pBmp->dib) + ExFreePoolWithTag(pBmp->dib, TAG_DIB); return TRUE; } @@ -218,18 +219,32 @@ LPSIZE Dimension) { PBITMAPOBJ bmp; + BOOL Ret = TRUE; + + if (hBitmap == NULL) + return FALSE; bmp = BITMAPOBJ_LockBitmap(hBitmap); if (bmp == NULL) { + SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - *Dimension = bmp->dimension; + _SEH_TRY + { + ProbeForWrite(Dimension, sizeof(SIZE), 1); + *Dimension = bmp->dimension; + } + _SEH_HANDLE + { + Ret = FALSE; + } + _SEH_END BITMAPOBJ_UnlockBitmap(bmp); - return TRUE; + return Ret; } COLORREF STDCALL @@ -504,23 +519,39 @@ LPSIZE Size) { PBITMAPOBJ bmp; + BOOL Ret = TRUE; + + if (hBitmap == NULL) + return FALSE; bmp = BITMAPOBJ_LockBitmap(hBitmap); if (bmp == NULL) { + SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } if (Size) { - *Size = bmp->dimension; - } + _SEH_TRY + { + ProbeForWrite(Size, sizeof(SIZE), 1); + *Size = bmp->dimension; + } + _SEH_HANDLE + { + Ret = FALSE; + } + _SEH_END + } + + /* The dimension is changed even if writing the old value failed */ bmp->dimension.cx = Width; bmp->dimension.cy = Height; BITMAPOBJ_UnlockBitmap (bmp); - return TRUE; + return Ret; } BOOL STDCALL @@ -746,8 +777,11 @@ { HDC hDC = NULL; PBITMAPOBJ bmp = BITMAPOBJ_LockBitmap( hsurf ); - hDC = bmp->hDC; - BITMAPOBJ_UnlockBitmap( bmp ); + if (bmp) + { + hDC = bmp->hDC; + BITMAPOBJ_UnlockBitmap( bmp ); + } return hDC; }

1 0

[dreimer] 34287: Polish Translation Update for Calc by Olaf Siejka.
by dreimer＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: dreimer Date: Thu Jul 3 14:41:46 2008 New Revision: 34287 URL: http://svn.reactos.org/svn/reactos?rev=34287&view=rev Log: Polish Translation Update for Calc by Olaf Siejka. Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Thu Jul 3 14:41:46 2008 @@ -1,5 +1,5 @@ /* - * translated by Caemyr - Olaf Siejka (Feb, 2008) + * translated by Caemyr - Olaf Siejka (Feb, Jun 2008) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -242,16 +242,16 @@ MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Convert",IDC_BUTTON_CONVERT,35,105,76,17 + PUSHBUTTON "Konwersja",IDC_BUTTON_CONVERT,35,105,76,17 COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Category:",IDC_STATIC,4,20,56,8 + LTEXT "Kategoria:",IDC_STATIC,4,20,56,8 COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Convert from:",IDC_STATIC,4,49,56,8 + LTEXT "Konwertuj z:",IDC_STATIC,4,49,56,8 COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Convert to:",IDC_STATIC,4,76,56,8 + LTEXT "Konwertuj na:",IDC_STATIC,4,76,56,8 CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | @@ -293,7 +293,7 @@ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17 CONTROL "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17 - CONTROL "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | + CONTROL "Pierw",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17 CONTROL "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17 @@ -451,54 +451,54 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN - IDS_CONV_AREA "Area" - IDS_CONV_CONSUMPTION "Consumption (engines)" - IDS_CONV_CURRENCY "Currencies" - IDS_CONV_ENERGY "Energy" - IDS_CONV_LENGTH "Lenghts" - IDS_CONV_POWER "Power" - IDS_CONV_PRESSURE "Pressure" - IDS_CONV_TEMPERATURE "Temperature" - IDS_CONV_VELOCITY "Velocity" - IDS_CONV_VOLUME "Volume" - IDS_CONV_WEIGHT "Weights" + IDS_CONV_AREA "Powierzchnia" + IDS_CONV_CONSUMPTION "Zu¿ycie (silniki)" + IDS_CONV_CURRENCY "Waluty" + IDS_CONV_ENERGY "Energia" + IDS_CONV_LENGTH "D³ugoæ" + IDS_CONV_POWER "Moc" + IDS_CONV_PRESSURE "Cinienie" + IDS_CONV_TEMPERATURE "Temperatura" + IDS_CONV_VELOCITY "Prêdkoæ" + IDS_CONV_VOLUME "Objêtoæ" + IDS_CONV_WEIGHT "Waga" END // TYPES OF AREAS STRINGTABLE DISCARDABLE BEGIN - IDS_AREA_ACRES "Acres" - IDS_AREA_ACRES_BRAZIL "Acres (Brazil)" - IDS_AREA_ACRES_FRANCE "Acres (France)" - IDS_AREA_ACRES_SCOTS "Acres (Scots)" - IDS_AREA_ACRES_US "Acres (US)" - IDS_AREA_ARES "Ares" + IDS_AREA_ACRES "Akry" + IDS_AREA_ACRES_BRAZIL "Akry (Brazylia)" + IDS_AREA_ACRES_FRANCE "Akry (Francja)" + IDS_AREA_ACRES_SCOTS "Akry (Szkocja)" + IDS_AREA_ACRES_US "Akry (USA)" + IDS_AREA_ARES "Ary" IDS_AREA_CHOU "Chou" IDS_AREA_DANBO "Danbo" - IDS_AREA_HECTARES "Hectares" + IDS_AREA_HECTARES "Hektary" IDS_AREA_JEONGBO "Jeongbo" - IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + IDS_AREA_MORGEN_HUNGARY "Morgi (Wêgry)" IDS_AREA_MU "Mu" IDS_AREA_PING "Ping" IDS_AREA_PYEONG "Pyeong" IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_RAI "Rai" IDS_AREA_SE "Se" - IDS_AREA_SQUARE_CENTIMETERS "Square centimeters" - IDS_AREA_SQUARE_CHR "Square chr" - IDS_AREA_SQUARE_FATHOMS "Square fathoms" - IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)" - IDS_AREA_SQUARE_FEET "Square feet" - IDS_AREA_SQUARE_INCHES "Square inches" - IDS_AREA_SQUARE_KILOMETERS "Square kilometers" - IDS_AREA_SQUARE_LAR "Square lar" - IDS_AREA_SQUARE_METER "Square meter" - IDS_AREA_SQUARE_MILES "Square miles" - IDS_AREA_SQUARE_MILLIMETERS "Square millimeters" - IDS_AREA_SQUARE_SHAKU "Square shaku" - IDS_AREA_SQUARE_TSUEN "Square tsuen" - IDS_AREA_SQUARE_VA "Square va" - IDS_AREA_SQUARE_YARD "Square yard" + IDS_AREA_SQUARE_CENTIMETERS "Centymetrów kwadratowych" + IDS_AREA_SQUARE_CHR "Chr kwadratowych" + IDS_AREA_SQUARE_FATHOMS "S¹¿ni kwadratowych" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "S¹¿ni kwadratowych (Wêgry)" + IDS_AREA_SQUARE_FEET "Stóp kwadratowych" + IDS_AREA_SQUARE_INCHES "Cali kwadratowych" + IDS_AREA_SQUARE_KILOMETERS "Kilometrów kwadratowych" + IDS_AREA_SQUARE_LAR "Lar kwadratowych" + IDS_AREA_SQUARE_METER "Metrów kwadratowych" + IDS_AREA_SQUARE_MILES "Mil kwadratowych" + IDS_AREA_SQUARE_MILLIMETERS "Milimetrów kwadratowych" + IDS_AREA_SQUARE_SHAKU "Shaku kwadratowych" + IDS_AREA_SQUARE_TSUEN "Tsuen kwadratowych" + IDS_AREA_SQUARE_VA "Va kwadratowych" + IDS_AREA_SQUARE_YARD "Jardów kwadratowych" IDS_AREA_TAN "Tan" IDS_AREA_TSUBO "Tsubo" END @@ -506,81 +506,81 @@ // TYPES OF COMSUMPTIONS STRINGTABLE DISCARDABLE BEGIN - IDS_CONSUMPTION_KM_PER_L "Kilometer/liter" - IDS_CONSUMPTION_L_PER_100_KM "Liters/100 kilometers" - IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)" - IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)" + IDS_CONSUMPTION_KM_PER_L "Kilometrów/litr" + IDS_CONSUMPTION_L_PER_100_KM "Litrów/100 kilometróws" + IDS_CONSUMPTION_MILES_GALLON_UK "Mil/galon (UK)" + IDS_CONSUMPTION_MILES_GALLON_US "Mil/galon (USA)" END // TYPES OF CURRENCIES STRINGTABLE DISCARDABLE BEGIN - IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" - IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" - IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" - IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" - IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_AUSTRIAN_SCHILLING "Austriacki szyling" + IDS_CURRENCY_BELGIAN_FRANC "Belgijski frank" + IDS_CURRENCY_CYPRIOT_POUND "Cypryjski funt" + IDS_CURRENCY_DEUTSCHE_MARK "Niemiecka marka" + IDS_CURRENCY_DUTCH_GUILDER "Holenderki gulden" IDS_CURRENCY_EURO "Euro" - IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" - IDS_CURRENCY_FRENCH_FRANC "French franc" - IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" - IDS_CURRENCY_IRISH_POUND "Irish pound" - IDS_CURRENCY_ITALIAN_LIRA "Italian lira" - IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" - IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" - IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" - IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" + IDS_CURRENCY_FINNISH_MARKKA "Fiñska marka" + IDS_CURRENCY_FRENCH_FRANC "Francuski frank" + IDS_CURRENCY_GREEK_DRACHMA "Grecka drachma" + IDS_CURRENCY_IRISH_POUND "Irlandzki funt" + IDS_CURRENCY_ITALIAN_LIRA "W³oskie liry" + IDS_CURRENCY_LUXEMBOURG_FRANC "Luksemburski frank" + IDS_CURRENCY_MALTESE_LIRA "Maltañskie liry" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalskie escudo" + IDS_CURRENCY_SLOVENIAN_TOLAR "S³oveñski tolar" + IDS_CURRENCY_SPANISH_PESETA "Hiszpañska peseta" END // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C calories" - IDS_ENERGY_ERGS "Ergs" - IDS_ENERGY_IT_CALORIES "International Table calories" - IDS_ENERGY_JOULES "Joules" - IDS_ENERGY_KILOJOULES "Kilojoules" - IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" - IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" - IDS_ENERGY_TH_CALORIES "Thermochemical calorie" + IDS_ENERGY_15_C_CALORIES "15 ^C kalorii" + IDS_ENERGY_ERGS "Ergów" + IDS_ENERGY_IT_CALORIES "Miêdzynarodowa Tablica kalorii" + IDS_ENERGY_JOULES "D¿uli" + IDS_ENERGY_KILOJOULES "Kilod¿uli" + IDS_ENERGY_KILOWATT_HOURS "Kilowatogodzin" + IDS_ENERGY_NUTRITION_CALORIES "Kalorii spo¿ywczych" + IDS_ENERGY_TH_CALORIES "Kalorii termochemicznych" END // TYPES OF LENGTHS STRINGTABLE DISCARDABLE BEGIN - IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" - IDS_LENGTH_BARLEYCORNS "Barleycorns" - IDS_LENGTH_CENTIMETERS "Centimeters" + IDS_LENGTH_ANGSTROMS "Angsztremów" + IDS_LENGTH_ASTRONOMILA_UNITS "Jednostek Astronomicznych" + IDS_LENGTH_BARLEYCORNS "Palców" + IDS_LENGTH_CENTIMETERS "Centimetrów" IDS_LENGTH_CHAINS_UK "Chains (UK)" IDS_LENGTH_CHI "Chi" IDS_LENGTH_CHOU "Chou" IDS_LENGTH_CHR "Chr" IDS_LENGTH_CUN "Cun" - IDS_LENGTH_FATHOMS "Fathoms" - IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Hungary)" - IDS_LENGTH_FEET "Feet" + IDS_LENGTH_FATHOMS "S¹¿ni" + IDS_LENGTH_FATHOMS_HUNGARY "S¹¿ni (Wêgry)" + IDS_LENGTH_FEET "Stóp" IDS_LENGTH_FURLONGS "Furlongs" IDS_LENGTH_GAN "Gan" - IDS_LENGTH_HANDS "Hands" + IDS_LENGTH_HANDS "D³oni" IDS_LENGTH_HUNH "Hunh" - IDS_LENGTH_INCHES "Inches" + IDS_LENGTH_INCHES "Cali" IDS_LENGTH_JA "Ja" IDS_LENGTH_JEONG "Jeong" IDS_LENGTH_KABIET "Kabiet" IDS_LENGTH_KEN "Ken" IDS_LENGTH_KEUB "Keub" - IDS_LENGTH_KILOMETERS "Kilometers" + IDS_LENGTH_KILOMETERS "Kilometerów" IDS_LENGTH_LAR "Lar" - IDS_LENGTH_LIGHT_YEARS "Light years" + IDS_LENGTH_LIGHT_YEARS "Lat wietlnych" IDS_LENGTH_LINKS_UK "Links (UK)" - IDS_LENGTH_METERS "Meters" - IDS_LENGTH_MILES "Miles" - IDS_LENGTH_MILLIMETERS "Millimeters" - IDS_LENGTH_NAUTICAL_MILES "Nautical miles" + IDS_LENGTH_METERS "Metrów" + IDS_LENGTH_MILES "Mil" + IDS_LENGTH_MILLIMETERS "Millimetrów" + IDS_LENGTH_NAUTICAL_MILES "Mil morskich" IDS_LENGTH_NIEU "Nieu" - IDS_LENGTH_PARSECS "Parsecs" + IDS_LENGTH_PARSECS "Parseków" IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japan)" IDS_LENGTH_RI_KOREA "Ri (Korea)" @@ -591,7 +591,7 @@ IDS_LENGTH_SUN "Sun" IDS_LENGTH_TSUEN "Tsuen" IDS_LENGTH_VA "Va" - IDS_LENGTH_YARDS "Yards" + IDS_LENGTH_YARDS "Jardów" IDS_LENGTH_YOTE "Yote" IDS_LENGTH_ZHANG "Zhang" END @@ -599,74 +599,74 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN - IDS_POWER_HORSEPOWER "Horsepower" - IDS_POWER_KILOWATTS "Kilowatts" - IDS_POWER_MEGAWATTS "Megawatts" - IDS_POWER_WATTS "Watts" + IDS_POWER_HORSEPOWER "Koni mechanicznych" + IDS_POWER_KILOWATTS "Kilowatów" + IDS_POWER_MEGAWATTS "Megawatów" + IDS_POWER_WATTS "Watów" END // TYPE OF PRESSURES STRINGTABLE DISCARDABLE BEGIN - IDS_PRESSURE_ATMOSPHERES "Atmospheres" - IDS_PRESSURE_BARS "Bars" - IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" - IDS_PRESSURE_PASCALS "Pascals" - IDS_PRESSURE_PSI "Pounds-force per square inch" + IDS_PRESSURE_ATMOSPHERES "Atmosfer" + IDS_PRESSURE_BARS "Barów" + IDS_PRESSURE_MM_OF_MERCURY "Millimetrów s³upka rtêci" + IDS_PRESSURE_PASCALS "Paskali" + IDS_PRESSURE_PSI "Funtów na cal kwadratowy" END // TYPES OF TEMPERATURES STRINGTABLE DISCARDABLE BEGIN - IDS_TEMPERATURE_CELSIUS "Celsius" - IDS_TEMPERATURE_FAHRENHEIT "Fahrenheit" - IDS_TEMPERATURE_KELVIN "Kelvin" - IDS_TEMPERATURE_RANKINE "Rankine" + IDS_TEMPERATURE_CELSIUS "Celsiusza" + IDS_TEMPERATURE_FAHRENHEIT "Fahrenheita" + IDS_TEMPERATURE_KELVIN "Kelvina" + IDS_TEMPERATURE_RANKINE "Rankina" END // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN - IDS_VELOCITY_FEET_HOUR "Feet/hour" - IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour" - IDS_VELOCITY_KNOTS "Knots" - IDS_VELOCITY_MACH "Mach" - IDS_VELOCITY_METERS_SECOND "Meters/second" - IDS_VELOCITY_MILES_HOUR "Miles/hour" + IDS_VELOCITY_FEET_HOUR "Stóp/godzinê" + IDS_VELOCITY_KILOMETERS_HOUR "Kilometrów/godzinê" + IDS_VELOCITY_KNOTS "Wêz³ów" + IDS_VELOCITY_MACH "Machów" + IDS_VELOCITY_METERS_SECOND "Metrów/sekundê" + IDS_VELOCITY_MILES_HOUR "Mil/godzinê" END // TYPES OF VOLUMES STRINGTABLE DISCARDABLE BEGIN - IDS_VOLUME_BARRELS_UK "Barrels (UK)" - IDS_VOLUME_BARRELS_OIL "Barrels oil" + IDS_VOLUME_BARRELS_UK "Bary³ek (UK)" + IDS_VOLUME_BARRELS_OIL "Bary³ek" IDS_VOLUME_BUN "Bun" - IDS_VOLUME_BUSHELS_UK "Bushels (UK)" - IDS_VOLUME_BUSHELS_US "Bushels (US)" - IDS_VOLUME_CUBIC_CENTIMETERS "Cubic centimeters" - IDS_VOLUME_CUBIC_FEET "Cubic feet" - IDS_VOLUME_CUBIC_INCHES "Cubic inches" - IDS_VOLUME_CUBIC_METERS "Cubic meters" - IDS_VOLUME_CUBIC_YARDS "Cubic yards" + IDS_VOLUME_BUSHELS_UK "Buszli (UK)" + IDS_VOLUME_BUSHELS_US "Buszli (US)" + IDS_VOLUME_CUBIC_CENTIMETERS "Centymetrów szeciennych" + IDS_VOLUME_CUBIC_FEET "Stóp szeciennych" + IDS_VOLUME_CUBIC_INCHES "Cali szeciennych" + IDS_VOLUME_CUBIC_METERS "Metrów szeciennych" + IDS_VOLUME_CUBIC_YARDS "Jardów szeciennych" IDS_VOLUME_DOE "Doe" - IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" - IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)" - IDS_VOLUME_GALLONS_UK "Gallons (UK)" - IDS_VOLUME_GALLONS_DRY_US "Gallons, dry (US)" - IDS_VOLUME_GALLONS_LIQUID_US "Gallons, liquid (US)" + IDS_VOLUME_FLUID_OUNCES_UK "Uncji, p³yn (UK)" + IDS_VOLUME_FLUID_OUNCES_US "Uncji, p³yn (US)" + IDS_VOLUME_GALLONS_UK "Galonów (UK)" + IDS_VOLUME_GALLONS_DRY_US "Galonów, sypkie (US)" + IDS_VOLUME_GALLONS_LIQUID_US "Gallons, p³yn (US)" IDS_VOLUME_GOU "Gou" IDS_VOLUME_HOP "Hop" IDS_VOLUME_ICCE "Icce" IDS_VOLUME_KWIAN "Kwian" - IDS_VOLUME_LITERS "Liters" + IDS_VOLUME_LITERS "Litrów" IDS_VOLUME_MAL "Mal" IDS_VOLUME_MILLILITERS "Milliliters" - IDS_VOLUME_PINTS_UK "Pints (UK)" - IDS_VOLUME_PINTS_DRY_US "Pints, dry (US)" - IDS_VOLUME_PINTS_LIQUID_US "Pints, liquid (US)" - IDS_VOLUME_QUARTS_UK "Quarts (UK)" - IDS_VOLUME_QUARTS_DRY_US "Quarts, dry (US)" - IDS_VOLUME_QUARTS_LIQUID_US "Quarts, liquid (US)" + IDS_VOLUME_PINTS_UK "Pint (UK)" + IDS_VOLUME_PINTS_DRY_US "Pint, sypkie (US)" + IDS_VOLUME_PINTS_LIQUID_US "Pint, p³yn (US)" + IDS_VOLUME_QUARTS_UK "Kwart (UK)" + IDS_VOLUME_QUARTS_DRY_US "Kwart, sypkie (US)" + IDS_VOLUME_QUARTS_LIQUID_US "Kwart, p³yn (US)" IDS_VOLUME_SEKI "Seki" IDS_VOLUME_SYOU "Syou" IDS_VOLUME_TANANLOUNG "Tananloung" @@ -677,30 +677,30 @@ // TYPES OF WEIGHTS STRINGTABLE DISCARDABLE BEGIN - IDS_WEIGHT_BAHT "Baht" - IDS_WEIGHT_CARATS "Carats" + IDS_WEIGHT_BAHT "Bahtów" + IDS_WEIGHT_CARATS "Karatów" IDS_WEIGHT_CHUNG "Chung" IDS_WEIGHT_DON "Don" IDS_WEIGHT_GEUN "Geun" - IDS_WEIGHT_GRAMS "Grams" + IDS_WEIGHT_GRAMS "Gramów" IDS_WEIGHT_GWAN "Gwan" IDS_WEIGHT_HARB "Harb" IDS_WEIGHT_JIN_CHINA "Jin (China)" IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" IDS_WEIGHT_KAN "Kan" - IDS_WEIGHT_KILOGRAMS "Kilograms" + IDS_WEIGHT_KILOGRAMS "Kilogramów" IDS_WEIGHT_KIN "Kin" IDS_WEIGHT_LIANG_CHINA "Liang (China)" IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" IDS_WEIGHT_MONME "Monme" - IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" - IDS_WEIGHT_OUNCES_TROY "Ounces, troy" - IDS_WEIGHT_POUNDS "Pounds" - IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Uncji, avoirdupois" + IDS_WEIGHT_OUNCES_TROY "Uncji, aptekarskie" + IDS_WEIGHT_POUNDS "Funtów" + IDS_WEIGHT_QUINTAL_METRIC "Kwintali" IDS_WEIGHT_SALOUNG "Saloung" - IDS_WEIGHT_STONES "Stones" + IDS_WEIGHT_STONES "Kamieni" IDS_WEIGHT_TAMLUNG "Tamlung" - IDS_WEIGHT_TONNES "Tonnes" - IDS_WEIGHT_TONS_UK "Tons (UK)" - IDS_WEIGHT_TONS_US "Tons (US)" -END + IDS_WEIGHT_TONNES "Ton" + IDS_WEIGHT_TONS_UK "Ton (UK)" + IDS_WEIGHT_TONS_US "Ton (US)" +END

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