Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[tkreuzer] 27817: Add some type definitions and macros for gdi object entries. Needed for upcoming gdiobj patch.
by tkreuzer＠svn.reactos.org 25 Jul '07

25 Jul '07

Author: tkreuzer Date: Thu Jul 26 02:22:38 2007 New Revision: 27817 URL: http://svn.reactos.org/svn/reactos?rev=27817&view=rev Log: Add some type definitions and macros for gdi object entries. Needed for upcoming gdiobj patch. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Jul 26 02:22:38 2007 @@ -27,6 +27,12 @@ #define GDI_HANDLE_REUSE_MASK 0xff000000 #define GDI_HANDLE_UPPER_MASK (GDI_HANDLE_TYPE_MASK|GDI_HANDLE_STOCK_MASK|GDI_HANDLE_REUSE_MASK) #define GDI_HANDLE_REUSECNT_SHIFT 24 + +#define GDI_ENTRY_STOCK_MASK 0x00000080 +#define GDI_ENTRY_REUSE_MASK 0x0000ff00 +#define GDI_ENTRY_REUSE_INC 0x00000100 +#define GDI_ENTRY_REUSECNT_SHIFT 8 +#define GDI_ENTRY_UPPER_SHIFT 16 /*! \defgroup GDI object types * @@ -73,6 +79,16 @@ #define GDI_HANDLE_SET_STOCKOBJ(h) \ ((h) = (HANDLE)(((ULONG_PTR)(h)) | GDI_HANDLE_STOCK_MASK)) + +#define GDI_HANDLE_GET_UPPER(h) \ + (((ULONG_PTR)(h)) & GDI_HANDLE_UPPER_MASK) + +#define GDI_HANDLE_GET_REUSECNT(h) \ + (((ULONG_PTR)(h)) >> GDI_HANDLE_REUSECNT_SHIFT) + +#define GDI_ENTRY_GET_REUSECNT(e) \ + ((((ULONG_PTR)(e)) & GDI_ENTRY_REUSE_MASK) >> GDI_ENTRY_REUSECNT_SHIFT) + /* DC_ATTR Dirty Flags */ #define DIRTY_FILL 0x00000001

1 0

[cfinck] 27816: Add a documentation, which describes the changes that need to be done to update the ReactOS Wiki. This should make it easier for the future.
by cfinck＠svn.reactos.org 25 Jul '07

25 Jul '07

Author: cfinck Date: Thu Jul 26 01:59:14 2007 New Revision: 27816 URL: http://svn.reactos.org/svn/reactos?rev=27816&view=rev Log: Add a documentation, which describes the changes that need to be done to update the ReactOS Wiki. This should make it easier for the future. Added: trunk/documentation/web/ trunk/documentation/web/wiki/ trunk/documentation/web/wiki/ReactOS Wiki-Update.rtf Added: trunk/documentation/web/wiki/ReactOS Wiki-Update.rtf URL: http://svn.reactos.org/svn/reactos/trunk/documentation/web/wiki/ReactOS%20W… ============================================================================== --- trunk/documentation/web/wiki/ReactOS Wiki-Update.rtf (added) +++ trunk/documentation/web/wiki/ReactOS Wiki-Update.rtf Thu Jul 26 01:59:14 2007 @@ -1,0 +1,71 @@ +{\rtf1\ansi\ansicpg1252\deff0\deftab708{\fonttbl{\f0\fswiss\fprq2\fcharset0 Helvetica;}{\f1\fswiss\fprq2\fcharset0 Arial;}{\f2\fmodern\fprq1\fcharset128 Courier;}{\f3\fnil\fcharset128 StarSymbol;}{\f4\fswiss\fcharset128 Helvetica;}} +{\stylesheet{ Normal;}{\s1 heading 1;}} +{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\keepn\s1\sb240\sa60\lang1031\b\f0\fs32 Documentation about the ReactOS Wiki-Update\par +\pard\b0\i\fs24 written by Colin Finck (25-07-2007)\par +\par +\pard\keepn\sb240\sa120\b\f1\fs28 Introduction\par +\pard\sa120\b0\i0\f0\fs24 This documentation has been written to describe the Update process of the ReactOS Wiki (based on the MediaWiki software), so it is easier for the future.\par +As an example, I take the Update from our previous MediaWiki 1.7.1 Software to the current version 1.10.0.\par +\pard\keepn\sb240\sa120\b\i\f1\fs28 Comparing the ReactOS Wiki to the original MediaWiki\par +\pard\sa120\b0\i0\f0\fs24 The ReactOS Wiki was modified in some parts to integrate into the ReactOS Website Design and to allow an easy login through our Global Login System.\par +Also some unneeded and non-working options were removed like changing the account information on the Wiki Preferences page (this has to be done on the myReactOS page) and selecting another skin (all skins except "roscms" were removed).\par +\pard\keepn\sb240\sa120\b\i\f1\fs28 Changes in the files\par +\pard\sa120\b0\i0\f0\fs24 In both MediaWiki versions, these changes had to be done in the same files. Let's hope that this also applies to future versions :-)\par +\pard\keepn\sb240\sa120\b\f1\fs26 Integrating the Wiki into the Global Login System\par +\pard\sa120\b0\f0 These changes have to be done in the following files:\par +\fs24\par +\pard\fi-360\li720\sa120\u9679?\tab\b includes/SpecialUserlogin.php\b0\par +\pard\li710\sa120 Here we only need the function "wfSpecialUserlogin", so the first step is to delete everything below this function from the file.\par +Then remove the lines in the function, which create the MediaWiki Login Form. Replace them with the following lines:\par +\pard\li710\fs16\par +\f2 $target = "/wiki";\par +roscms_subsys_login('wiki', ROSCMS_LOGIN_REQUIRED, $target);\par +\par +/* We should never end up here, but in case we do... */\par +header("Location: $target");\par +exit;\par +\par +\pard\li710\sa120\f0\fs24 Also you need to add a "\f2\fs16 require_once( '../roscms/inc/subsys_login.php' );\f0\fs24 " line to the top of the file, so the Global Login System functions will be available.\par +This is already everything needed for the Login page.\par +\par +\pard\fi-360\li720\sa120\b\f3\fs18\'81\'9c\tab\f0\fs24 includes/SpecialUserlogout.php\par +\pard\li709\sa120\b0 This file also just requires minor changes.\par +\pard\li710 Look for a line, which contains the text "\f2\fs16 UserLogoutComplete\f4\fs24 ". The lines after this line are specific to the MediaWiki Login System, so they have to be removed.\f0\par +\f4 Replace them with the following line:\f0\par +\pard\li709\fs16\par +\pard\li709\sa120\f2 header("Location: /roscms/?page=logout");\par +\pard\li709\par +\pard\li709\sa120\f4\fs24 The RosCMS Logout page then does the rest for you.\par +\pard\sa120\par +\pard Now the Wiki should already work with our Global Login System. When you use the MediaWiki Login feature, you will be redirected to the ReactOS Login page. The same applies to the Logout button.\f0\par +\par +\pard\sa120\b\f4\fs26 Integrating the Wiki into the Website Design\par +\b0\fs24 For this case, I created an own MediaWiki skin based on the MonoBook skin. It is called "roscms".\par +\pard You don't need to update the skin every time when you update MediaWiki. In this case, I updated the skin, because our former skin was still based on the MonoBook skin from MediaWiki 1.5.x.\f0\par +\par +\f4 First add a reference to the "/style.css" file, which contains all the styles of the ReactOS Website.\f0\par +\f4 Then remove the MonoBook "portlets" from the original MonoBook skin. Replace them with links to the main ReactOS pages and individual links to some Wiki pages like Login, Logout, My page, My contributions, etc. Make sure that these links are placed before the "globalWrapper" box. Look in the "RosCMS.php" file of the skin how I did it here.\f0\par +\f4 Now place a "wikiContent" box around the "globalWrapper" box. In the "main.css" file of the skin, you have to add "#wikiContent" in front of some styles, so these styles only apply to the Wiki content and not to the rest of the web page.\f0\par +\f4 The "main.css" file also needs to be edited. Especially the positions of "#content" and "#p-cactions" need to be adjusted, so the Wiki content is displayed next to the menus.\f0\par +\f4 Now you can do some additional adjustments. Try the skin on multiple browsers and if there are problems, change the CSS files appropriately.\f0\par +\par +\pard\sa120\b\f4\fs26 Changing the Preferences page\par +\b0\fs24 The last file changes have to be done in the "includes/SpecialPreferences.php" page. Here we disable the some functions, namely changing the E-Mail address, real name, password, signature and the used skin.\par +\pard Simply put \f2\fs16 /*\f4\fs24 before and \f2\fs16 */\f4\fs24 after the sections, which add the input fields for these values and also do this for the sections, which set these values.\f0\par +\f4 To find out the right sections, it's the best if you compare the current "SpecialPreferences.php" file with the original MediaWiki 1.10.0 "SpecialPreferences.php" file.\f0\par +\par +\pard\keepn\sb240\sa120\b\i\f4\fs28 Final fine-tuning\f1\par +\pard\sa120\b0\i0\f4\fs24 Finally, you can remove some files, which are not needed now.\f0\par +\f4 These files include the other skins and some directories, which are not required for MediaWiki to work (like the "tests" directory).\f0\par +\pard\keepn\sb240\sa120\b\i\f4\fs28 Changes in other components\f1\par +\pard\sa120\b0\i0\f4\fs24 In some cases, you also have to make changes to other components.\f0\par +\f4 Some examples:\f0\par +\par +\pard\fi-360\li720\sa120\b\f3\fs18\'81\'9c\tab\f4\fs24 MediaWiki's database layout changed\f0\par +\pard\li709\sa120\b0\f4 If the database layout of the Wiki changed in some main parts, the roscms/inc/subsys_wiki.php file probably needs an update to reflect the database changes.\f0\par +\pard\sa120\par +\pard\fi-360\li720\sa120\b\f3\fs18\'81\'9c\tab\f4\fs24 There are login or session problems\f0\par +\pard\li709\sa120\b0\f4 In such cases, you often have to change the roscms/inc/subsys_login.php file.\par +While updating MediaWiki from version 1.7.1 to 1.10.0, I also had to make changes here as newer MediaWiki versions require that a session is set up for working properly.\f0\par +} +

1 0

[tkreuzer] 27815: UserScrollDC (complete rewrite): - include the region that could not be copied (invisible before) into invalid region - use less regions and calculations - return the type of the invalidated region (used by NtUserScrollWindowEx) - Remove LPtoDP and DPtoPL. Everything is now in logical coordinates. NtUserScrollDC: - use SEH for buffer transfer NtUserScrollWindowEx: - use SEH for buffer transfer instead of MmCopyFromCaller - use SEH to write back to usermode - return the type of
by tkreuzer＠svn.reactos.org 25 Jul '07

25 Jul '07

Author: tkreuzer Date: Thu Jul 26 01:51:56 2007 New Revision: 27815 URL: http://svn.reactos.org/svn/reactos?rev=27815&view=rev Log: UserScrollDC (complete rewrite): - include the region that could not be copied (invisible before) into invalid region - use less regions and calculations - return the type of the invalidated region (used by NtUserScrollWindowEx) - Remove LPtoDP and DPtoPL. Everything is now in logical coordinates. NtUserScrollDC: - use SEH for buffer transfer NtUserScrollWindowEx: - use SEH for buffer transfer instead of MmCopyFromCaller - use SEH to write back to usermode - return the type of invalid region not of the invalidated region (nothing if SW_INVALIDATE is not set) - use members of WINDOW_OBJECT instead of calling IntWinListChildren Use hungarian notation for variables fixes bug 2237 See issue #2237 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Thu Jul 26 01:51:56 2007 @@ -1109,102 +1109,84 @@ static -DWORD FASTCALL -UserScrollDC(HDC hDC, INT dx, INT dy, const RECT *lprcScroll, - const RECT *lprcClip, HRGN hrgnUpdate, LPRECT lprcUpdate) -{ - RECT rSrc, rClipped_src, rClip, rDst, offset; - PDC DC; - - /* - * Compute device clipping region (in device coordinates). - */ - - DC = DC_LockDc(hDC); - if (NULL == DC) - { - return FALSE; - } - if (lprcScroll) - rSrc = *lprcScroll; +INT FASTCALL +UserScrollDC(HDC hDC, INT dx, INT dy, const RECT *prcScroll, + const RECT *prcClip, HRGN hrgnUpdate, LPRECT prcUpdate) +{ + PDC pDC; + RECT rcScroll, rcSrc, rcDst; + INT Result; + + IntGdiGetClipBox(hDC, &rcScroll); + if (prcScroll) + { + IntGdiIntersectRect(&rcScroll, &rcScroll, prcScroll); + } + if (prcClip) + { + IntGdiIntersectRect(&rcScroll, &rcScroll, prcClip); + } + + rcDst = rcScroll; + IntGdiOffsetRect(&rcDst, dx, dy); + IntGdiIntersectRect(&rcDst, &rcDst, &rcScroll); + rcSrc = rcDst; + IntGdiOffsetRect(&rcSrc, -dx, -dy); + + if (!NtGdiBitBlt(hDC, rcDst.left, rcDst.top, + rcDst.right - rcDst.left, rcDst.bottom - rcDst.top, + hDC, rcSrc.left, rcSrc.top, SRCCOPY, 0, 0)) + { + return ERROR; + } + + /* Calculate the region that was invalidated by moving or + could not be copied, because it was not visible */ + if (hrgnUpdate || prcUpdate) + { + HRGN hrgnOwn, hrgnVisible, hrgnDst; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + return FALSE; + } + hrgnVisible = pDC->w.hVisRgn; // pDC->w.hGCClipRgn? + DC_UnlockDc(pDC); + + if (hrgnUpdate) + { + hrgnOwn = hrgnUpdate; + if (!NtGdiSetRectRgn(hrgnOwn, rcScroll.left, rcScroll.top, rcScroll.right, rcScroll.bottom)) + { + return ERROR; + } + } + else + { + hrgnOwn = UnsafeIntCreateRectRgnIndirect(&rcScroll); + } + + hrgnDst = UnsafeIntCreateRectRgnIndirect(&rcSrc); + NtGdiCombineRgn(hrgnDst, hrgnDst, hrgnVisible, RGN_AND); + NtGdiOffsetRgn(hrgnDst, dx, dy); + Result = NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnDst, RGN_DIFF); + NtGdiDeleteObject(hrgnDst); + + if (prcUpdate) + { + NtGdiGetRgnBox(hrgnOwn, prcUpdate); + } + + if (!hrgnUpdate) + { + NtGdiDeleteObject(hrgnOwn); + } + } else - IntGdiGetClipBox(hDC, &rSrc); - IntLPtoDP(DC, (LPPOINT)&rSrc, 2); - - if (lprcClip) - rClip = *lprcClip; - else - IntGdiGetClipBox(hDC, &rClip); - IntLPtoDP(DC, (LPPOINT)&rClip, 2); - - IntGdiIntersectRect(&rClipped_src, &rSrc, &rClip); - - rDst = rClipped_src; - IntGdiSetRect(&offset, 0, 0, dx, dy); - IntLPtoDP(DC, (LPPOINT)&offset, 2); - IntGdiOffsetRect(&rDst, offset.right - offset.left, offset.bottom - offset.top); - IntGdiIntersectRect(&rDst, &rDst, &rClip); - - /* - * Copy bits, if possible. - */ - - if (rDst.bottom > rDst.top && rDst.right > rDst.left) - { - RECT rDst_lp = rDst, rSrc_lp = rDst; - - IntGdiOffsetRect(&rSrc_lp, offset.left - offset.right, offset.top - offset.bottom); - IntDPtoLP(DC, (LPPOINT)&rDst_lp, 2); - IntDPtoLP(DC, (LPPOINT)&rSrc_lp, 2); - DC_UnlockDc(DC); - - if (!NtGdiBitBlt(hDC, rDst_lp.left, rDst_lp.top, rDst_lp.right - rDst_lp.left, - rDst_lp.bottom - rDst_lp.top, hDC, rSrc_lp.left, rSrc_lp.top, - SRCCOPY, 0, 0)) - return FALSE; - } - else - { - DC_UnlockDc(DC); - } - - /* - * Compute update areas. This is the clipped source or'ed with the - * unclipped source translated minus the clipped src translated (rDst) - * all clipped to rClip. - */ - - if (hrgnUpdate || lprcUpdate) - { - HRGN hRgn = hrgnUpdate, hRgn2; - - if (hRgn) - NtGdiSetRectRgn(hRgn, rClipped_src.left, rClipped_src.top, rClipped_src.right, rClipped_src.bottom); - else - hRgn = NtGdiCreateRectRgn(rClipped_src.left, rClipped_src.top, rClipped_src.right, rClipped_src.bottom); - - hRgn2 = UnsafeIntCreateRectRgnIndirect(&rSrc); - NtGdiOffsetRgn(hRgn2, offset.right - offset.left, offset.bottom - offset.top); - NtGdiCombineRgn(hRgn, hRgn, hRgn2, RGN_OR); - - NtGdiSetRectRgn(hRgn2, rDst.left, rDst.top, rDst.right, rDst.bottom); - NtGdiCombineRgn(hRgn, hRgn, hRgn2, RGN_DIFF); - - NtGdiSetRectRgn(hRgn2, rClip.left, rClip.top, rClip.right, rClip.bottom); - NtGdiCombineRgn(hRgn, hRgn, hRgn2, RGN_AND); - - if (lprcUpdate) - { - NtGdiGetRgnBox(hRgn, lprcUpdate); - - /* Put the lprcUpdate in logical coordinate */ - NtGdiDPtoLP(hDC, (LPPOINT)lprcUpdate, 2); - } - if (!hrgnUpdate) - NtGdiDeleteObject(hRgn); - NtGdiDeleteObject(hRgn2); - } - return TRUE; + Result = NULLREGION; + + return Result; } @@ -1218,21 +1200,78 @@ */ DWORD STDCALL -NtUserScrollDC(HDC hDC, INT dx, INT dy, const RECT *lprcScroll, - const RECT *lprcClip, HRGN hrgnUpdate, LPRECT lprcUpdate) +NtUserScrollDC(HDC hDC, INT dx, INT dy, const RECT *prcUnsafeScroll, + const RECT *prcUnsafeClip, HRGN hrgnUpdate, LPRECT prcUnsafeUpdate) { DECLARE_RETURN(DWORD); + RECT rcScroll, rcClip, rcUpdate; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("Enter NtUserScrollDC\n"); UserEnterExclusive(); - RETURN( UserScrollDC(hDC, dx, dy, lprcScroll, lprcClip, hrgnUpdate, lprcUpdate)); + _SEH_TRY + { + if (prcUnsafeScroll) + { + ProbeForRead(prcUnsafeScroll, sizeof(*prcUnsafeScroll), 1); + rcScroll = *prcUnsafeScroll; + } + if (prcUnsafeClip) + { + ProbeForRead(prcUnsafeClip, sizeof(*prcUnsafeClip), 1); + rcClip = *prcUnsafeClip; + } + if (prcUnsafeUpdate) + { + ProbeForWrite(prcUnsafeUpdate, sizeof(*prcUnsafeUpdate), 1); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN(FALSE); + } + + if (UserScrollDC(hDC, dx, dy, + prcUnsafeScroll? &rcScroll : 0, + prcUnsafeClip? &rcClip : 0, hrgnUpdate, + prcUnsafeUpdate? &rcUpdate : NULL) == ERROR) + { + /* FIXME: SetLastError? */ + RETURN(FALSE); + } + + if (prcUnsafeUpdate) + { + _SEH_TRY + { + *prcUnsafeUpdate = rcUpdate; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + if (!NT_SUCCESS(Status)) + { + /* FIXME: SetLastError? */ + /* FIXME: correct? We have already scrolled! */ + RETURN(FALSE); + } + } + + RETURN(TRUE); CLEANUP: DPRINT("Leave NtUserScrollDC, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; - } /* @@ -1243,18 +1282,16 @@ */ DWORD STDCALL -NtUserScrollWindowEx(HWND hWnd, INT dx, INT dy, const RECT *UnsafeRect, - const RECT *UnsafeClipRect, HRGN hrgnUpdate, LPRECT rcUpdate, UINT flags) -{ - RECT rc, cliprc, caretrc, rect, clipRect; +NtUserScrollWindowEx(HWND hWnd, INT dx, INT dy, const RECT *prcUnsafeScroll, + const RECT *prcUnsafeClip, HRGN hrgnUpdate, LPRECT prcUnsafeUpdate, UINT flags) +{ + RECT rcScroll, rcClip, rcCaret, rcUpdate; INT Result; PWINDOW_OBJECT Window = NULL, CaretWnd; HDC hDC; - HRGN hrgnTemp; + HRGN hrgnOwn = NULL, hrgnTemp; HWND hwndCaret; - BOOL bUpdate = (rcUpdate || hrgnUpdate || flags & (SW_INVALIDATE | SW_ERASE)); - BOOL bOwnRgn = TRUE; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; DECLARE_RETURN(DWORD); USER_REFERENCE_ENTRY Ref, CaretRef; @@ -1269,52 +1306,59 @@ } UserRefObjectCo(Window, &Ref); - IntGetClientRect(Window, &rc); - - if (NULL != UnsafeRect) - { - Status = MmCopyFromCaller(&rect, UnsafeRect, sizeof(RECT)); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( ERROR); - } - IntGdiIntersectRect(&rc, &rc, &rect); - } - - if (NULL != UnsafeClipRect) - { - Status = MmCopyFromCaller(&clipRect, UnsafeClipRect, sizeof(RECT)); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( ERROR); - } - IntGdiIntersectRect(&cliprc, &rc, &clipRect); - } + IntGetClientRect(Window, &rcScroll); + + _SEH_TRY + { + if (prcUnsafeScroll) + { + ProbeForRead(prcUnsafeScroll, sizeof(*prcUnsafeScroll), 1); + IntGdiIntersectRect(&rcScroll, &rcScroll, prcUnsafeScroll); + } + + if (prcUnsafeClip) + { + ProbeForRead(prcUnsafeClip, sizeof(*prcUnsafeClip), 1); + IntGdiIntersectRect(&rcClip, &rcScroll, prcUnsafeClip); + } + else + rcClip = rcScroll; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN(ERROR); + } + + if (rcClip.right <= rcClip.left || rcClip.bottom <= rcClip.top || + (dx == 0 && dy == 0)) + { + RETURN(NULLREGION); + } + + if (hrgnUpdate) + hrgnOwn = hrgnUpdate; else - cliprc = rc; - - if (cliprc.right <= cliprc.left || cliprc.bottom <= cliprc.top || - (dx == 0 && dy == 0)) - { - RETURN( NULLREGION); - } - - caretrc = rc; - hwndCaret = co_IntFixCaret(Window, &caretrc, flags); - - if (hrgnUpdate) - bOwnRgn = FALSE; - else if (bUpdate) - hrgnUpdate = NtGdiCreateRectRgn(0, 0, 0, 0); + hrgnOwn = NtGdiCreateRectRgn(0, 0, 0, 0); hDC = UserGetDCEx(Window, 0, DCX_CACHE | DCX_USESTYLE); - if (hDC) - { - UserScrollDC(hDC, dx, dy, &rc, &cliprc, hrgnUpdate, rcUpdate); - UserReleaseDC(Window, hDC, FALSE); - } + if (!hDC) + { + /* FIXME: SetLastError? */ + RETURN(ERROR); + } + + rcCaret = rcScroll; + hwndCaret = co_IntFixCaret(Window, &rcCaret, flags); + + Result = UserScrollDC(hDC, dx, dy, &rcScroll, &rcClip, hrgnOwn, prcUnsafeUpdate? &rcUpdate : NULL); + UserReleaseDC(Window, hDC, FALSE); /* * Take into account the fact that some damage may have occurred during @@ -1322,76 +1366,90 @@ */ hrgnTemp = NtGdiCreateRectRgn(0, 0, 0, 0); - Result = co_UserGetUpdateRgn(Window, hrgnTemp, FALSE); - if (Result != NULLREGION) - { - HRGN hrgnClip = UnsafeIntCreateRectRgnIndirect(&cliprc); + if (co_UserGetUpdateRgn(Window, hrgnTemp, FALSE) != NULLREGION) + { + HRGN hrgnClip = UnsafeIntCreateRectRgnIndirect(&rcClip); NtGdiOffsetRgn(hrgnTemp, dx, dy); NtGdiCombineRgn(hrgnTemp, hrgnTemp, hrgnClip, RGN_AND); co_UserRedrawWindow(Window, NULL, hrgnTemp, RDW_INVALIDATE | RDW_ERASE); NtGdiDeleteObject(hrgnClip); } - NtGdiDeleteObject(hrgnTemp); if (flags & SW_SCROLLCHILDREN) { - HWND *List = IntWinListChildren(Window); - if (List) - { - int i; - RECT r, dummy; - POINT ClientOrigin; - PWINDOW_OBJECT Wnd; - USER_REFERENCE_ENTRY WndRef; - - IntGetClientOrigin(Window, &ClientOrigin); - for (i = 0; List[i]; i++) + PWINDOW_OBJECT Child; + RECT rcChild; + POINT ClientOrigin; + USER_REFERENCE_ENTRY WndRef; + RECT rcDummy; + + IntGetClientOrigin(Window, &ClientOrigin); + for (Child = Window->FirstChild; Child; Child = Child->NextSibling) + { + rcChild = Child->WindowRect; + rcChild.left -= ClientOrigin.x; + rcChild.top -= ClientOrigin.y; + rcChild.right -= ClientOrigin.x; + rcChild.bottom -= ClientOrigin.y; + + if (! prcUnsafeScroll || IntGdiIntersectRect(&rcDummy, &rcChild, &rcScroll)) { - if (!(Wnd = UserGetWindowObject(List[i]))) - continue; - - r = Wnd->WindowRect; - r.left -= ClientOrigin.x; - r.top -= ClientOrigin.y; - r.right -= ClientOrigin.x; - r.bottom -= ClientOrigin.y; - - if (! UnsafeRect || IntGdiIntersectRect(&dummy, &r, &rc)) - { - UserRefObjectCo(Wnd, &WndRef); - co_WinPosSetWindowPos(Wnd, 0, r.left + dx, r.top + dy, 0, 0, - SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | - SWP_NOREDRAW); - UserDerefObjectCo(Wnd); - } - + UserRefObjectCo(Child, &WndRef); + co_WinPosSetWindowPos(Child, 0, rcChild.left + dx, rcChild.top + dy, 0, 0, + SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | + SWP_NOREDRAW); + UserDerefObjectCo(Child); } - ExFreePool(List); } } if (flags & (SW_INVALIDATE | SW_ERASE)) - co_UserRedrawWindow(Window, NULL, hrgnUpdate, RDW_INVALIDATE | RDW_ERASE | + { + co_UserRedrawWindow(Window, NULL, hrgnOwn, RDW_INVALIDATE | RDW_ERASE | ((flags & SW_ERASE) ? RDW_ERASENOW : 0) | ((flags & SW_SCROLLCHILDREN) ? RDW_ALLCHILDREN : 0)); - - if (bOwnRgn && hrgnUpdate) - NtGdiDeleteObject(hrgnUpdate); + } if ((CaretWnd = UserGetWindowObject(hwndCaret))) { UserRefObjectCo(CaretWnd, &CaretRef); - co_IntSetCaretPos(caretrc.left + dx, caretrc.top + dy); + co_IntSetCaretPos(rcCaret.left + dx, rcCaret.top + dy); co_UserShowCaret(CaretWnd); UserDerefObjectCo(CaretWnd); } + if (prcUnsafeUpdate) + { + _SEH_TRY + { + /* Probe here, to not fail on invalid pointer before scrolling */ + ProbeForWrite(prcUnsafeUpdate, sizeof(*prcUnsafeUpdate), 1); + *prcUnsafeUpdate = rcUpdate; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN(ERROR); + } + } + RETURN(Result); CLEANUP: + if (hrgnOwn && !hrgnUpdate) + { + NtGdiDeleteObject(hrgnOwn); + } + if (Window) UserDerefObjectCo(Window);

1 0

[cfinck] 27814: - Disable the "E-Mail address" and "Real Name" boxes on the Preferences page. The Real name was already disabled in the code and the E-Mail address should be completely handled by RosCMS. - Add a "Permanent link" button to the left menu. frik85 please upload that to the Web server.
by cfinck＠svn.reactos.org 25 Jul '07

25 Jul '07

Author: cfinck Date: Thu Jul 26 01:51:50 2007 New Revision: 27814 URL: http://svn.reactos.org/svn/reactos?rev=27814&view=rev Log: - Disable the "E-Mail address" and "Real Name" boxes on the Preferences page. The Real name was already disabled in the code and the E-Mail address should be completely handled by RosCMS. - Add a "Permanent link" button to the left menu. frik85 please upload that to the Web server. Modified: trunk/web/reactos.org/htdocs/wiki/includes/SpecialPreferences.php trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php Modified: trunk/web/reactos.org/htdocs/wiki/includes/SpecialPreferences.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/includ… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/includes/SpecialPreferences.php (original) +++ trunk/web/reactos.org/htdocs/wiki/includes/SpecialPreferences.php Thu Jul 26 01:51:50 2007 @@ -297,7 +297,7 @@ $wgUser->saveSettings(); $error = false; - if( $wgEnableEmail ) { + /*if( $wgEnableEmail ) { $newadr = $this->mUserEmail; $oldadr = $wgUser->getEmail(); if( ($newadr != '') && ($newadr != $oldadr) ) { @@ -319,12 +319,12 @@ } else { $error = wfMsg( 'invalidemailaddress' ); } - } else { + } else {*/ $wgUser->setEmail( $this->mUserEmail ); $wgUser->setCookies(); $wgUser->saveSettings(); - } - } + /* } + }*/ if( $needRedirect && $error === false ) { $title =& SpecialPage::getTitleFor( "Preferences" ); @@ -549,7 +549,7 @@ } - if ($wgAllowRealName) { + /*if ($wgAllowRealName) { $wgOut->addHTML( $this->addRow( '<label for="wpRealName">' . wfMsg('yourrealname') . '</label>', @@ -557,6 +557,7 @@ ) ); } + if ($wgEnableEmail) { $wgOut->addHTML( $this->addRow( @@ -564,7 +565,7 @@ "<input type='text' name='wpUserEmail' id='wpUserEmail' value=\"{$this->mUserEmail}\" size='25' />" ) ); - } + }*/ global $wgParser; if( !empty( $this->mToggles['fancysig'] ) && Modified: trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/skins/… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php (original) +++ trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php Thu Jul 26 01:51:50 2007 @@ -137,7 +137,7 @@ <div class="navTitle">Wiki Toolbox</div> <ol> - <?php if($this->data['notspecialpage']) { foreach( array( 'whatlinkshere', 'recentchangeslinked' ) as $special ) { ?> + <?php if($this->data['notspecialpage']) { foreach( array( 'whatlinkshere', 'recentchangeslinked', 'permalink' ) as $special ) { ?> <li><a href="<?php echo htmlspecialchars($this->data['nav_urls'][$special]['href']) ?>"><?php echo $this->msg($special) ?></a></li> <?php } } ?> <?php if(/*$this->data['feeds'] Let's not do this now*/ 0) { ?>

1 0

[cwittich] 27813: don't stub a function we already have
by cwittich＠svn.reactos.org 25 Jul '07

25 Jul '07

Author: cwittich Date: Wed Jul 25 23:19:54 2007 New Revision: 27813 URL: http://svn.reactos.org/svn/reactos?rev=27813&view=rev Log: don't stub a function we already have Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.spec (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.spec Wed Jul 25 23:19:54 2007 @@ -21,7 +21,7 @@ @ stdcall MakeSureDirectoryPathExists(str) @ stdcall MapDebugInformation(long str str long) @ stub MiniDumpReadDumpStream -@ stub MiniDumpWriteDump +@ stdcall MiniDumpWriteDump(ptr long ptr long long long long) @ stdcall SearchTreeForFile(str str str) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) @ stub StackWalk64

1 0

[cfinck] 27812: Updated language files by Olaf Siejka (caemyr AT gmail DOT com) See issue #2438 for more details.
by cfinck＠svn.reactos.org 25 Jul '07

25 Jul '07

Author: cfinck Date: Wed Jul 25 22:25:16 2007 New Revision: 27812 URL: http://svn.reactos.org/svn/reactos?rev=27812&view=rev Log: Updated language files by Olaf Siejka (caemyr AT gmail DOT com) See issue #2438 for more details. Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/explorer/explorer-en.rc trunk/reactos/base/shell/explorer/explorer-pl.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc Wed Jul 25 22:25:16 2007 @@ -458,7 +458,7 @@ /R Wywietla informacje o redystrybucji.\n\ /W Wywietla informacje o gwarancji." -STRING_VERSION_HELP2, " jest rozpowszechniana BEZ ¯ADNEJ GWARANCJI; szczegó³y\n\ +STRING_VERSION_HELP2, " jest rozpowszechniany BEZ ¯ADNEJ GWARANCJI; szczegó³y\n\ dostêpne - wpisz: `ver /w'. To jest darmowe oprogramowanie, i mo¿na je\n\ rozpowszechniaæ pod pewnymi warunkami: wpisz `ver /r'. Lista podziêkowañ pod\n\ parametrem: `ver /c'." Modified: trunk/reactos/base/shell/explorer/explorer-en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-en.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-en.rc Wed Jul 25 22:25:16 2007 @@ -188,7 +188,7 @@ BS_BOTTOM | WS_TABSTOP,57,73,46,44 CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + CONTROL "rig./bot. up",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,73,46,44 CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,121,46,44 @@ -397,3 +397,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pl.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-pl.rc Wed Jul 25 22:25:16 2007 @@ -174,27 +174,27 @@ BEGIN LTEXT "Wybierz sposób uk³adania ikon:", IDC_STATIC,7,7,166,8 - CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + CONTROL "lewy/gór w dó³",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + CONTROL "lewy/gór w prw",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + CONTROL "prwy/gór w lewo",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + CONTROL "prwy/gór w dó³",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + CONTROL "lewy/dol.w gór",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + CONTROL "lewy/dol.w praw",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + CONTROL "prwy/dol.w lewo",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + CONTROL "prwy/dol.w gór",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + CONTROL "obustr. w dó³",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + CONTROL "na brzegach",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + CONTROL "dooko³a",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 @@ -366,13 +366,13 @@ IDS_NETWORK "Sieæ" IDS_CONNECTIONS "Po³¹czenia sieciowe" IDS_DRIVES "Dysk" - IDS_SEARCH_COMPUTER "Znajd komputar..." - IDS_SETTINGS_MENU "Settings menu" + IDS_SEARCH_COMPUTER "Znajd komputer..." + IDS_SETTINGS_MENU "Menu ustawieñ" IDS_CONTROL_PANEL "Panel sterowania" IDS_PRINTERS "Drukarki" IDS_BROWSE "Przegl¹daj" IDS_SEARCH_PRG "Znajd program..." - IDS_ALL_USERS "All Users\\" + IDS_ALL_USERS "Wszyscy\\" IDS_SEARCH "Szukaj" IDS_ABOUT_EXPLORER "ReactOS Explorer - &Informacje" IDS_LAUNCH_MANY_PROGRAMS @@ -397,3 +397,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Wed Jul 25 22:25:16 2007 @@ -1,5 +1,5 @@ //Polish translation Emil Kaczmarek 2005 -//update by Olaf Siejka (May, 2007) +//revised and updated by Olaf Siejka (May, 2007) LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -76,7 +76,7 @@ AUTOCHECKBOX "&Wy³¹cz funkcje u³atwiaj¹ce dostêp kiedy komputer nie jest u¿ywany przez:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) + LTEXT "Minut",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Powiadomienia",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Ostrzegaj kiedy funkcja jest w³¹czana",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 Modified: trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc Wed Jul 25 22:25:16 2007 @@ -1,3 +1,5 @@ +// Revised by Caemyr (Olaf Siejka) - 07.2007 + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 @@ -26,7 +28,7 @@ PUSHBUTTON "&Odinstaluj", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&W³aciwoci", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Opis", -1, 9, 153, 230, 46, BS_GROUPBOX - LTEXT "Tutaj opis komponentu...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + LTEXT "Opis komponentu:", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP CHECKBOX "Pokazuj ikonê w zasobniku systemowym kiedy po³¹czony", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP END @@ -56,7 +58,7 @@ IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Wsparcie" +CAPTION "Szczegó³y" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Status po³¹czenia", -1, 9, 8, 200, 88, BS_GROUPBOX @@ -110,8 +112,8 @@ IDS_ERROR "B³¹d" IDS_ENTER_VALID_IPADDRESS "Musisz wpisaæ poprawny adres IP" IDS_ENTER_VALID_SUBNET "Musisz wpisaæ poprawn¹ maskê podsieci" - IDS_CANNOT_LOAD_CONFIG "Nie mo¿na odczytaæ obecnej konfiguracji" + IDS_CANNOT_LOAD_CONFIG "Nie mo¿na odczytaæ bierz¹cej konfiguracji" IDS_CANNOT_CREATE_PROPSHEET "Nie mo¿na utworzyæ przegl¹du ustawieñ" IDS_OUT_OF_MEMORY "Brak wolnej pamiêci" - IDS_CANNOT_SAVE_CHANGES "Nie mo¿na zapisaæ zmian których dokona³e" + IDS_CANNOT_SAVE_CHANGES "Nie mo¿na zapisaæ dokonanych zmian!" END

1 0

[cfinck] 27811: Add a "magnify" application developed by Marc Piulachs (marc.piulachs AT codexchange DOT net) Isn't finished and lights up some bugs in ReactOS, but at least it's a start See issue #2463 for more details.
by cfinck＠svn.reactos.org 25 Jul '07

25 Jul '07

Author: cfinck Date: Wed Jul 25 22:00:56 2007 New Revision: 27811 URL: http://svn.reactos.org/svn/reactos?rev=27811&view=rev Log: Add a "magnify" application developed by Marc Piulachs (marc.piulachs AT codexchange DOT net) Isn't finished and lights up some bugs in ReactOS, but at least it's a start See issue #2463 for more details. Added: trunk/rosapps/magnify/ trunk/rosapps/magnify/lang/ trunk/rosapps/magnify/lang/en-US.rc trunk/rosapps/magnify/magnifier.c trunk/rosapps/magnify/magnifier.h trunk/rosapps/magnify/magnify.rbuild trunk/rosapps/magnify/magnify.rc trunk/rosapps/magnify/res/ trunk/rosapps/magnify/res/magnify.ico (with props) trunk/rosapps/magnify/resource.h trunk/rosapps/magnify/settings.c Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=27811… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Wed Jul 25 22:00:56 2007 @@ -44,6 +44,11 @@ <xi:include href="lib/directory.rbuild" /> </directory> --> + +<directory name="magnify"> + <xi:include href="magnify/magnify.rbuild" /> +</directory> + <directory name="mc"> <xi:include href="mc/mc.rbuild" /> </directory> Added: trunk/rosapps/magnify/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/en-US.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/en-US.rc (added) +++ trunk/rosapps/magnify/lang/en-US.rc Wed Jul 25 22:00:56 2007 @@ -1,0 +1,213 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Neutral resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) +#ifdef _WIN32 +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON ICON "res/magnify.ico" +#endif // Neutral resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_MAGNIFIER ICON "res/Magnify.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDC_MAGNIFIER MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDM_EXIT + MENUITEM "&Options", IDM_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&About ...", IDM_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDC_MAGNIFIER ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_MAGNIFIER,IDC_MYICON,14,9,20,20 + LTEXT "Magnifier Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,125,22 + PUSHBUTTON "Ok",IDOK,162,48,50,14 +END + +IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Magnifier Settings" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Exit",IDOK,96,161,50,14 + PUSHBUTTON "Help",IDOK,38,161,50,14 + LTEXT "Magnification level :",IDC_STATIC,6,12,68,8 + COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Tracking",IDC_STATIC,7,25,139,59 + GROUPBOX "Presentation",IDC_STATIC,7,87,139,57 + CONTROL "Follow mouse cursor",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 + CONTROL "Follow keyboard focus",IDC_FOLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 + CONTROL "Follow text editing",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 + CONTROL "Invert colors",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 + CONTROL "Start Minimized",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 + CONTROL "Show Magnifier",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 +END + +IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "ReactOS Magnifier" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,193,76,50,14 + ICON IDI_MAGNIFIER,IDC_STATIC,7,17,20,20 + LTEXT "Magnifier is intended to provide a minium level of funcionality for users with slight visual impairments. Most users with visual impairments will need a magnigication utility with higher funcionality for deily use.",IDC_STATIC,36,7,207,33 + CONTROL "Do not show this message again",IDC_SHOWWARNINGCHECK, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_DIALOGOPTIONS, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 146 + TOPMARGIN, 7 + BOTTOMMARGIN, 175 + END + + IDD_WARNINGDIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 243 + TOPMARGIN, 7 + BOTTOMMARGIN, 90 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Magnifier" + IDC_MAGNIFIER "MAGNIFIER" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Added: trunk/rosapps/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/magnifier.c?rev=27… ============================================================================== --- trunk/rosapps/magnify/magnifier.c (added) +++ trunk/rosapps/magnify/magnifier.c Wed Jul 25 22:00:56 2007 @@ -1,0 +1,562 @@ +/* + * PROJECT: ReactOS Magnify + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/magnify/magnifier.c + * PURPOSE: + * COPYRIGHT: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> + * + */ + +#include <windows.h> +//#include <stdio.h> +#include <shellapi.h> + +#include "shellapi.h" +#include "windows.h" + +#include "magnifier.h" +#include "resource.h" + +#define MAX_LOADSTRING 100 + +// Global Variables: +HINSTANCE hInst; // current instance +HWND hMainWnd; + +TCHAR szTitle[MAX_LOADSTRING]; // The title bar text +TCHAR szWindowClass[MAX_LOADSTRING]; // the main window class name + +#define REPAINT_SPEED 100 + +HWND hDesktopWindow = NULL; + +//Current magnified area +POINT cp; + +//Last positions +POINT pMouse; +POINT pCaret; +POINT pFocus; + +// Forward declarations of functions included in this code module: +ATOM MyRegisterClass(HINSTANCE hInstance); +BOOL InitInstance(HINSTANCE, int); +LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK AboutProc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK OptionsProc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK WarningProc(HWND, UINT, WPARAM, LPARAM); + +int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +{ + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); + + // TODO: Place code here. + MSG msg; + HACCEL hAccelTable; + + // Initialize global strings + LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); + LoadString(hInstance, IDC_MAGNIFIER, szWindowClass, MAX_LOADSTRING); + MyRegisterClass(hInstance); + + // Perform application initialization: + if (!InitInstance (hInstance, nCmdShow)) + { + return FALSE; + } + + hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_MAGNIFIER)); + + // Main message loop: + while (GetMessage(&msg, NULL, 0, 0)) + { + if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + return (int) msg.wParam; +} + + + +// +// FUNCTION: MyRegisterClass() +// +// PURPOSE: Registers the window class. +// +// COMMENTS: +// +// This function and its usage are only necessary if you want this code +// to be compatible with Win32 systems prior to the 'RegisterClassEx' +// function that was added to Windows 95. It is important to call this function +// so that the application will get 'well formed' small icons associated +// with it. +// +ATOM MyRegisterClass(HINSTANCE hInstance) +{ + WNDCLASSEX wcex; + + wcex.cbSize = sizeof(WNDCLASSEX); + + wcex.style = CS_HREDRAW | CS_VREDRAW; + wcex.lpfnWndProc = WndProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hInstance; + wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAGNIFIER)); + wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcex.lpszMenuName = MAKEINTRESOURCE(IDC_MAGNIFIER); + wcex.lpszClassName = szWindowClass; + wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL)); + + return RegisterClassEx(&wcex); +} + +// +// FUNCTION: InitInstance(HINSTANCE, int) +// +// PURPOSE: Saves instance handle and creates main window +// +// COMMENTS: +// +// In this function, we save the instance handle in a global variable and +// create and display the main program window. +// +BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) +{ + hInst = hInstance; // Store instance handle in our global variable + + // Create the Window + hMainWnd = CreateWindowEx( + WS_EX_TOPMOST, + szWindowClass, + szTitle, + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + NULL, + NULL, + hInstance, + NULL); + + if (!hMainWnd) + { + return FALSE; + } + + ShowWindow(hMainWnd, nCmdShow); + UpdateWindow(hMainWnd); + + return TRUE; +} + +void Refresh () +{ + if (!IsIconic(hMainWnd)) + { + // Invalidate the client area forcing a WM_PAINT message + InvalidateRgn(hMainWnd, NULL, TRUE); + } +} + +void Draw(HDC aDc) +{ + HDC desktopHdc = NULL; + HDC HdcStrech; + HANDLE hOld; + HBITMAP HbmpStrech; + + RECT R; + RECT appRect; + DWORD rop = SRCCOPY; + HCURSOR hCursor; + CURSORINFO info; + + desktopHdc = GetWindowDC (hDesktopWindow); + + GetClientRect(hMainWnd, &appRect); + GetWindowRect(hDesktopWindow, &R); + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + GetCursorInfo(&info); + hCursor = info.hCursor; + + /* Create a memory DC compatible with client area DC.*/ + HdcStrech = CreateCompatibleDC(desktopHdc); + + /* Create a bitmap compatible with the client area DC.*/ + HbmpStrech = CreateCompatibleBitmap( + desktopHdc, + R.right, + R.bottom); + + /* Select our bitmap in memory DC and save the old one.*/ + hOld = SelectObject (HdcStrech , HbmpStrech); + + /* Paint the screen bitmap to our in memory DC */ + BitBlt( + HdcStrech, + 0, + 0, + R.right, + R.bottom, + desktopHdc, + 0, + 0, + SRCCOPY); + + /* Draw the mouse pointer in the right position */ + DrawIcon( + HdcStrech , + pMouse.x - 10, + pMouse.y - 10, + hCursor); + + int Width = (R.right - R.left); + int Height = (R.bottom - R.top); + + int AppWidth = (appRect.right - appRect.left); + int AppHeight = (appRect.bottom - appRect.top); + + LONG blitAreaWidth = AppWidth / iZoom; + LONG blitAreaHeight = AppHeight / iZoom; + + LONG blitAreaX = (cp.x) - (blitAreaWidth /2); + LONG blitAreaY = (cp.y) - (blitAreaHeight /2); + + if (blitAreaX < 0) + { + blitAreaX = 0; + } + + if (blitAreaY < 0) + { + blitAreaY = 0; + } + + if (blitAreaX > (Width - blitAreaWidth)) + { + blitAreaX = (Width - blitAreaWidth); + } + + if (blitAreaY > (Height - blitAreaHeight)) + { + blitAreaY = (Height - blitAreaHeight); + } + + if (bInvertColors) + { + rop = NOTSRCCOPY; + } + + StretchBlt( + HdcStrech, + 0, + 0, + AppWidth, + AppHeight, + HdcStrech, + blitAreaX, + blitAreaY, + blitAreaWidth, + blitAreaHeight, + rop); + + /* Blast the image from memory DC to client DC.*/ + BitBlt ( + aDc, + 0 , + 0 , + AppWidth , + AppHeight , + HdcStrech , + 0 , + 0 , + SRCCOPY); + + /* Cleanup.*/ + SelectObject (HdcStrech, hOld); + DeleteObject (HbmpStrech); + DeleteDC (HdcStrech); +} + +// +// FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM) +// +// PURPOSE: Processes messages for the main window. +// +// WM_COMMAND - process the application menu +// WM_PAINT - Paint the main window +// WM_DESTROY - post a quit message and return +// +// +LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + int wmId, wmEvent; + + switch (message) + { + case WM_TIMER: + { + POINT pNewMouse; + POINT pNewCaret; + POINT pNewFocus; + + //Get current mouse position + GetCursorPos (&pNewMouse); + + //Get caret position + HWND hwnd1 = GetForegroundWindow (); + DWORD a = GetWindowThreadProcessId(hwnd1, NULL); + DWORD b = GetCurrentThreadId(); + AttachThreadInput (a, b, TRUE); + HWND hwnd2 = GetFocus(); + + GetCaretPos( &pNewCaret); + ClientToScreen (hwnd2, (LPPOINT) &pNewCaret); + AttachThreadInput (a, b, FALSE); + + //Get current control focus + HWND hwnd3 = GetFocus (); + RECT controlRect; + GetWindowRect (hwnd3 , &controlRect); + pNewFocus.x = controlRect.left; + pNewFocus.y = controlRect.top; + + //If mouse has moved .... + if (((pMouse.x != pNewMouse.x) || (pMouse.y != pNewMouse.y)) && bFollowMouse) + { + //Update to new position + pMouse = pNewMouse; + cp = pNewMouse; + Refresh(); + } + else if (((pCaret.x != pNewCaret.x) || (pCaret.y != pNewCaret.y)) && bFollowCaret) + { + //Update to new position + pCaret = pNewCaret; + cp = pNewCaret; + Refresh(); + } + else if (((pFocus.x != pNewFocus.x) || (pFocus.y != pNewFocus.y)) && bFollowFocus) + { + //Update to new position + pFocus = pNewFocus; + cp = pNewFocus; + Refresh(); + } + } + break; + case WM_COMMAND: + wmId = LOWORD(wParam); + wmEvent = HIWORD(wParam); + // Parse the menu selections: + switch (wmId) + { + case IDM_OPTIONS: + DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hWnd, (DLGPROC)OptionsProc); + break; + case IDM_ABOUT: + DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, (DLGPROC)AboutProc); + break; + case IDM_EXIT: + DestroyWindow(hWnd); + break; + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + break; + case WM_PAINT: + { + PAINTSTRUCT PaintStruct; + HDC dc; + dc = BeginPaint(hWnd, &PaintStruct); + Draw(dc); + EndPaint(hWnd, &PaintStruct); + } + break; + case WM_ERASEBKGND: + //handle WM_ERASEBKGND by simply returning non-zero because we did all the drawing in WM_PAINT. + break; + case WM_DESTROY: + //Save settings to registry + SaveSettings (); + KillTimer (hWnd , 1); + PostQuitMessage(0); + break; + case WM_CREATE: + //Load settings from registry + LoadSettings (); + + //Get the desktop window + hDesktopWindow = GetDesktopWindow(); + + if (bShowWarning) + { + DialogBox (hInst, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hWnd, (DLGPROC)WarningProc); + } + + if (bStartMinimized) + { + ShowWindow (hMainWnd, SW_MINIMIZE ); + } + + //Set the timer + SetTimer (hWnd , 1, REPAINT_SPEED , NULL); + break; + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + return 0; +} + +// Message handler for about box. +INT_PTR CALLBACK AboutProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + switch (message) + { + case WM_INITDIALOG: + return (INT_PTR)TRUE; + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + } + break; + } + return (INT_PTR)FALSE; +} + +// Message handler for options box. +INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + switch (message) + { + case WM_INITDIALOG: + { + //Add the zoom items.... + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("1")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("2")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("3")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("4")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("5")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("6")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("7")); + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("8")); + + // + SendDlgItemMessage(hDlg, IDC_ZOOM, CB_SETCURSEL, iZoom - 1, 0); + + if (bFollowMouse) + SendDlgItemMessage(hDlg,IDC_FOLLOWMOUSECHECK,BM_SETCHECK , wParam ,0); + + if (bFollowFocus) + SendDlgItemMessage(hDlg,IDC_FOLOWKEYBOARDCHECK,BM_SETCHECK , wParam ,0); + + if (bFollowCaret) + SendDlgItemMessage(hDlg,IDC_FOLLOWTEXTEDITINGCHECK,BM_SETCHECK , wParam ,0); + + if (bInvertColors) + SendDlgItemMessage(hDlg,IDC_INVERTCOLORSCHECK,BM_SETCHECK , wParam ,0); + + if (bStartMinimized) + SendDlgItemMessage(hDlg,IDC_STARTMINIMIZEDCHECK,BM_SETCHECK , wParam ,0); + + if (bShowMagnifier) + SendDlgItemMessage(hDlg,IDC_SHOWMAGNIFIERCHECK,BM_SETCHECK , wParam ,0); + + return (INT_PTR)TRUE; + } + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + } + if (LOWORD(wParam) == IDOK) + { + } + if (LOWORD(wParam) == IDHELP) + { + MessageBox(hDlg , TEXT("Magnifier help not available yet!") , TEXT("Help") , MB_OK); + } + switch(LOWORD(wParam)) + { + case IDC_ZOOM: + if(HIWORD(wParam) == CBN_SELCHANGE) + { + HWND hCombo = GetDlgItem(hDlg,IDC_ZOOM); + + /* Get index of current selection and the text of that selection. */ + iZoom = SendMessage( hCombo, CB_GETCURSEL, (WPARAM) wParam, (LPARAM) lParam ) + 1; + + //Update the magnigier UI + Refresh (); + } + break; + case IDC_INVERTCOLORSCHECK: + bInvertColors = IsDlgButtonChecked (hDlg, IDC_INVERTCOLORSCHECK); + Refresh (); + break; + case IDC_FOLLOWMOUSECHECK: + bFollowMouse = IsDlgButtonChecked (hDlg, IDC_FOLLOWMOUSECHECK); + break; + case IDC_FOLOWKEYBOARDCHECK: + bFollowFocus = IsDlgButtonChecked (hDlg, IDC_FOLOWKEYBOARDCHECK); + break; + case IDC_FOLLOWTEXTEDITINGCHECK: + bFollowCaret = IsDlgButtonChecked (hDlg, IDC_FOLLOWTEXTEDITINGCHECK); + break; + case IDC_STARTMINIMIZEDCHECK: + bStartMinimized = IsDlgButtonChecked (hDlg, IDC_STARTMINIMIZEDCHECK); + break; + case IDC_SHOWMAGNIFIER: + bShowMagnifier = IsDlgButtonChecked (hDlg, IDC_SHOWMAGNIFIERCHECK); + if (bShowMagnifier){ + ShowWindow (hMainWnd , SW_SHOW); + }else{ + ShowWindow (hMainWnd , SW_HIDE); + } + break; + } + } + return (INT_PTR)FALSE; +} + +// Message handler for warning box. +INT_PTR CALLBACK WarningProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (message) + { + case WM_INITDIALOG: + return (INT_PTR)TRUE; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDC_SHOWWARNINGCHECK: + bShowWarning = !IsDlgButtonChecked (hDlg, IDC_SHOWWARNINGCHECK); + break; + } + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + } + break; + } + return (INT_PTR)FALSE; +} Added: trunk/rosapps/magnify/magnifier.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/magnifier.h?rev=27… ============================================================================== --- trunk/rosapps/magnify/magnifier.h (added) +++ trunk/rosapps/magnify/magnifier.h Wed Jul 25 22:00:56 2007 @@ -1,0 +1,36 @@ +/* + * WineCalc (magnifier.h) + * + * Copyright 2007 Marc Piulachs + * + * 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 + */ + +////////////////////////////////////////////////////////////////// + +int iZoom; + +BOOL bShowWarning; + +BOOL bFollowMouse; +BOOL bFollowFocus; +BOOL bFollowCaret; + +BOOL bInvertColors; +BOOL bStartMinimized; +BOOL bShowMagnifier; + +void LoadSettings(); +void SaveSettings(); Added: trunk/rosapps/magnify/magnify.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/magnify.rbuild?rev… ============================================================================== --- trunk/rosapps/magnify/magnify.rbuild (added) +++ trunk/rosapps/magnify/magnify.rbuild Wed Jul 25 22:00:56 2007 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<module name="magnify" type="win32gui" installbase="system32" installname="magnify.exe"> + <include base="magnify">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>shell32</library> + <library>kernel32</library> + <file>magnifier.c</file> + <file>settings.c</file> + <file>magnify.rc</file> +</module> Added: trunk/rosapps/magnify/magnify.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/magnify.rc?rev=278… ============================================================================== --- trunk/rosapps/magnify/magnify.rc (added) +++ trunk/rosapps/magnify/magnify.rc Wed Jul 25 22:00:56 2007 @@ -1,0 +1,11 @@ +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Magnifier\0" +#define REACTOS_STR_INTERNAL_NAME "magnify\0" +#define REACTOS_STR_ORIGINAL_FILENAME "magnify.exe\0" + +#include <reactos/version.rc> + +#include "lang/en-US.rc" Added: trunk/rosapps/magnify/res/magnify.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/res/magnify.ico?re… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/magnify/res/magnify.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/magnify/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/resource.h?rev=278… ============================================================================== --- trunk/rosapps/magnify/resource.h (added) +++ trunk/rosapps/magnify/resource.h Wed Jul 25 22:00:56 2007 @@ -1,0 +1,43 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Magnifier.rc +// +#define IDC_MYICON 2 +#define IDD_MAGNIFIER_DIALOG 102 +#define IDS_APP_TITLE 103 +#define IDD_ABOUTBOX 103 +#define IDM_ABOUT 104 +#define IDM_EXIT 105 +#define IDI_MAGNIFIER 107 +#define IDI_SMALL 108 +#define IDC_MAGNIFIER 109 +#define IDR_MAINFRAME 128 +#define IDD_DIALOGOPTIONS 129 +#define IDD_WARNINGDIALOG 130 +#define IDC_ZOOM 1000 +#define IDC_CHECK1 1001 +#define IDC_FOLOWKEYBOARDCHECK 1002 +#define IDC_FOLLOWTEXTEDITINGCHECK 1003 +#define IDC_INVERTCOLORSCHECK 1004 +#define IDC_STARTMINIMIZEDCHECK 1005 +#define IDC_SHOWMAGNIFIER 1006 +#define IDC_SHOWMAGNIFIERCHECK 1006 +#define IDC_FOLLOWMOUSECHECK 1007 +#define IDC_SHOWWARNINGCHECK 1009 +#define IDC_BUTTON1 1008 +#define ID_FILE_OPTIONS 32771 +#define ID_OPTIONS 32772 +#define IDM_OPTIONS 32773 +#define IDC_STATIC -1 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NO_MFC 1 +#define _APS_NEXT_RESOURCE_VALUE 131 +#define _APS_NEXT_COMMAND_VALUE 32774 +#define _APS_NEXT_CONTROL_VALUE 1009 +#define _APS_NEXT_SYMED_VALUE 110 +#endif +#endif Added: trunk/rosapps/magnify/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/settings.c?rev=278… ============================================================================== --- trunk/rosapps/magnify/settings.c (added) +++ trunk/rosapps/magnify/settings.c Wed Jul 25 22:00:56 2007 @@ -1,0 +1,89 @@ +#include <windows.h> +#include <tchar.h> +#include "magnifier.h" + +int iZoom = 3; + +BOOL bShowWarning = TRUE; + +BOOL bFollowMouse = TRUE; +BOOL bFollowFocus = TRUE; +BOOL bFollowCaret = TRUE; + +BOOL bInvertColors = FALSE; +BOOL bStartMinimized = FALSE; +BOOL bShowMagnifier = TRUE; + +void LoadSettings() +{ + HKEY hkey; + LONG value; + ULONG len; + + RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, + _T(""), 0, KEY_READ, NULL, &hkey, NULL); + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryMagLevel"), 0, 0, (BYTE *)&value, &len)) + { + if(value >= 0 && value <= 9) + iZoom = value; + } + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("ShowWarning"), 0, 0, (BYTE *)&value, &len)) + bShowWarning = (value == 0 ? FALSE : TRUE); + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryInvertColors"), 0, 0, (BYTE *)&value, &len)) + bInvertColors = (value == 0 ? FALSE : TRUE); + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryStartMinimized"), 0, 0, (BYTE *)&value, &len)) + bStartMinimized = (value == 0 ? FALSE : TRUE); + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackCursor"), 0, 0, (BYTE *)&value, &len)) + bFollowMouse = (value == 0 ? FALSE : TRUE); + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackFocus"), 0, 0, (BYTE *)&value, &len)) + bFollowFocus = (value == 0 ? FALSE : TRUE); + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, 0, (BYTE *)&value, &len)) + bFollowFocus = (value == 0 ? FALSE : TRUE); + + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackText"), 0, 0, (BYTE *)&value, &len)) + bFollowCaret = (value == 0 ? FALSE : TRUE); + + RegCloseKey(hkey); +} + +void SaveSettings() +{ + HKEY hkey; + LONG value; + + RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, + _T(""), 0, KEY_WRITE, NULL, &hkey, NULL); + + value = iZoom; + RegSetValueEx(hkey, _T("StationaryMagLevel"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + + value = bShowWarning; + RegSetValueEx(hkey, _T("ShowWarning"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + + value = bInvertColors; + RegSetValueEx(hkey, _T("StationaryInvertColors"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + + value = bStartMinimized; + RegSetValueEx(hkey, _T("StationaryStartMinimized"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + + value = bFollowMouse; + RegSetValueEx(hkey, _T("StationaryTrackCursor"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + + value = bFollowFocus; + RegSetValueEx(hkey, _T("StationaryTrackFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + + value = bFollowFocus; + RegSetValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + + value = bFollowCaret; + RegSetValueEx(hkey, _T("StationaryTrackText"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + + RegCloseKey(hkey); +}

1 0

[cwittich] 27810: -fix an endless loop when a rbuild file has an invalid date See issue #2466 for more details.
by cwittich＠svn.reactos.org 25 Jul '07

25 Jul '07

Author: cwittich Date: Wed Jul 25 19:11:06 2007 New Revision: 27810 URL: http://svn.reactos.org/svn/reactos?rev=27810&view=rev Log: -fix an endless loop when a rbuild file has an invalid date See issue #2466 for more details. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/exception.cpp trunk/reactos/tools/rbuild/exception.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Wed Jul 25 19:11:06 2007 @@ -522,6 +522,9 @@ ProjectNode.GetProjectFilename ().c_str () ); string xmlbuildFilenames; int numberOfExistingFiles = 0; + struct stat statbuf; + time_t SystemTime, lastWriteTime; + for ( size_t i = 0; i < ProjectNode.xmlbuildfiles.size (); i++ ) { XMLInclude& xmlbuildfile = *ProjectNode.xmlbuildfiles[i]; @@ -530,6 +533,28 @@ numberOfExistingFiles++; if ( xmlbuildFilenames.length () > 0 ) xmlbuildFilenames += " "; + + FILE* f = fopen ( xmlbuildfile.topIncludeFilename.c_str (), "rb" ); + if ( !f ) + throw FileNotFoundException ( NormalizeFilename ( xmlbuildfile.topIncludeFilename ) ); + + if ( fstat ( fileno ( f ), &statbuf ) != 0 ) + { + fclose ( f ); + throw AccessDeniedException ( NormalizeFilename ( xmlbuildfile.topIncludeFilename ) ); + } + + lastWriteTime = statbuf.st_mtime; + SystemTime = time(NULL); + + if (SystemTime != -1) + { + if (difftime (lastWriteTime, SystemTime) > 0) + throw InvalidDateException ( NormalizeFilename ( xmlbuildfile.topIncludeFilename ) ); + } + + fclose ( f ); + xmlbuildFilenames += NormalizeFilename ( xmlbuildfile.topIncludeFilename ); if ( numberOfExistingFiles % 5 == 4 || i == ProjectNode.xmlbuildfiles.size () - 1 ) { Modified: trunk/reactos/tools/rbuild/exception.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/exception.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/exception.cpp (original) +++ trunk/reactos/tools/rbuild/exception.cpp Wed Jul 25 19:11:06 2007 @@ -62,6 +62,13 @@ const int linenumber ) : Exception ( "%s:%d", filename, linenumber ) { +} + +InvalidDateException::InvalidDateException ( const string& filename) + : Exception ( "File '%s' has an invalid date.", + filename.c_str() ) +{ + Filename = filename; } InvalidOperationException::InvalidOperationException ( Modified: trunk/reactos/tools/rbuild/exception.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/exception.h?r… ============================================================================== --- trunk/reactos/tools/rbuild/exception.h (original) +++ trunk/reactos/tools/rbuild/exception.h Wed Jul 25 19:11:06 2007 @@ -73,6 +73,12 @@ std::string Filename; }; +class InvalidDateException : public Exception +{ +public: + InvalidDateException ( const std::string& filename ); + std::string Filename; +}; class RequiredAttributeNotFoundException : public XMLInvalidBuildFileException {

1 0

[cfinck] 27809: Lithuanian translations by Vytis Girdzijauskas (cman AT cman DOT us) See issue #2461 for more details.
by cfinck＠svn.reactos.org 25 Jul '07

25 Jul '07

Author: cfinck Date: Wed Jul 25 18:23:41 2007 New Revision: 27809 URL: http://svn.reactos.org/svn/reactos?rev=27809&view=rev Log: Lithuanian translations by Vytis Girdzijauskas (cman AT cman DOT us) See issue #2461 for more details. Added: trunk/reactos/base/system/expand/lang/lt-LT.rc trunk/reactos/base/system/format/lang/lt-LT.rc trunk/reactos/base/system/regsvr32/lang/lt-LT.rc trunk/reactos/base/system/rundll32/lang/lt-LT.rc trunk/reactos/base/system/userinit/lang/lt-LT.rc trunk/reactos/base/system/winlogon/lang/lt-LT.rc Modified: trunk/reactos/base/system/expand/rsrc.rc trunk/reactos/base/system/format/rsrc.rc trunk/reactos/base/system/regsvr32/rsrc.rc trunk/reactos/base/system/rundll32/rsrc.rc trunk/reactos/base/system/userinit/rsrc.rc trunk/reactos/base/system/winlogon/rsrc.rc Added: trunk/reactos/base/system/expand/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/lt… ============================================================================== --- trunk/reactos/base/system/expand/lang/lt-LT.rc (added) +++ trunk/reactos/base/system/expand/lang/lt-LT.rc Wed Jul 25 18:23:41 2007 @@ -1,0 +1,14 @@ +/* Translation by Vytis 'CMan' Girdþijauskas cman(a)cman.us */ + +#include "resource.h" + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +IDS_Copy, "ReactOS bylø iðplëtimo pagalbinë programa. Versija 1.0\n\ +Copyright Victor Schneider 1997\n\n\ +Naudojimas: %s ðaltinio_byla [iðvesties_byla]\n" + +IDS_FAILS "LZCopy nepavyko: graþino %ld\n" +} Modified: trunk/reactos/base/system/expand/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/expand/rsrc.rc (original) +++ trunk/reactos/base/system/expand/rsrc.rc Wed Jul 25 18:23:41 2007 @@ -13,6 +13,7 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" Added: trunk/reactos/base/system/format/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/lt… ============================================================================== --- trunk/reactos/base/system/format/lang/lt-LT.rc (added) +++ trunk/reactos/base/system/format/lang/lt-LT.rc Wed Jul 25 18:23:41 2007 @@ -1,0 +1,69 @@ +/* Translation by Vytis 'CMan' Girdþijauskas cman(a)cman.us */ + +#include "resource.h" + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ +STRING_HELP, "Naudojimas: %S diskas: [-FS:bylø-sistema] [-V:þymë] [-Q] [-A:dydis] [-C]\n\n\ + [diskas:] Nurodo diskà formavimui.\n\ + -FS:bylø-sistema Nurodo bylø sistemos tipà (%s).\n\ + -V:þymë Nurodo tomo þymæ.\n\ + -Q Atliekamas spartus formavimas.\n\ + -A:dydis Pakeièia numatytàjá klasterio dydá. Bendram naudojimui\n\ + rekomenduojami numatytieji nustatymai\n\ + NTFS palaiko 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ + FAT palaiko 8192, 16K, 32K, 64K, 128K, 256K.\n\ + NTFS glaudinimas nëra palaikomas klasteriams, kuriø dydis\n\ + virðija 4096.\n\ + -C Naujai sukurtos bylos bus automatiðkai suglaudintos.\n\n" + +STRING_COMPLETE "%lu procentø baigta.\r" + +STRING_FORMAT_FAIL "FormatEx nepavyko sëkmingai uþbaigti operacijos.\n\n" + +STRING_NO_SUPPORT "Operacija nepalaikoma" + +STRING_FMIFS_FAIL "Nepavyko rasti FMIFS áëjimo taðkø.\n\n" + +STRING_UNKNOW_ARG "Neþinomas parametras: %S\n" + +STRING_DRIVE_PARM "Trûksta reikiamo disko parametro.\n\n" + +STRING_ERROR_DRIVE_TYPE "Nepavyko nustatyti disko tipo" + +STRING_INSERT_DISK "Á árenginá %C:\nádëkite naujà diskelá ir paspaukite Enter..." + +STRING_NO_VOLUME "Nepavyko kreiptis á tomà" + +STRING_NO_VOLUME_SIZE "Nepavyko nustatyti tomo dydþio" + +STRING_FILESYSTEM "Bylø sistemos tipas yra %S.\n" + +STRING_LABEL_NAME_EDIT "Áveskite dabartinæ tomo þymæ diskui %C: " + +STRING_ERROR_LABEL "Ávesta netinkama ðiam diskui tomo þymë.\n" + +STRING_YN_FORMAT "\nDËMESIO, VISA INFORMACIJA, ESANTI\n\ +DISKE %C: BUS SUNAIKINTA!\nTæsti formavimà (T/N)? " + +STRING_YES_NO_FAQ "TN" + +STRING_VERIFYING "Perþiûrima" + +STRING_FAST_FMT "Spartus formavimas" + +STRING_CREATE_FSYS "Kuriama bylø sistemos struktûra.\n" + +STRING_FMT_COMPLETE "Formavimas baigtas.\n" + +STRING_VOL_COMPRESS "Tomas nepalaiko glaudinimo.\n" + +STRING_ENTER_LABEL "Tomo þymë (11 simboliø, Enter - be þymës)? " + +STRING_NO_LABEL "Nepavyko paþymëti tomo" + +STRING_FREE_SPACE "\n%I64d baitai ið viso diske.\n%I64d baitai laisvos vietos diske.\n" + +STRING_SERIAL_NUMBER "\nTomo serijos numeris yra %04X-%04X\n" +} Modified: trunk/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/format/rsrc.rc (original) +++ trunk/reactos/base/system/format/rsrc.rc Wed Jul 25 18:23:41 2007 @@ -9,6 +9,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" Added: trunk/reactos/base/system/regsvr32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/lt-LT.rc (added) +++ trunk/reactos/base/system/regsvr32/lang/lt-LT.rc Wed Jul 25 18:23:41 2007 @@ -1,0 +1,30 @@ +/* Translation by Vytis 'CMan' Girdþijauskas cman(a)cman.us */ + +#include "resource.h" + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +IDS_UsageMessage, "%s\n\nNaudojimas: regsvr32 [/u] [/s] [/c] [/n] [/i[:parametras]] dll_bylos_vardas\n\ +/u - Iðregistruoti serverá\n\ +/s - Tylus; nerodomi praneðimø langai\n\ +/c - Iðvedimas á konsolæ\n\ +/i - Iðkviesti DllInstall perduodant nebûtinà [parametras]; kai naudojama su /u iðkvieèia dll uninstall\n\ +/n - Neiðkviesti DllRegisterServer; ði parinktis turi bûti naudojama su /i" + +IDS_NoDllSpecified, "Nenurodytas DLL bylos vardas." + +IDS_InvalidFlag, "Neatpaþintas parametras: %s" + +IDS_SwitchN_NoI, "Neatpaþintas parametras: /n turi bûti naudojama kartu su /i" + +IDS_DllNotLoaded, "LoadLibrary('%s') nepavyko.\nGetLastError graþino 0x%08x." + +IDS_MissingEntry, "%s ákelta, bet %s áëjimo taðkas nerastas.\n\n\ +%s neeksportuota, arba atmintyje yra sugadinta %s versija. Klaidos aptikimui ir paðalinimui siûloma naudoti PView." + +IDS_FailureMessage, "%s in %s nepavyko.\nGraþino: 0x%08x" + +IDS_SuccessMessage "%s in %s pavyko." +} Modified: trunk/reactos/base/system/regsvr32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/rsrc.… ============================================================================== --- trunk/reactos/base/system/regsvr32/rsrc.rc (original) +++ trunk/reactos/base/system/regsvr32/rsrc.rc Wed Jul 25 18:23:41 2007 @@ -10,6 +10,7 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" Added: trunk/reactos/base/system/rundll32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/lt-LT.rc (added) +++ trunk/reactos/base/system/rundll32/lang/lt-LT.rc Wed Jul 25 18:23:41 2007 @@ -1,0 +1,10 @@ +/* Translation by Vytis 'CMan' Girdþijauskas cman(a)cman.us */ + +#include "resource.h" + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ +IDS_DllNotLoaded, "LoadLibrary nepavyko paleisti '%s'" +IDS_MissingEntry, "Trûksta áëjimo taðko:%s\nIn %s" +} Modified: trunk/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rsrc.… ============================================================================== --- trunk/reactos/base/system/rundll32/rsrc.rc (original) +++ trunk/reactos/base/system/rundll32/rsrc.rc Wed Jul 25 18:23:41 2007 @@ -11,6 +11,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/base/system/userinit/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/lt-LT.rc (added) +++ trunk/reactos/base/system/userinit/lang/lt-LT.rc Wed Jul 25 18:23:41 2007 @@ -1,0 +1,11 @@ +/* Translation by Vytis 'CMan' Girdþijauskas cman(a)cman.us */ + +#include "resource.h" + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +STRING_USERINIT_FAIL, "Userinit nepavyko paleisti aplinkos!\n" + +} Modified: trunk/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/rsrc.… ============================================================================== --- trunk/reactos/base/system/userinit/rsrc.rc (original) +++ trunk/reactos/base/system/userinit/rsrc.rc Wed Jul 25 18:23:41 2007 @@ -13,6 +13,7 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" Added: trunk/reactos/base/system/winlogon/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/lt-LT.rc (added) +++ trunk/reactos/base/system/winlogon/lang/lt-LT.rc Wed Jul 25 18:23:41 2007 @@ -1,0 +1,47 @@ +/* Translation by Vytis 'CMan' Girdþijauskas cman(a)cman.us */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Iðjungti kompiuterá" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Dabar saugu iðjungti kompiuterá.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 + DEFPUSHBUTTON "&Perkrauti", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Vartotojo sàsajos sutrikimas" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Nepavyko ákelti prisijungimo prie vartotojo aplinkos DLL %s.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Susisiekite su sistemos administratoriumi, kuris pakeistø arba atstatytø originalià DLL.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "&Perkrauti", 1, 80, 91, 68, 14 +END + +STRINGTABLE +BEGIN + IDS_PREPARENETWORKCONNECTIONS "Ruoðiami tinklo susijungimai..." + IDS_APPLYINGCOMPUTERSETTINGS "Pritaikomos kompiuterio nuostatos..." + IDS_RUNNINGSTARTUPSCRIPTS "Vykdomi paleisties scenarijai..." + IDS_RUNNINGSHUTDOWNSCRIPTS "Vykdomi stabdymo scenarijai..." + IDS_APPLYINGYOURPERSONALSETTINGS "Pritaikomos asmeninës nuostatos..." + IDS_RUNNINGLOGOFFSCRIPTS "Vykdomi atsijungimo scenarijai..." + IDS_RUNNINGLOGONSCRIPTS "Vykdomi prisijungimo scenarijai..." + IDS_LOADINGYOURPERSONALSETTINGS "Ákeliamos asmeninës nuostatos..." + IDS_CLOSINGNETWORKCONNECTIONS "Uþdaromi tinklo susijungimai..." + IDS_REACTOSISSHUTTINGDOWN "ReactOS stabdoma..." + IDS_PREPARETOSTANDBY "Ruoðiamasi pristabdyti..." + IDS_PREPARETOHIBERNATE "Ruoðiamasi iðjungti áraðant..." + IDS_SAVEYOURSETTINGS "Iðsaugomos nuostatos..." + IDS_REACTOSISSTARTINGUP "Paleidþiama ReactOS..." +END + +STRINGTABLE +BEGIN + IDS_FAILEDACTIVATEUSERSHELL "Winlogon nepavyko aktyvuoti vartotojo aplinkos!" +END + Modified: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.… ============================================================================== --- trunk/reactos/base/system/winlogon/rsrc.rc (original) +++ trunk/reactos/base/system/winlogon/rsrc.rc Wed Jul 25 18:23:41 2007 @@ -14,6 +14,7 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc"

1 0

[cfinck] 27808: Norwegian translation for newdev.dll by Frode Lillerud (frode AT enkelt DOT no) See issue #2474 for more details.
by cfinck＠svn.reactos.org 25 Jul '07

25 Jul '07

Author: cfinck Date: Wed Jul 25 18:03:09 2007 New Revision: 27808 URL: http://svn.reactos.org/svn/reactos?rev=27808&view=rev Log: Norwegian translation for newdev.dll by Frode Lillerud (frode AT enkelt DOT no) See issue #2474 for more details. Added: trunk/reactos/dll/win32/newdev/lang/nb-NO.rc Modified: trunk/reactos/dll/win32/newdev/rsrc.rc Added: trunk/reactos/dll/win32/newdev/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/nb-N… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/nb-NO.rc (added) +++ trunk/reactos/dll/win32/newdev/lang/nb-NO.rc Wed Jul 25 18:03:09 2007 @@ -1,0 +1,112 @@ +/* + * Norwegian translation by FrodeL + */ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Installasjon av enhet" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Velkommen",IDC_WELCOMETITLE,120,8,195,24 + LTEXT "Denne veiviseren installerer driver for ny enhet:", + IDC_STATIC,120,21,195,16 + LTEXT "Klikk Neste for å fortsette.",IDC_STATIC,120,169,195,17 + LTEXT "UKJENT ENHET",IDC_DEVICE,134,36,164,11 + LTEXT "ADVARSEL! INSTALLASJON AV EN DRIVER KAN FRYSE DIN MASKIN, ELLER GJØRE AT DEN IKKE STARTER OPP!",IDC_STATIC,120,59,195,16 + CONTROL "Installer driver automatisk",IDC_RADIO_AUTO,"Button", + BS_AUTORADIOBUTTON,120,112,178,13 + CONTROL "Installer driver fra spesifikk lokasjon",IDC_RADIO_MANUAL, + "Button",BS_AUTORADIOBUTTON,120,133,164,14 +END + +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Installasjon av enhet" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installasjonen feilet",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Enheten kunne ikke bli installert fordi driveren ble ikke funnet.", + IDC_STATIC,120,40,195,19 + LTEXT "Klikk Tilbake dersom du har en disk med driveren, eller kjenner stien til driveren.", + IDC_STATIC,120,98,181,24 + CONTROL "Ikke vis denne dialogboksen lenger",IDC_DONOTSHOWDLG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 +END + +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Installasjon av enhet" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installasjonen feilet",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Enheten kunne ikke installeres fordi en ukjent feil oppstod.", + IDC_STATIC,120,40,195,19 + LTEXT "UKJENT ENHET",IDC_DEVICE,134,55,164,11 +END + +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installasjon av enhet" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Søk i disse områdene",IDC_RADIO_SEARCHHERE,"Button", + BS_AUTORADIOBUTTON,27,11,239,13 + CONTROL "Velg driver manuelt",IDC_RADIO_CHOOSE,"Button", + BS_AUTORADIOBUTTON,27,98,171,12 + CONTROL "Søk i flyttbart media",IDC_CHECK_MEDIA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 + CONTROL "Inkluder denne stien",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,47,54,162,10 + PUSHBUTTON "Søk",IDC_BROWSE,248,69,50,14 + COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL +END + +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installasjon av enhet" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "UKJENT ENHET",IDC_DEVICE,51,20,169,16 +END + +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installasjon av enhet" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "UKJENT ENHET",IDC_DEVICE,51,20,169,16 +END + +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Installasjon av enhet" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installasjonen er ferdig",IDC_FINISHTITLE,120,8,195,11 + LTEXT "Du må starte maskinen på nytt for å fullføre installasjonen av:", + IDC_STATIC,120,32,195,19 + LTEXT "Trykk Fullfør for å avslutte veiviseren.",IDC_STATIC,120,174, + 179,11 + LTEXT "UKJENT ENHET",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Installasjon av enhet" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installasjonen er ferdig",IDC_FINISHTITLE,120,8,195,11 + LTEXT "Veiviseren har installert driveren for: ", + IDC_STATIC,120,32,195,19 + LTEXT "Trykk Fullfør for å avslutte veiviseren.",IDC_STATIC,120,174, + 179,11 + LTEXT "UKJENT ENHET",IDC_DEVICE,148,53,147,12 +END + Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/rsrc.rc (original) +++ trunk/reactos/dll/win32/newdev/rsrc.rc Wed Jul 25 18:03:09 2007 @@ -13,6 +13,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/th-TH.rc"

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
71
Older →

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 July 2007