Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 32431: - Update Russian translation
by dchapyshev＠svn.reactos.org 20 Feb '08

20 Feb '08

Author: dchapyshev Date: Wed Feb 20 17:19:56 2008 New Revision: 32431 URL: http://svn.reactos.org/svn/reactos?rev=32431&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Wed Feb 20 17:19:56 2008 @@ -1675,11 +1675,11 @@ {STRING_FORMATUNKNOWN, "¥¨§¢¥áâë©"}, {STRING_KB, - "KB"}, + ""}, {STRING_MB, - "MB"}, + ""}, {STRING_GB, - "GB"}, + ""}, {0, 0} };

1 0

[tkreuzer] 32430: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - move bad ntuser syscalls in ntuser.h to the bottom - sort win32k export list alphabetically - remove Win32kInitialize and NtGdiGetAspectRatioFilterEx by myself: - add missing exports to win32k.def (all from xp)
by tkreuzer＠svn.reactos.org 20 Feb '08

20 Feb '08

Author: tkreuzer Date: Wed Feb 20 06:01:46 2008 New Revision: 32430 URL: http://svn.reactos.org/svn/reactos?rev=32430&view=rev Log: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - move bad ntuser syscalls in ntuser.h to the bottom - sort win32k export list alphabetically - remove Win32kInitialize and NtGdiGetAspectRatioFilterEx by myself: - add missing exports to win32k.def (all from xp) Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db trunk/reactos/subsystems/win32/win32k/win32k.def Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Feb 20 06:01:46 2008 @@ -70,12 +70,6 @@ CONST BITMAPINFO * bmi, UINT Usage ); - -/* Should be done in user-mode. */ -BOOL -STDCALL -NtGdiGetAspectRatioFilterEx(HDC hDC, - LPSIZE AspectRatio); /* Use NtGdiGetDCPoint with GdiGetViewPortExt */ BOOL STDCALL NtGdiGetViewportExtEx(HDC hDC, LPSIZE viewportExt); 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 (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Feb 20 06:01:46 2008 @@ -249,14 +249,6 @@ DWORD NTAPI -NtUserBuildMenuItemList( - HMENU hMenu, - PVOID Buffer, - ULONG nBufSize, - DWORD Reserved); - -DWORD -NTAPI NtUserCalcMenuBar( DWORD dwUnknown1, DWORD dwUnknown2, @@ -306,28 +298,9 @@ UINT uIDEnableItem, UINT uEnable); -UINT -NTAPI -NtUserEnumClipboardFormats( - UINT format); - -DWORD -NTAPI -NtUserInsertMenuItem( - HMENU hMenu, - UINT uItem, - BOOL fByPosition, - LPCMENUITEMINFOW lpmii); - BOOL NTAPI NtUserEndMenu(VOID); - -UINT NTAPI -NtUserGetMenuDefaultItem( - HMENU hMenu, - UINT fByPos, - UINT gmdiFlags); BOOL NTAPI @@ -365,14 +338,6 @@ UINT uItemHilite, UINT uHilite); -BOOL -NTAPI -NtUserMenuInfo( - HMENU hmenu, - PROSMENUINFO lpmi, - BOOL fsog -); - int NTAPI NtUserMenuItemFromPoint( @@ -380,16 +345,6 @@ HMENU hMenu, DWORD X, DWORD Y); - -BOOL -NTAPI -NtUserMenuItemInfo( - HMENU hMenu, - UINT uItem, - BOOL fByPosition, - PROSMENUITEMINFO lpmii, - BOOL fsog -); BOOL NTAPI @@ -454,32 +409,6 @@ int y, HWND hwnd, LPTPMPARAMS lptpm); - -ULONG NTAPI -NtUserGetSystemMetrics(ULONG Index); - -ULONG_PTR NTAPI -NtUserGetClassLong(HWND hWnd, INT Offset, BOOL Ansi); - -LONG NTAPI -NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi); - -BOOL NTAPI -NtUserGetWindowRect(HWND hWnd, LPRECT Rect); - -BOOL NTAPI -NtUserGetClientRect(HWND hWnd, LPRECT Rect); - -HANDLE NTAPI -NtUserGetProp(HWND hWnd, ATOM Atom); - -BOOL NTAPI -NtUserGetClientOrigin(HWND hWnd, LPPOINT Point); - -NTSTATUS -NTAPI -NtUserAcquireOrReleaseInputOwnership( - BOOLEAN Release); HKL NTAPI @@ -771,12 +700,6 @@ int nWidth, int nHeight); -HANDLE -NTAPI -NtUserCreateCursorIconHandle( - PICONINFO IconInfo, - BOOL Indirect); - HDESK NTAPI NtUserCreateDesktop( @@ -993,7 +916,7 @@ LPCRECT lprcClip, MONITORENUMPROC lpfnEnum, LPARAM dwData );*/ - +/* FIXME: The call below is ros-specific and should be rewritten to use the same params as the correct call above. */ INT NTAPI NtUserEnumDisplayMonitors( @@ -1282,11 +1205,6 @@ NtUserGetKeyState( DWORD Unknown0); -BOOL -NTAPI -NtUserGetLastInputInfo( - PLASTINPUTINFO plii); - DWORD NTAPI NtUserGetLayeredWindowAttributes( @@ -1313,12 +1231,6 @@ HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax); - -BOOL -NTAPI -NtUserGetMonitorInfo( - IN HMONITOR hMonitor, - OUT LPMONITORINFO pMonitorInfo); DWORD NTAPI @@ -1396,13 +1308,6 @@ HWND hWnd, LONG idObject, PSCROLLBARINFO psbi); - -BOOL -NTAPI -NtUserGetScrollInfo( - HWND hwnd, - int fnBar, - LPSCROLLINFO lpsi); HDESK NTAPI @@ -1525,14 +1430,6 @@ BOOL NTAPI -NtUserKillSystemTimer -( - HWND hWnd, - UINT_PTR uIDEvent -); - -BOOL -NTAPI NtUserKillTimer ( HWND hWnd, @@ -1589,13 +1486,6 @@ DWORD dwUnknown2, DWORD dwUnknown3); -BOOL -NTAPI -NtUserGetMinMaxInfo( - HWND hwnd, - MINMAXINFO *MinMaxInfo, - BOOL SendMessage); - DWORD NTAPI NtUserMNDragLeave(VOID); @@ -1611,25 +1501,6 @@ NtUserModifyUserStartupInfoFlags( DWORD Unknown0, DWORD Unknown1); - -HMONITOR -NTAPI -NtUserMonitorFromPoint( - IN POINT point, - IN DWORD dwFlags); - -HMONITOR -NTAPI -NtUserMonitorFromRect( - IN LPCRECT pRect, - IN DWORD dwFlags); - -HMONITOR -NTAPI -NtUserMonitorFromWindow( - IN HWND hWnd, - IN DWORD dwFlags); - BOOL NTAPI @@ -1844,24 +1715,6 @@ DWORD dwUnknown1, DWORD dwUnknown2); -/* FIXME: These flag constans aren't what Windows uses. */ -#define REGISTERCLASS_ANSI 2 -#define REGISTERCLASS_ALL (REGISTERCLASS_ANSI) - -RTL_ATOM NTAPI -NtUserRegisterClassEx( - CONST WNDCLASSEXW* lpwcx, - PUNICODE_STRING ClassName, - PUNICODE_STRING MenuName, - WNDPROC wpExtra, - DWORD Flags, - HMENU hMenu); - -UINT -NTAPI -NtUserRegisterClipboardFormat( - PUNICODE_STRING format); - BOOL NTAPI NtUserRegisterHotKey(HWND hWnd, @@ -1951,54 +1804,9 @@ LPINPUT pInput, INT cbSize); -typedef struct tagNTUSERSENDMESSAGEINFO -{ - BOOL HandledByKernel; - BOOL Ansi; - WNDPROC Proc; -} NTUSERSENDMESSAGEINFO, *PNTUSERSENDMESSAGEINFO; - -LRESULT NTAPI -NtUserSendMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - PNTUSERSENDMESSAGEINFO Info); - -BOOL -NTAPI -NtUserSendMessageCallback( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - SENDASYNCPROC lpCallBack, - ULONG_PTR dwData); - -LRESULT NTAPI -NtUserSendMessageTimeout(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - UINT uFlags, - UINT uTimeout, - ULONG_PTR *uResult, - PNTUSERSENDMESSAGEINFO Info); - -BOOL -NTAPI -NtUserSendNotifyMessage( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam); - HWND NTAPI NtUserSetActiveWindow(HWND Wnd); -HWND NTAPI -NtUserGetActiveWindow(VOID); - DWORD NTAPI NtUserSetAppImeLevel( @@ -2007,9 +1815,6 @@ HWND NTAPI NtUserSetCapture(HWND Wnd); - -HWND NTAPI -NtUserGetCapture(VOID); ULONG_PTR NTAPI NtUserSetClassLong( @@ -2186,10 +1991,6 @@ NtUserSetShellWindowEx( HWND hwndShell, HWND hwndShellListView); - -HWND -NTAPI -NtUserGetShellWindow(); DWORD NTAPI @@ -2535,30 +2336,6 @@ NTAPI NtUserYieldTask(VOID); -DWORD NTAPI -NtUserGetWindowThreadProcessId(HWND hWnd, LPDWORD UnsafePid); - -DWORD NTAPI -NtUserGetQueueStatus(BOOL ClearChanges); - -HWND NTAPI -NtUserGetWindow(HWND hWnd, UINT Relationship); - -HWND NTAPI -NtUserGetLastActivePopup(HWND hWnd); - -typedef struct _WNDPROC_INFO -{ - WNDPROC WindowProc; - BOOL IsUnicode; -} WNDPROC_INFO, *PWNDPROC_INFO; - -BOOL NTAPI -NtUserDereferenceWndProcHandle(IN HANDLE wpHandle, OUT PWNDPROC_INFO wpInfo); - -VOID NTAPI -NtUserManualGuiCheck(LONG Check); - #define NtUserGetDCBrushColor(hbr) \ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_GETDCCOLOR) @@ -2570,20 +2347,6 @@ #define NtUserSetDCPenColor(hbr, crColor) \ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCPENCOLOR) - -typedef struct _SETSCROLLBARINFO -{ - int nTrackPos; - int reserved; - DWORD rgstate[CCHILDREN_SCROLLBAR+1]; -} SETSCROLLBARINFO, *PSETSCROLLBARINFO; - -BOOL -NTAPI -NtUserSetScrollBarInfo( - HWND hwnd, - LONG idObject, - SETSCROLLBARINFO *info); /* lParam of DDE messages */ typedef struct tagKMDDEEXECUTEDATA @@ -2607,6 +2370,273 @@ } Value; } KMDDELPARAM, *PKMDDELPARAM; + + + + +/* NtUserBad +* ReactOS-specific NtUser calls which shouldn't exist. + */ + + +NTSTATUS +NTAPI +NtUserAcquireOrReleaseInputOwnership( + BOOLEAN Release); + +DWORD +NTAPI +NtUserBuildMenuItemList( + HMENU hMenu, + PVOID Buffer, + ULONG nBufSize, + DWORD Reserved); + +HANDLE +NTAPI +NtUserCreateCursorIconHandle( + PICONINFO IconInfo, + BOOL Indirect); + + +typedef struct _WNDPROC_INFO +{ + WNDPROC WindowProc; + BOOL IsUnicode; +} WNDPROC_INFO, *PWNDPROC_INFO; + +BOOL +NTAPI +NtUserDereferenceWndProcHandle(IN HANDLE wpHandle, OUT PWNDPROC_INFO wpInfo); + + +UINT +NTAPI +NtUserEnumClipboardFormats( + UINT format); + +HWND +NTAPI +NtUserGetActiveWindow(VOID); + +HWND +NTAPI +NtUserGetCapture(VOID); + +ULONG_PTR +NTAPI +NtUserGetClassLong(HWND hWnd, INT Offset, BOOL Ansi); + +BOOL +NTAPI +NtUserGetClientOrigin(HWND hWnd, LPPOINT Point); + +BOOL +NTAPI +NtUserGetClientRect(HWND hWnd, LPRECT Rect); + +UINT +NTAPI +NtUserGetMenuDefaultItem( + HMENU hMenu, + UINT fByPos, + UINT gmdiFlags); + +HWND +NTAPI +NtUserGetLastActivePopup(HWND hWnd); + +BOOL +NTAPI +NtUserGetLastInputInfo( + PLASTINPUTINFO plii); + +BOOL +NTAPI +NtUserGetMinMaxInfo( + HWND hwnd, + MINMAXINFO *MinMaxInfo, + BOOL SendMessage); + +BOOL +NTAPI +NtUserGetMonitorInfo( + IN HMONITOR hMonitor, + OUT LPMONITORINFO pMonitorInfo); + +HANDLE +NTAPI +NtUserGetProp(HWND hWnd, ATOM Atom); + +DWORD +NTAPI +NtUserGetQueueStatus(BOOL ClearChanges); + +BOOL +NTAPI +NtUserGetScrollInfo( + HWND hwnd, + int fnBar, + LPSCROLLINFO lpsi); + +HWND +NTAPI +NtUserGetShellWindow(); + +ULONG +NTAPI +NtUserGetSystemMetrics(ULONG Index); + +HWND +NTAPI +NtUserGetWindow(HWND hWnd, UINT Relationship); + +LONG +NTAPI +NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi); + +BOOL +NTAPI +NtUserGetWindowRect(HWND hWnd, LPRECT Rect); + +DWORD +NTAPI +NtUserGetWindowThreadProcessId(HWND hWnd, LPDWORD UnsafePid); + +DWORD +NTAPI +NtUserInsertMenuItem( + HMENU hMenu, + UINT uItem, + BOOL fByPosition, + LPCMENUITEMINFOW lpmii); + +BOOL +NTAPI +NtUserKillSystemTimer(HWND hWnd, UINT_PTR uIDEvent); + +VOID +NTAPI +NtUserManualGuiCheck(LONG Check); + +BOOL +NTAPI +NtUserMenuInfo( + HMENU hmenu, + PROSMENUINFO lpmi, + BOOL fsog +); + +BOOL +NTAPI +NtUserMenuItemInfo( + HMENU hMenu, + UINT uItem, + BOOL fByPosition, + PROSMENUITEMINFO lpmii, + BOOL fsog +); + +HMONITOR +NTAPI +NtUserMonitorFromPoint( + IN POINT point, + IN DWORD dwFlags); + +HMONITOR +NTAPI +NtUserMonitorFromRect( + IN LPCRECT pRect, + IN DWORD dwFlags); + +HMONITOR +NTAPI +NtUserMonitorFromWindow( + IN HWND hWnd, + IN DWORD dwFlags); + + +/* FIXME: These flag constans aren't what Windows uses. */ +#define REGISTERCLASS_ANSI 2 +#define REGISTERCLASS_ALL (REGISTERCLASS_ANSI) + +RTL_ATOM +NTAPI +NtUserRegisterClassEx( + CONST WNDCLASSEXW* lpwcx, + PUNICODE_STRING ClassName, + PUNICODE_STRING MenuName, + WNDPROC wpExtra, + DWORD Flags, + HMENU hMenu); + + +UINT +NTAPI +NtUserRegisterClipboardFormat( + PUNICODE_STRING format); + + +typedef struct tagNTUSERSENDMESSAGEINFO +{ + BOOL HandledByKernel; + BOOL Ansi; + WNDPROC Proc; +} NTUSERSENDMESSAGEINFO, *PNTUSERSENDMESSAGEINFO; + +LRESULT NTAPI +NtUserSendMessage(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + PNTUSERSENDMESSAGEINFO Info); + +BOOL +NTAPI +NtUserSendMessageCallback( + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + SENDASYNCPROC lpCallBack, + ULONG_PTR dwData); + +LRESULT NTAPI +NtUserSendMessageTimeout(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + UINT uFlags, + UINT uTimeout, + ULONG_PTR *uResult, + PNTUSERSENDMESSAGEINFO Info); + + +BOOL +NTAPI +NtUserSendNotifyMessage( + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam); + + +typedef struct _SETSCROLLBARINFO +{ + int nTrackPos; + int reserved; + DWORD rgstate[CCHILDREN_SCROLLBAR+1]; +} SETSCROLLBARINFO, *PSETSCROLLBARINFO; + +BOOL +NTAPI +NtUserSetScrollBarInfo( + HWND hwnd, + LONG idObject, + SETSCROLLBARINFO *info); + + + #endif /* __WIN32K_NTUSER_H */ /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c Wed Feb 20 06:01:46 2008 @@ -527,11 +527,4 @@ return STATUS_SUCCESS; } - -BOOLEAN STDCALL -Win32kInitialize (VOID) -{ - return TRUE; -} - /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Feb 20 06:01:46 2008 @@ -1111,6 +1111,14 @@ return TRUE; } +BOOL FASTCALL +IntGetAspectRatioFilter(PDC pDC, + LPSIZE AspectRatio) +{ + UNIMPLEMENTED; + return FALSE; +} + BOOL STDCALL NtGdiGetDCPoint( HDC hDC, UINT iPoint, PPOINTL Point) { @@ -1157,6 +1165,10 @@ Ret = IntGdiGetDCOrgEx(dc, &SafePoint); break; case GdiGetAspectRatioFilter: + Ret = IntGetAspectRatioFilter(dc, &Size); + SafePoint.x = Size.cx; + SafePoint.y = Size.cy; + break; default: SetLastWin32Error(ERROR_INVALID_PARAMETER); Ret = FALSE; @@ -3339,15 +3351,6 @@ return DCB_DISABLE; /* bounding rectangle always empty */ } -BOOL -STDCALL -NtGdiGetAspectRatioFilterEx(HDC hDC, - LPSIZE AspectRatio) -{ - UNIMPLEMENTED; - return FALSE; -} - /* * @implemented */ Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Feb 20 06:01:46 2008 @@ -719,7 +719,6 @@ NtUserSendNotifyMessage 4 NtUserSetScrollBarInfo 3 NtGdiCreateDIBitmap 6 -NtGdiGetAspectRatioFilterEx 2 NtGdiGetFontFamilyInfo 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 Modified: trunk/reactos/subsystems/win32/win32k/win32k.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.def (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.def Wed Feb 20 06:01:46 2008 @@ -2,23 +2,30 @@ ; ; win32k.def ; -; ReactOS win32k.sys +; ReactOS win32k.sys exports +; +; Currently all exports from windows xp are listed, sorted by name ; LIBRARY win32k EXPORTS +;BRUSHOBJ_hGetColorTransform@4 BRUSHOBJ_pvAllocRbrush@8 BRUSHOBJ_pvGetRbrush@4 BRUSHOBJ_ulGetBrushColor@4 CLIPOBJ_bEnum@12 CLIPOBJ_cEnumStart@20 CLIPOBJ_ppoGetPath@4 -EngAlphaBlend@28 EngAcquireSemaphore@4 EngAllocMem@12 +EngAllocPrivateUserMem@12 +;EngAllocSectionMem EngAllocUserMem@8 +EngAlphaBlend@28 EngAssociateSurface@12 EngBitBlt@44 +;EngBugCheckEx@20 EngCheckAbort@4 +;EngClearEvent@4 EngComputeGlyphSet@12 EngControlSprites@8 EngCopyBits@24 @@ -37,6 +44,7 @@ EngDeleteClip@4 EngDeleteDriverObj@12 EngDeleteEvent@4 +;EngDeleteFile@4 EngDeletePalette@4 EngDeletePath@4 EngDeleteSafeSemaphore@4 @@ -45,13 +53,21 @@ EngDeleteWnd@4 EngDeviceIoControl@28 EngDitherColor@16 +EngDxIoctl@12 EngEnumForms@24 EngEraseSurface@12 +;EngFileIoControl +;EngFileWrite EngFillPath@28 EngFindImageProcAddress@8 EngFindResource@16 +;EngFntCacheAlloc@8 +;EngFntCacheFault@8 +;EngFntCacheLookUp@8 EngFreeMem@4 EngFreeModule@4 +EngFreePrivateUserMem@8 +;EngFreeSectionMem EngFreeUserMem@4 EngGetCurrentCodePage(a)8=ntoskrnl.RtlGetCurrentCodePage EngGetCurrentProcessId@0 @@ -64,33 +80,45 @@ EngGetPrinter@20 EngGetPrinterData@24 EngGetPrinterDataFileName@4 +;EngGetPrinterDriver@24 EngGetProcessHandle@0 +;EngGetTickCount EngGetType1FontList@24 EngGradientFill@40 +;EngHangNotification@8 EngInitializeSafeSemaphore@4 +;EngIsSemaphoreOwned@4 +;EngIsSemaphoreOwnedByCurrentThread@4 EngLineTo@36 EngLoadImage@4 EngLoadModule@4 EngLoadModuleForWrite@8 +EngLockDirectDrawSurface@4 EngLockDriverObj@4 EngLockSurface@4 +;EngLpkInstalled@0 EngMapEvent@20 EngMapFontFile@12 +;EngMapFontFileFD@12 EngMapModule@8 +;EngMapSection EngMarkBandingSurface@4 EngModifySurface@32 EngMovePointer@16 EngMulDiv@12 EngMultiByteToUnicodeN(a)20=ntoskrnl.RtlMultiByteToUnicodeN EngMultiByteToWideChar@20 +;EngNineGrid EngPaint@20 EngProbeForRead(a)12=NTOSKRNL.ProbeForRead EngProbeForReadAndWrite(a)12=NTOSKRNL.ProbeForWrite +;EngQueryDeviceAttribute@24 EngQueryLocalTime@4 EngQueryPalette@16 EngQueryPerformanceCounter@4 EngQueryPerformanceFrequency@4 EngQuerySystemAttribute@8 +;EngReadStateEvent@4 EngReleaseSemaphore@4 EngRestoreFloatingPointState@4 EngSaveFloatingPointState@8 @@ -102,16 +130,19 @@ EngSetPrinterData@20 EngSort@16 EngStretchBlt@44 +;EngStretchBltROP@52 EngStrokeAndFillPath@40 EngStrokePath@32 EngTextOut@40 EngTransparentBlt@32 EngUnicodeToMultiByteN(a)20=ntoskrnl.RtlUnicodeToMultiByteN EngUnloadImage@4 +EngUnlockDirectDrawSurface@4 EngUnlockDriverObj@4 EngUnlockSurface@4 EngUnmapEvent@4 EngUnmapFontFile@4 +;EngUnmapFontFileFD@4 EngUnsecureMem@4 EngWaitForSingleObject@8 EngWideCharToMultiByte@20 @@ -145,12 +176,18 @@ FLOATOBJ_SubLong@8 FONTOBJ_cGetAllGlyphHandles@8 FONTOBJ_cGetGlyphs@20 +;FONTOBJ_pQueryGlyphAttrs@8 +;FONTOBJ_pfdg@4 FONTOBJ_pifi@4 +;FONTOBJ_pjOpenTypeTablePointer@12 FONTOBJ_pvTrueTypeFontFile@8 +;FONTOBJ_pwszFontFilePaths@4 FONTOBJ_pxoGetXform@4 FONTOBJ_vGetInfo@12 +HeapVidMemAllocAligned@20 HT_ComputeRGBGammaTable@24 HT_Get8BPPFormatPalette@16 +;HT_Get8BPPMaskPalette@24 PALOBJ_cGetColors@16 PATHOBJ_bCloseFigure@4 PATHOBJ_bEnum@8 @@ -170,9 +207,13 @@ RtlUpcaseUnicodeChar(a)4=NTOSKRNL.RtlUpcaseUnicodeChar RtlUpcaseUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUpcaseUnicodeToMultiByteN STROBJ_bEnum@12 +;STROBJ_bEnumPositionsOnly@12 +;STROBJ_bGetAdvanceWidths@16 STROBJ_dwGetCodePage@4 +;STROBJ_fxBreakExtra@4 +;STROBJ_fxCharacterExtra@4 STROBJ_vEnumStart@4 -Win32kInitialize@0 +VidMemFree@8 WNDOBJ_bEnum@12 WNDOBJ_cEnumStart@16 WNDOBJ_vSetConsumer@8 @@ -180,18 +221,14 @@ XFORMOBJ_iGetFloatObjXform@8 XFORMOBJ_iGetXform@8 XLATEOBJ_cGetPalette@16 +;XLATEOBJ_hGetColorTransform@4 XLATEOBJ_iXlate@8 XLATEOBJ_piVector@4 _abnormal_termination=NTOSKRNL._abnormal_termination _except_handler2=NTOSKRNL._except_handler2 _global_unwind2=NTOSKRNL._global_unwind2 +;_itoa@12 +;_itow@12 _local_unwind2=NTOSKRNL._local_unwind2 -EngLockDirectDrawSurface@4 -EngUnlockDirectDrawSurface@4 -EngDxIoctl@12 -EngAllocPrivateUserMem@12 -HeapVidMemAllocAligned@20 -VidMemFree@8 -EngFreePrivateUserMem@8 ;EOF

1 0

[dreimer] 32429: Bug 3090: Czech translation for cacls, more & find by radekliska@gmail.com Usetup Polish Translation Update by Olaf Siejka
by dreimer＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: dreimer Date: Wed Feb 20 01:55:36 2008 New Revision: 32429 URL: http://svn.reactos.org/svn/reactos?rev=32429&view=rev Log: Bug 3090: Czech translation for cacls, more & find by radekliska(a)gmail.com Usetup Polish Translation Update by Olaf Siejka Added: trunk/reactos/base/applications/cacls/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/cmdutils/find/rsrc.rc trunk/reactos/base/applications/cmdutils/more/rsrc.rc trunk/reactos/base/setup/usetup/lang/pl-PL.h Added: trunk/reactos/base/applications/cacls/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/cacls/lang/cs-CZ.rc Wed Feb 20 01:55:36 2008 @@ -1,0 +1,84 @@ +/* + * PROJECT: ReactOS CACLS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: applications/cacls/lang/cs-CZ.rc + * PURPOSE: Czech Language File for PROJECT + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2008-02-17 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_HELP, "Zobrazí nebo zmìní seznamy øízení pøístupu (ACL) k souborùm\n\n\ +CACLS názvu [/T] [/E] [/C] [/G uivatel:oprávnìní [...]] [/R uivatel [...]]\n\ + [/P uivatel:oprávnìní [...]] [/D uivatel [...]]\n\ + názvu_soubori Zobrazí ACL.\n\ + /T Zmìní ACL urèených souborù\n\ + v aktuálním adresáøi a vech podadresáøích.\n\ + /E Místo nahrazení ACL jej upraví.\n\ + /C Pøi chybých odmítnutí pøístupu pokraèuje.\n\ + /G uivatel:oprávnìní Udìlí urèenému uivateli pøístupová oprávnìní.\n\ + Oprávnìní mùe být: R Èíst\n\ + W Zapisovat\n\ + C Mìnit (zapisovat)\n\ + F Úplné øízení\n\ + /R uivatel Odvolá pøístupová oprávnìní urèeného uivatele\n\ + (platné pouze s parametrem /E).\n\ + /P uivatel:oprávnìní Nahradí pøístupová oprávnìní urèeného uivatele.\n\ + Oprávnìní mùe být: N ádné\n\ + R Èíst\n\ + W Zapisovat\n\ + C Mìnit (zapisovat)\n\ + F Úplné øízení\n\ + /D uivatel Odepøe pøístup urèenému uivateli.\n\ +Pro urèení více ne jednoho souboru mohou být v pøíkazu pouity zástupné znaky.\n\ +V pøíkazu mùete urèit více ne jednoho uivatele.\n\n\ +Zkratky:\n\ + CI - Dìdit kontejner.\n\ + ACE bude dìdìno adresáøi.\n\ + OI - Dìdit objekt.\n\ + ACE bude dìdìno soubory.\n\ + IO - Pouze dìdit.\n\ + ACE se nepouije na aktuální adresáø èi soubor.\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENY)" +IDS_SPECIAL_ACCESS, "(zvlátní pøístup:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +END Propchange: trunk/reactos/base/applications/cacls/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc Wed Feb 20 01:55:36 2008 @@ -3,6 +3,7 @@ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Added: trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc Wed Feb 20 01:55:36 2008 @@ -1,0 +1,26 @@ +/* + * PROJECT: ReactOS FIND + * LICENSE: GPL - See COPYING in the top level directory + * FILE: applications/cmdutils/find/lang/cs-CZ.rc + * PURPOSE: Czech Language File for PROJECT + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2008-02-17 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Zobrazí vechny øádky souboru obsahující hledaný øetìzec.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"øetìzec\" [ soubor... ]\n\ + /C Zobrazí poèet øádkù obsahující øetìzec.\n\ + /I Ignoruje velikost písmen.\n\ + /N Èísluje zobrazené øádky, zaèíná od 1.\n\ + /V Zobrazí vechny øádky, které NEobsahují zadaný øetìec." + +IDS_NO_SUCH_FILE, "FIND: Soubor %s nebyl nalezen.\n" + +IDS_CANNOT_OPEN, "FIND: Soubor %s nelze otevøít!\n" + +END Propchange: trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/rsrc.rc Wed Feb 20 01:55:36 2008 @@ -3,6 +3,7 @@ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Added: trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc Wed Feb 20 01:55:36 2008 @@ -1,0 +1,25 @@ +/* + * PROJECT: ReactOS MORE + * LICENSE: GPL - See COPYING in the top level directory + * FILE: applications/cmdutils/more/lang/cs-CZ.rc + * PURPOSE: Czech Language File for PROJECT + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2008-02-17 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_USAGE, "Zobrazí výstup po jednotlivých stránkách na obrazovku.\n\n\ + MORE < [Jednotka:][Cesta]Název souboru\n\ + Pøíkaz | MORE \n\ + MORE [Jednotka:][Cesta]Název souboru\n\n\ + [Jednotka:][Cesta]Název souboru Soubor, jeho obsah bude zobrazen.\n\ + Pøíkaz\t\t Pøíkaz, jeho výstup bude zobrazen.\n\n\ + Pøi výzvì ""-- Pokraèovat --"" lze stisknout libovolnou klávesu\n\ + pro zobrazení dalí stránky.\n" + + IDS_CONTINUE, " -- Pokraèovat (100%) -- " + IDS_FILE_ACCESS, "Nelze získat pøístup k souboru %s." +END Propchange: trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc Wed Feb 20 01:55:36 2008 @@ -3,6 +3,7 @@ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Wed Feb 20 01:55:36 2008 @@ -1675,13 +1675,13 @@ {STRING_UNPSPACE, " Miejsce poza partycjami %6lu %s"}, {STRING_MAXSIZE, - "MB (max. %lu MB)"}, + "MB (maks. %lu MB)"}, {STRING_UNFORMATTED, - "New (Unformatted)"}, + "Nowa (Niesformatowana)"}, {STRING_FORMATUNUSED, - "Unused"}, + "Nieu¾yte"}, {STRING_FORMATUNKNOWN, - "Unknown"}, + "Nieznane"}, {STRING_KB, "KB"}, {STRING_MB,

1 0

[tkreuzer] 32428: Remove typecasts PBITMAPOBJ <-> PSURFOBJ. Use GDIOBJ_ShareLockObj / _UnlockObjByPtr instead of Eng(Un)LockSurface as BITMAPOBJ_Un/LockObj. Add BASEOBJECT to the BITMAPOBJ structure.
by tkreuzer＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: tkreuzer Date: Wed Feb 20 01:21:39 2008 New Revision: 32428 URL: http://svn.reactos.org/svn/reactos?rev=32428&view=rev Log: Remove typecasts PBITMAPOBJ <-> PSURFOBJ. Use GDIOBJ_ShareLockObj / _UnlockObjByPtr instead of Eng(Un)LockSurface as BITMAPOBJ_Un/LockObj. Add BASEOBJECT to the BITMAPOBJ structure. Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c trunk/reactos/subsystems/win32/win32k/eng/engmisc.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/copybits.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/copybits.c Wed Feb 20 01:21:39 2008 @@ -47,7 +47,7 @@ RECT_ENUM RectEnum; BOOL EnumMore; BLTINFO BltInfo; - BITMAPOBJ *DestObj = NULL; + BITMAPOBJ *DestObj; BITMAPOBJ *SourceObj; ASSERT(Dest != NULL && Source != NULL && DestRect != NULL && SourcePoint != NULL); @@ -57,11 +57,13 @@ MouseSafetyOnDrawStart(Source, SourcePoint->x, SourcePoint->y, (SourcePoint->x + abs(DestRect->right - DestRect->left)), (SourcePoint->y + abs(DestRect->bottom - DestRect->top))); + + DestObj = CONTAINING_RECORD(Dest, BITMAPOBJ, SurfObj); if (Dest != Source) - { - DestObj = CONTAINING_RECORD(Dest, BITMAPOBJ, SurfObj); + { BITMAPOBJ_LockBitmapBits(DestObj); - } + } + MouseSafetyOnDrawStart(Dest, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); // FIXME: Don't punt to the driver's DrvCopyBits immediately. Instead, @@ -76,17 +78,16 @@ if(Dest->iType!=STYPE_BITMAP) { /* FIXME: Eng* functions shouldn't call Drv* functions. ? */ - /* FIXME: Remove typecast. */ - if (((BITMAPOBJ*)Dest)->flHooks & HOOK_COPYBITS) + if (DestObj->flHooks & HOOK_COPYBITS) { ret = GDIDEVFUNCS(Dest).CopyBits( Dest, Source, Clip, ColorTranslation, DestRect, SourcePoint); MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { - BITMAPOBJ_UnlockBitmapBits(DestObj); - } + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); @@ -98,17 +99,16 @@ if(Source->iType!=STYPE_BITMAP) { /* FIXME: Eng* functions shouldn't call Drv* functions. ? */ - /* FIXME: Remove typecast. */ - if (((BITMAPOBJ*)Source)->flHooks & HOOK_COPYBITS) + if (SourceObj->flHooks & HOOK_COPYBITS) { ret = GDIDEVFUNCS(Source).CopyBits( Dest, Source, Clip, ColorTranslation, DestRect, SourcePoint); MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { - BITMAPOBJ_UnlockBitmapBits(DestObj); - } + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); @@ -123,9 +123,9 @@ MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { + { BITMAPOBJ_UnlockBitmapBits(DestObj); - } + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); @@ -157,9 +157,9 @@ MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { - BITMAPOBJ_UnlockBitmapBits(DestObj); - } + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); @@ -176,9 +176,9 @@ MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { - BITMAPOBJ_UnlockBitmapBits(DestObj); - } + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); @@ -214,9 +214,9 @@ MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { + { BITMAPOBJ_UnlockBitmapBits(DestObj); - } + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); @@ -225,9 +225,9 @@ MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { + { BITMAPOBJ_UnlockBitmapBits(DestObj); - } + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); Modified: trunk/reactos/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engmisc.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engmisc.c Wed Feb 20 01:21:39 2008 @@ -25,11 +25,11 @@ BOOL STDCALL IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave, - SURFOBJ *DestObj, + SURFOBJ *DestSurf, RECTL *DestRect, BOOL ReadOnly, POINTL *Translate, - SURFOBJ **OutputObj) + SURFOBJ **OutputSurf) { LONG Exchange; SIZEL BitmapSize; @@ -51,22 +51,22 @@ DestRect->bottom = Exchange; } - if (NULL != DestObj && STYPE_BITMAP != DestObj->iType && - (NULL == DestObj->pvScan0 || 0 == DestObj->lDelta)) + if (NULL != DestSurf && STYPE_BITMAP != DestSurf->iType && + (NULL == DestSurf->pvScan0 || 0 == DestSurf->lDelta)) { /* Driver needs to support DrvCopyBits, else we can't do anything */ - /* FIXME: Remove typecast! */ - if (!(((BITMAPOBJ*)DestObj)->flHooks & HOOK_COPYBITS)) - { + BITMAPOBJ *DestBmp = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); + if (!(DestBmp->flHooks & HOOK_COPYBITS)) + { return FALSE; - } + } /* Allocate a temporary bitmap */ BitmapSize.cx = DestRect->right - DestRect->left; BitmapSize.cy = DestRect->bottom - DestRect->top; - Width = DIB_GetDIBWidthBytes(BitmapSize.cx, BitsPerFormat(DestObj->iBitmapFormat)); + Width = DIB_GetDIBWidthBytes(BitmapSize.cx, BitsPerFormat(DestSurf->iBitmapFormat)); EnterLeave->OutputBitmap = EngCreateBitmap(BitmapSize, Width, - DestObj->iBitmapFormat, + DestSurf->iBitmapFormat, BMF_TOPDOWN | BMF_NOZEROINIT, NULL); if (!EnterLeave->OutputBitmap) @@ -75,7 +75,7 @@ return FALSE; } - *OutputObj = EngLockSurface((HSURF)EnterLeave->OutputBitmap); + *OutputSurf = EngLockSurface((HSURF)EnterLeave->OutputBitmap); EnterLeave->DestRect.left = 0; EnterLeave->DestRect.top = 0; @@ -89,35 +89,35 @@ ClippedDestRect.left -= SrcPoint.x; SrcPoint.x = 0; } - if (DestObj->sizlBitmap.cx < SrcPoint.x + ClippedDestRect.right - ClippedDestRect.left) - { - ClippedDestRect.right = ClippedDestRect.left + DestObj->sizlBitmap.cx - SrcPoint.x; + if (DestSurf->sizlBitmap.cx < SrcPoint.x + ClippedDestRect.right - ClippedDestRect.left) + { + ClippedDestRect.right = ClippedDestRect.left + DestSurf->sizlBitmap.cx - SrcPoint.x; } if (SrcPoint.y < 0) { ClippedDestRect.top -= SrcPoint.y; SrcPoint.y = 0; } - if (DestObj->sizlBitmap.cy < SrcPoint.y + ClippedDestRect.bottom - ClippedDestRect.top) - { - ClippedDestRect.bottom = ClippedDestRect.top + DestObj->sizlBitmap.cy - SrcPoint.y; + if (DestSurf->sizlBitmap.cy < SrcPoint.y + ClippedDestRect.bottom - ClippedDestRect.top) + { + ClippedDestRect.bottom = ClippedDestRect.top + DestSurf->sizlBitmap.cy - SrcPoint.y; } EnterLeave->TrivialClipObj = EngCreateClip(); EnterLeave->TrivialClipObj->iDComplexity = DC_TRIVIAL; - if (ClippedDestRect.left < (*OutputObj)->sizlBitmap.cx && + if (ClippedDestRect.left < (*OutputSurf)->sizlBitmap.cx && 0 <= ClippedDestRect.right && - SrcPoint.x < DestObj->sizlBitmap.cx && - ClippedDestRect.top <= (*OutputObj)->sizlBitmap.cy && + SrcPoint.x < DestSurf->sizlBitmap.cx && + ClippedDestRect.top <= (*OutputSurf)->sizlBitmap.cy && 0 <= ClippedDestRect.bottom && - SrcPoint.y < DestObj->sizlBitmap.cy && - ! GDIDEVFUNCS(DestObj).CopyBits( - *OutputObj, DestObj, + SrcPoint.y < DestSurf->sizlBitmap.cy && + ! GDIDEVFUNCS(DestSurf).CopyBits( + *OutputSurf, DestSurf, EnterLeave->TrivialClipObj, NULL, &ClippedDestRect, &SrcPoint)) { EngDeleteClip(EnterLeave->TrivialClipObj); - EngFreeMem((*OutputObj)->pvBits); - EngUnlockSurface(*OutputObj); + EngFreeMem((*OutputSurf)->pvBits); + EngUnlockSurface(*OutputSurf); EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); return FALSE; } @@ -132,25 +132,28 @@ { Translate->x = 0; Translate->y = 0; - *OutputObj = DestObj; - } - - if (NULL != *OutputObj - && 0 != (((BITMAPOBJ*) *OutputObj)->flHooks & HOOK_SYNCHRONIZE)) - { - if (NULL != GDIDEVFUNCS(*OutputObj).SynchronizeSurface) - { - GDIDEVFUNCS(*OutputObj).SynchronizeSurface(*OutputObj, DestRect, 0); - } - else if (STYPE_BITMAP == (*OutputObj)->iType - && NULL != GDIDEVFUNCS(*OutputObj).Synchronize) - { - GDIDEVFUNCS(*OutputObj).Synchronize((*OutputObj)->dhpdev, DestRect); - } - } - - EnterLeave->DestObj = DestObj; - EnterLeave->OutputObj = *OutputObj; + *OutputSurf = DestSurf; + } + + if (NULL != *OutputSurf) + { + BITMAPOBJ* OutputBmp = CONTAINING_RECORD(*OutputSurf, BITMAPOBJ, SurfObj); + if (0 != (OutputBmp->flHooks & HOOK_SYNCHRONIZE)) + { + if (NULL != GDIDEVFUNCS(*OutputSurf).SynchronizeSurface) + { + GDIDEVFUNCS(*OutputSurf).SynchronizeSurface(*OutputSurf, DestRect, 0); + } + else if (STYPE_BITMAP == (*OutputSurf)->iType + && NULL != GDIDEVFUNCS(*OutputSurf).Synchronize) + { + GDIDEVFUNCS(*OutputSurf).Synchronize((*OutputSurf)->dhpdev, DestRect); + } + } + } + + EnterLeave->DestObj = DestSurf; + EnterLeave->OutputObj = *OutputSurf; EnterLeave->ReadOnly = ReadOnly; return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Wed Feb 20 01:21:39 2008 @@ -575,7 +575,10 @@ EngUnlockSurface(IN SURFOBJ *Surface) { if (Surface != NULL) - GDIOBJ_UnlockObjByPtr(GdiHandleTable, Surface); + { + BITMAPOBJ *bmp = CONTAINING_RECORD(Surface, BITMAPOBJ, SurfObj); + GDIOBJ_UnlockObjByPtr(GdiHandleTable, bmp); + } } Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Wed Feb 20 01:21:39 2008 @@ -5,10 +5,7 @@ /* GDI logical bitmap object */ typedef struct _BITMAPOBJ { -// HGDIOBJ hHmgr; -// PVOID pvEntry; -// ULONG lucExcLock; -// ULONG Tid; + BASEOBJECT BaseObject; SURFOBJ SurfObj; FLONG flHooks; @@ -34,8 +31,11 @@ #define BITMAPOBJ_FreeBitmap(hBMObj) \ GDIOBJ_FreeObj(GdiHandleTable, (HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) /* NOTE: Use shared locks! */ -#define BITMAPOBJ_LockBitmap(hBMObj) (PBITMAPOBJ)EngLockSurface((HSURF)hBMObj) -#define BITMAPOBJ_UnlockBitmap(pBMObj) EngUnlockSurface(&pBMObj->SurfObj) +#define BITMAPOBJ_LockBitmap(hBMObj) \ + ((PBITMAPOBJ) GDIOBJ_ShareLockObj (GdiHandleTable, (HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP)) +#define BITMAPOBJ_UnlockBitmap(pBMObj) \ + GDIOBJ_UnlockObjByPtr (GdiHandleTable, pBMObj) + BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody); BOOL INTERNAL_CALL BITMAPOBJ_InitBitsLock(BITMAPOBJ *pBMObj); Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Wed Feb 20 01:21:39 2008 @@ -928,7 +928,6 @@ #ifdef GDI_DEBUG CaptureStackBackTace((PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS); #endif - Object = Entry->KernelData; } else { @@ -943,8 +942,8 @@ DelayExecution(); continue; } - Object = Entry->KernelData; } + Object = Entry->KernelData; } else {

1 0

[dreimer] 32427: Okokok, I dont know why someone should feel the urge to translate MB, KB, and GB (Except specific languages...), but here they are.
by dreimer＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: dreimer Date: Wed Feb 20 00:31:09 2008 New Revision: 32427 URL: http://svn.reactos.org/svn/reactos?rev=32427&view=rev Log: Okokok, I dont know why someone should feel the urge to translate MB, KB, and GB (Except specific languages...), but here they are. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Wed Feb 20 00:31:09 2008 @@ -1612,7 +1612,7 @@ if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { DiskSize = (DiskEntry->DiskSize + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif @@ -1622,7 +1622,7 @@ if (DiskSize == 0) DiskSize = 1; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } if (DiskEntry->DriverName.Length > 0) @@ -1780,19 +1780,19 @@ if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */ { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } else { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10; - Unit = "KB"; + Unit = MUIGetString(STRING_KB); } if (PartType == NULL) @@ -1820,7 +1820,7 @@ if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { DiskSize = (DiskEntry->DiskSize + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif @@ -1830,7 +1830,7 @@ if (DiskSize == 0) DiskSize = 1; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } if (DiskEntry->DriverName.Length > 0) @@ -1913,24 +1913,24 @@ if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { DiskSize = (DiskEntry->DiskSize + (1 << 29)) >> 30; - DiskUnit = "GB"; + DiskUnit = MUIGetString(STRING_GB); } else { DiskSize = (DiskEntry->DiskSize + (1 << 19)) >> 20; - DiskUnit = "MB"; + DiskUnit = MUIGetString(STRING_MB); } /* adjust partition size */ if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; - PartUnit = "GB"; + PartUnit = MUIGetString(STRING_GB); } else { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; - PartUnit = "MB"; + PartUnit = MUIGetString(STRING_MB); } /* adjust partition type */ Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h Wed Feb 20 00:31:09 2008 @@ -1683,6 +1683,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Wed Feb 20 00:31:09 2008 @@ -1680,6 +1680,12 @@ "Ungenutzt"}, {STRING_FORMATUNKNOWN, "Unbekannt"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Wed Feb 20 00:31:09 2008 @@ -1674,6 +1674,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Wed Feb 20 00:31:09 2008 @@ -1674,6 +1674,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Wed Feb 20 00:31:09 2008 @@ -1673,6 +1673,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Wed Feb 20 00:31:09 2008 @@ -1686,6 +1686,12 @@ "Non utilis"}, {STRING_FORMATUNKNOWN, "Inconnu"}, + {STRING_KB, + "Ko"}, + {STRING_MB, + "Mo"}, + {STRING_GB, + "Go"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Wed Feb 20 00:31:09 2008 @@ -1674,6 +1674,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h Wed Feb 20 00:31:09 2008 @@ -1683,6 +1683,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Wed Feb 20 00:31:09 2008 @@ -1682,6 +1682,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Wed Feb 20 00:31:09 2008 @@ -1674,6 +1674,12 @@ "¥ ¨á¯®«ì§®¢ ®"}, {STRING_FORMATUNKNOWN, "¥¨§¢¥áâë©"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Wed Feb 20 00:31:09 2008 @@ -1679,6 +1679,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Wed Feb 20 00:31:09 2008 @@ -1673,6 +1673,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Wed Feb 20 00:31:09 2008 @@ -1674,6 +1674,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Wed Feb 20 00:31:09 2008 @@ -121,4 +121,7 @@ #define STRING_UNFORMATTED 50 #define STRING_FORMATUNUSED 51 #define STRING_FORMATUNKNOWN 52 +#define STRING_KB 53 +#define STRING_MB 54 +#define STRING_GB 55 #endif Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Wed Feb 20 00:31:09 2008 @@ -1120,19 +1120,19 @@ if (PartEntry->UnpartitionledLength >= 0x280000000ULL) /* 10 GB */ { PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif if (PartEntry->UnpartitionedLength >= 0xA00000ULL) /* 10 MB */ { PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } else { PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 9)) >> 10; - Unit = "KB"; + Unit = MUIGetString(STRING_KB); } sprintf (LineBuffer, @@ -1176,19 +1176,19 @@ if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ { PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */ { PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } else { PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10; - Unit = "KB"; + Unit = MUIGetString(STRING_KB); } if (PartType == NULL) @@ -1274,7 +1274,7 @@ if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { DiskSize.QuadPart = (DiskEntry->DiskSize + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif @@ -1282,7 +1282,7 @@ DiskSize.QuadPart = (DiskEntry->DiskSize + (1 << 19)) >> 20; if (DiskSize.QuadPart == 0) DiskSize.QuadPart = 1; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } if (DiskEntry->DriverName.Length > 0)

1 0

[cfinck] 32426: Change the "removefrommap" string a bit, maybe this prevents confusions ; -) The Remove links in the user bubbles just remove the user from the current map view, they do NOT remove their location entries from the DB.
by cfinck＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: cfinck Date: Wed Feb 20 00:20:02 2008 New Revision: 32426 URL: http://svn.reactos.org/svn/reactos?rev=32426&view=rev Log: Change the "removefrommap" string a bit, maybe this prevents confusions ;-) The Remove links in the user bubbles just remove the user from the current map view, they do NOT remove their location entries from the DB. Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php Wed Feb 20 00:20:02 2008 @@ -39,7 +39,7 @@ $peoplemap_langres["latitude"] = "Breite"; $peoplemap_langres["longitude"] = "LÃ¤nge"; - $peoplemap_langres["removefrommap"] = "Diese Person aus der Karte entfernen"; + $peoplemap_langres["removefrommap"] = "Person aus dieser Karte entfernen"; $peoplemap_langres["minquerylength"] = "Bitte geben Sie mindestens 3 Zeichen ein."; $peoplemap_langres["nousers"] = "Keinen Benutzer mit Ortsdaten gefunden."; $peoplemap_langres["activatejs"] = "Sie mÃ¼ssen JavaScript aktivieren, um die Personen-Karte zu benutzen!"; Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php Wed Feb 20 00:20:02 2008 @@ -39,7 +39,7 @@ $peoplemap_langres["latitude"] = "Latitude"; $peoplemap_langres["longitude"] = "Longitude"; - $peoplemap_langres["removefrommap"] = "Remove this User from the Map"; + $peoplemap_langres["removefrommap"] = "Remove the User from this Map"; $peoplemap_langres["minquerylength"] = "Please enter at least 3 characters."; $peoplemap_langres["nousers"] = "No user with location data found!"; $peoplemap_langres["activatejs"] = "You have to activate JavaScript to use the People Map!";

1 0

[spetreolle] 32425: - Update French translation
by spetreolle＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: spetreolle Date: Tue Feb 19 22:56:35 2008 New Revision: 32425 URL: http://svn.reactos.org/svn/reactos?rev=32425&view=rev Log: - Update French translation Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Tue Feb 19 22:56:35 2008 @@ -1611,7 +1611,7 @@ {STRING_TXTSETUPFAILED, "Setup n'a pu trouver la section '%S'\ndans TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copie du fichier: %S"}, + " \xB3 Copie du fichier: %S"}, {STRING_SETUPCOPYINGFILES, "Setup copie les fichiers..."}, {STRING_PAGEDMEM, @@ -1679,13 +1679,13 @@ {STRING_UNPSPACE, " Espace non partitionn %6lu %s"}, {STRING_MAXSIZE, - "MB (max. %lu MB)"}, + "Mo (max. %lu Mo)"}, {STRING_UNFORMATTED, - "New (Unformatted)"}, + "Nouveau (non format)"}, {STRING_FORMATUNUSED, - "Unused"}, + "Non utilis"}, {STRING_FORMATUNKNOWN, - "Unknown"}, + "Inconnu"}, {0, 0} };

1 0

[dchapyshev] 32424: - Update Russian translation
by dchapyshev＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: dchapyshev Date: Tue Feb 19 22:45:09 2008 New Revision: 32424 URL: http://svn.reactos.org/svn/reactos?rev=32424&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Tue Feb 19 22:45:09 2008 @@ -1667,13 +1667,13 @@ {STRING_UNPSPACE, " ¥à §¬¥ç¥®¥ ¯à®áâà áâ¢® %6lu %s"}, {STRING_MAXSIZE, - "MB (max. %lu MB)"}, + " (¬ ªá. %lu )"}, {STRING_UNFORMATTED, - "New (Unformatted)"}, + "®¢ë© (¥®âä®à¬ â¨à®¢ ë©)"}, {STRING_FORMATUNUSED, - "Unused"}, + "¥ ¨á¯®«ì§®¢ ®"}, {STRING_FORMATUNKNOWN, - "Unknown"}, + "¥¨§¢¥áâë©"}, {0, 0} };

1 0

[dreimer] 32423: Once more, some more Strings open for translation. Have fun with 'em.
by dreimer＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: dreimer Date: Tue Feb 19 22:37:49 2008 New Revision: 32423 URL: http://svn.reactos.org/svn/reactos?rev=32423&view=rev Log: Once more, some more Strings open for translation. Have fun with 'em. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Tue Feb 19 22:37:49 2008 @@ -1505,7 +1505,7 @@ coPos, &Written); - sprintf (Buffer, "MB (max. %lu MB)", MaxSize); + sprintf (Buffer, MUIGetString(STRING_MAXSIZE), MaxSize); coPos.X = iLeft + PARTITION_SIZE_INPUT_FIELD_LENGTH + 1; coPos.Y = iTop; WriteConsoleOutputCharacterA(StdOutput, @@ -1750,7 +1750,7 @@ PartType = NULL; if (PartEntry->New == TRUE) { - PartType = "New (Unformatted)"; + PartType = MUIGetString(STRING_UNFORMATTED); } else if (PartEntry->Unpartitioned == FALSE) { @@ -1956,11 +1956,11 @@ } else if (PartEntry->PartInfo[0].PartitionType == PARTITION_ENTRY_UNUSED) { - PartType = "Unused"; + PartType = MUIGetString(STRING_FORMATUNUSED); } else { - PartType = "Unknown"; + PartType = MUIGetString(STRING_FORMATUNKNOWN); } if (PartEntry->AutoCreate == TRUE) Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h Tue Feb 19 22:37:49 2008 @@ -1608,7 +1608,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, @@ -1675,6 +1675,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Tue Feb 19 22:37:49 2008 @@ -1605,7 +1605,7 @@ {STRING_TXTSETUPFAILED, "Setup konnte die '%S' Sektion\nin TXTSETUP.SIF nicht finden.\n"}, {STRING_COPYING, - " \xB3 Kopiere Datei: %S"}, + " \xB3 Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, "Setup kopiert Dateien..."}, {STRING_PAGEDMEM, @@ -1672,6 +1672,14 @@ "Setup erstellte eine neue Partition auf"}, {STRING_UNPSPACE, " Unpartitionierter Speicher %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "Neu (Unformatiert)"}, + {STRING_FORMATUNUSED, + "Ungenutzt"}, + {STRING_FORMATUNKNOWN, + "Unbekannt"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Tue Feb 19 22:37:49 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, @@ -1666,6 +1666,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Tue Feb 19 22:37:49 2008 @@ -1666,6 +1666,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Tue Feb 19 22:37:49 2008 @@ -1598,7 +1598,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, @@ -1665,6 +1665,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Tue Feb 19 22:37:49 2008 @@ -1678,6 +1678,14 @@ "Setup a cr une nouvelle partition sur"}, {STRING_UNPSPACE, " Espace non partitionn %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Tue Feb 19 22:37:49 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup non ha trovato la sezione '%S' \nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copia di: %S"}, + " \xB3 Copia di: %S"}, {STRING_SETUPCOPYINGFILES, "Copia dei file in corso..."}, {STRING_PAGEDMEM, @@ -1666,6 +1666,14 @@ "Setup ha creato una nuova partizione su"}, {STRING_UNPSPACE, " Spazio non partizionato %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h Tue Feb 19 22:37:49 2008 @@ -1608,7 +1608,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, @@ -1675,6 +1675,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Tue Feb 19 22:37:49 2008 @@ -1674,6 +1674,14 @@ "Instalator utworzy now¥ partycj©"}, {STRING_UNPSPACE, " Miejsce poza partycjami %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Tue Feb 19 22:37:49 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "à®£à ¬¬ ãáâ ®¢ª¨ ¥ á¬®£« ©â¨ á¥ªæ¨î '%S'\n¢ ä ©«¥ TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 ®¯¨à®¢ ¨¥: %S"}, + " \xB3 ®¯¨à®¢ ¨¥: %S"}, {STRING_SETUPCOPYINGFILES, "à®£à ¬¬ ãáâ ®¢ª¨ ª®¯¨àã¥â ä ©«ë..."}, {STRING_PAGEDMEM, @@ -1666,6 +1666,14 @@ "à®£à ¬¬ ãáâ ®¢ª¨ á®§¤ « ®¢ë© à §¤¥« :"}, {STRING_UNPSPACE, " ¥à §¬¥ç¥®¥ ¯à®áâà áâ¢® %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Tue Feb 19 22:37:49 2008 @@ -1604,7 +1604,7 @@ {STRING_TXTSETUPFAILED, "Inçtal tor zlyhal pri hadan¡ sekcie '%S'\nv s£bore TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kop¡ruje sa s£bor: %S"}, + " \xB3 Kop¡ruje sa s£bor: %S"}, {STRING_SETUPCOPYINGFILES, "Inçtal tor kop¡ruje s£bory..."}, {STRING_PAGEDMEM, @@ -1671,6 +1671,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Tue Feb 19 22:37:49 2008 @@ -1598,7 +1598,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, @@ -1665,6 +1665,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Tue Feb 19 22:37:49 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, @@ -1666,6 +1666,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Tue Feb 19 22:37:49 2008 @@ -117,4 +117,8 @@ #define STRING_HDDINFOUNK6 46 #define STRING_NEWPARTITION 47 #define STRING_UNPSPACE 48 +#define STRING_MAXSIZE 49 +#define STRING_UNFORMATTED 50 +#define STRING_FORMATUNUSED 51 +#define STRING_FORMATUNKNOWN 52 #endif Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Tue Feb 19 22:37:49 2008 @@ -1146,7 +1146,7 @@ PartType = NULL; if (PartEntry->New == TRUE) { - PartType = "New (Unformatted)"; + PartType = MUIGetString(STRING_UNFORMATTED); } else if (PartEntry->Unpartitioned == FALSE) {

1 0

[fireball] 32422: - Fix a typo.
by fireball＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: fireball Date: Tue Feb 19 20:52:37 2008 New Revision: 32422 URL: http://svn.reactos.org/svn/reactos?rev=32422&view=rev Log: - Fix a typo. Modified: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc Modified: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ru-R… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc (original) +++ trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc Tue Feb 19 20:52:37 2008 @@ -8,6 +8,6 @@ STRINGTABLE DISCARDABLE BEGIN -STRING_WelcomeMsg, "Âèðòóàëüíàÿ ìàøèíà ïîääåæêè DOS äëÿ ReactOS.\n" +STRING_WelcomeMsg, "Âèðòóàëüíàÿ ìàøèíà ïîääåðæêè DOS äëÿ ReactOS.\n" STRING_PromptMsg, "Ââåäèòå r<cr> äëÿ çàïóñêà, s<cr> äëÿ âûêëþ÷åíèÿ èëè q<cr> âûõîäà." 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