Ros-diffs

ros-diffs@reactos.org

81390 discussions

[winesync] 31794: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 19:32:09 2008 New Revision: 31794 URL: http://svn.reactos.org/svn/reactos?rev=31794&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild trunk/reactos/dll/win32/shlwapi/url.c Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c Mon Jan 14 19:32:09 2008 @@ -46,6 +46,7 @@ #include "shlwapi.h" #include "shellapi.h" #include "commdlg.h" +#include "mshtmhst.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -3226,13 +3227,10 @@ EnableModeless(IOleInPlaceFrame); else if (IsIface(IShellBrowser)) EnableModeless(IShellBrowser); -#if 0 - /* FIXME: Wine has no headers for these objects yet */ else if (IsIface(IInternetSecurityMgrSite)) EnableModeless(IInternetSecurityMgrSite); else if (IsIface(IDocHostUIHandler)) EnableModeless(IDocHostUIHandler); -#endif else return hRet; Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild Mon Jan 14 19:32:09 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" allowwarnings="true"> <importlibrary definition="shlwapi.spec.def" /> <include base="shlwapi">.</include> @@ -41,3 +42,4 @@ <file>shlwapi.rc</file> <file>shlwapi.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c (original) +++ trunk/reactos/dll/win32/shlwapi/url.c Mon Jan 14 19:32:09 2008 @@ -843,6 +843,9 @@ HRESULT ret; DWORD lenW = sizeof(bufW)/sizeof(WCHAR), lenA; + if (!pszEscaped || !pcchEscaped || !*pcchEscaped) + return E_INVALIDARG; + if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl)) return E_INVALIDARG; if((ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags)) == E_POINTER) { @@ -851,13 +854,13 @@ } if(ret == S_OK) { RtlUnicodeToMultiByteSize(&lenA, escapedW, lenW * sizeof(WCHAR)); - if(pszEscaped && *pcchEscaped > lenA) { + if(*pcchEscaped > lenA) { RtlUnicodeToMultiByteN(pszEscaped, *pcchEscaped - 1, &lenA, escapedW, lenW * sizeof(WCHAR)); pszEscaped[lenA] = 0; *pcchEscaped = lenA; } else { *pcchEscaped = lenA + 1; - ret = E_INVALIDARG; + ret = E_POINTER; } } if(escapedW != bufW) HeapFree(GetProcessHeap(), 0, escapedW);

1 0

[winesync] 31793: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 19:27:48 2008 New Revision: 31793 URL: http://svn.reactos.org/svn/reactos?rev=31793&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c trunk/reactos/dll/win32/rsaenh/rsaenh.rbuild Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.c?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.c (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.c Mon Jan 14 19:27:48 2008 @@ -2798,6 +2798,14 @@ } switch (dwParam) { + case KP_PADDING: + /* The MS providers only support PKCS5_PADDING */ + if (*(DWORD *)pbData != PKCS5_PADDING) { + SetLastError(NTE_BAD_DATA); + return FALSE; + } + return TRUE; + case KP_MODE: pCryptKey->dwMode = *(DWORD*)pbData; return TRUE; @@ -2814,6 +2822,23 @@ memcpy(pCryptKey->abInitVector, pbData, pCryptKey->dwBlockLen); setup_key(pCryptKey); return TRUE; + + case KP_SALT_EX: + { + CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)pbData; + + /* salt length can't be greater than 128 bits = 16 bytes */ + if (blob->cbData > 16) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + memcpy(pCryptKey->abKeyValue + pCryptKey->dwKeyLen, blob->pbData, + blob->cbData); + pCryptKey->dwSaltLen = blob->cbData; + setup_key(pCryptKey); + return TRUE; + } case KP_EFFECTIVE_KEYLEN: switch (pCryptKey->aiAlgid) { @@ -2901,7 +2926,7 @@ DWORD *pdwDataLen, DWORD dwFlags) { CRYPTKEY *pCryptKey; - DWORD dwBitLen; + DWORD dwValue; TRACE("(hProv=%08lx, hKey=%08lx, dwParam=%08x, pbData=%p, pdwDataLen=%p dwFlags=%08x)\n", hProv, hKey, dwParam, pbData, pdwDataLen, dwFlags); @@ -2933,20 +2958,24 @@ return copy_param(pbData, pdwDataLen, (CONST BYTE*)&pCryptKey->abKeyValue[pCryptKey->dwKeyLen], pCryptKey->dwSaltLen); + case KP_PADDING: + dwValue = PKCS5_PADDING; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); + case KP_KEYLEN: - dwBitLen = pCryptKey->dwKeyLen << 3; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwBitLen, sizeof(DWORD)); + dwValue = pCryptKey->dwKeyLen << 3; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); case KP_EFFECTIVE_KEYLEN: if (pCryptKey->dwEffectiveKeyLen) - dwBitLen = pCryptKey->dwEffectiveKeyLen; + dwValue = pCryptKey->dwEffectiveKeyLen; else - dwBitLen = pCryptKey->dwKeyLen << 3; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwBitLen, sizeof(DWORD)); + dwValue = pCryptKey->dwKeyLen << 3; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); case KP_BLOCKLEN: - dwBitLen = pCryptKey->dwBlockLen << 3; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwBitLen, sizeof(DWORD)); + dwValue = pCryptKey->dwBlockLen << 3; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); case KP_MODE: return copy_param(pbData, pdwDataLen, (CONST BYTE*)&pCryptKey->dwMode, sizeof(DWORD)); Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.rb… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.rbuild (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.rbuild Mon Jan 14 19:27:48 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="rsaenh" type="win32dll" baseaddress="${BASEADDRESS_RSAENH}" installbase="system32" installname="rsaenh.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="rsaenh.spec.def" /> @@ -26,3 +27,4 @@ <file>version.rc</file> <file>rsaenh.spec</file> </module> +</group>

1 0

[hpoussin] 31792: Why freeldr decided to redefine some error codes, instead of including winerror.h?
by hpoussin＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: hpoussin Date: Mon Jan 14 19:03:43 2008 New Revision: 31792 URL: http://svn.reactos.org/svn/reactos?rev=31792&view=rev Log: Why freeldr decided to redefine some error codes, instead of including winerror.h? Modified: trunk/reactos/boot/freeldr/freeldr/include/registry.h Modified: trunk/reactos/boot/freeldr/freeldr/include/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/registry.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/registry.h Mon Jan 14 19:03:43 2008 @@ -53,13 +53,6 @@ ULONG DataSize; PCHAR Data; } VALUE, *PVALUE; - - -#define ERROR_SUCCESS 0L -#define ERROR_OUTOFMEMORY 14L -#define ERROR_INVALID_PARAMETER 87L -#define ERROR_MORE_DATA 234L -#define ERROR_NO_MORE_ITEMS 259L #define assert(x)

1 0

[hpoussin] 31791: Add some constants
by hpoussin＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: hpoussin Date: Mon Jan 14 18:57:18 2008 New Revision: 31791 URL: http://svn.reactos.org/svn/reactos?rev=31791&view=rev Log: Add some constants Modified: trunk/reactos/include/psdk/wincrypt.h Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h (original) +++ trunk/reactos/include/psdk/wincrypt.h Mon Jan 14 18:57:18 2008 @@ -1723,6 +1723,19 @@ #define KP_KEYEXCHANGE_PIN 32 #define KP_SIGNATURE_PIN 33 #define KP_PREHASH 34 +#define KP_ROUNDS 35 +#define KP_OAEP_PARAMS 36 +#define KP_CMS_KEY_INFO 37 +#define KP_CMS_DH_KEY_INFO 38 +#define KP_PUB_PARAMS 39 +#define KP_VERIFY_PARAMS 40 +#define KP_HIGHEST_VERSION 41 +#define KP_GET_USE_COUNT 42 + +/* Values for KP_PADDING */ +#define PKCS5_PADDING 1 +#define RANDOM_PADDING 2 +#define ZERO_PADDING 3 /* CryptSignHash/CryptVerifySignature */ #define CRYPT_NOHASHOID 0x00000001

1 0

[winesync] 31790: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 18:54:12 2008 New Revision: 31790 URL: http://svn.reactos.org/svn/reactos?rev=31790&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/rsabase/version.rc (with props) Modified: trunk/reactos/dll/win32/rsabase/rsabase.rbuild Modified: trunk/reactos/dll/win32/rsabase/rsabase.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsabase/rsabase.… ============================================================================== --- trunk/reactos/dll/win32/rsabase/rsabase.rbuild (original) +++ trunk/reactos/dll/win32/rsabase/rsabase.rbuild Mon Jan 14 18:54:12 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="rsabase" type="win32dll" baseaddress="${BASEADDRESS_RSABASE}" installbase="system32" installname="rsabase.dll" allowwarnings="true" entrypoint="0"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="rsabase.spec.def" /> @@ -11,5 +12,8 @@ <library>wine</library> <library>rsaenh</library> <library>kernel32</library> + <library>ntdll</library> + <file>version.rc</file> <file>rsabase.spec</file> </module> +</group> Added: trunk/reactos/dll/win32/rsabase/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsabase/version.… ============================================================================== --- trunk/reactos/dll/win32/rsabase/version.rc (added) +++ trunk/reactos/dll/win32/rsabase/version.rc Mon Jan 14 18:54:12 2008 @@ -1,0 +1,26 @@ +/* + * Copyright (c) 2007 Detlef Riekenberg + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine rsabase" +#define WINE_FILENAME_STR "rsabase.dll" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/rsabase/version.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[winesync] 31789: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 18:52:45 2008 New Revision: 31789 URL: http://svn.reactos.org/svn/reactos?rev=31789&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/riched20/ocr_reverse.cur (with props) trunk/reactos/dll/win32/riched20/res.h (with props) Modified: trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/clipboard.c trunk/reactos/dll/win32/riched20/context.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/editstr.h trunk/reactos/dll/win32/riched20/paint.c trunk/reactos/dll/win32/riched20/para.c trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/riched20.rbuild trunk/reactos/dll/win32/riched20/richole.c trunk/reactos/dll/win32/riched20/rtf.h trunk/reactos/dll/win32/riched20/run.c trunk/reactos/dll/win32/riched20/style.c trunk/reactos/dll/win32/riched20/version.rc trunk/reactos/dll/win32/riched20/wrap.c Modified: trunk/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/caret.c (original) +++ trunk/reactos/dll/win32/riched20/caret.c Mon Jan 14 18:52:45 2008 @@ -27,7 +27,6 @@ static BOOL ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs); - void ME_GetSelection(ME_TextEditor *editor, int *from, int *to) { *from = ME_GetCursorOfs(editor, 0); @@ -59,7 +58,7 @@ length = ME_GetTextLength(editor); if ((GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_MULTILINE) && (how->flags & GTL_USECRLF)) - length += editor->nParagraphs; + length += editor->nParagraphs - 1; if (how->flags & GTL_NUMBYTES) { @@ -705,102 +704,83 @@ + pCursor->pRun->member.run.nCharOfs + pCursor->nOffset; } -int ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol) +static void ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol) { ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; + ME_DisplayItem *last = NULL; int rx = 0; - + if (is_eol) *is_eol = 0; - while(p != editor->pBuffer->pLast) - { - if (p->type == diParagraph) - { - int ry = y - p->member.para.nYPos; - if (ry < 0) + /* find paragraph */ + for (; p != editor->pBuffer->pLast; p = p->member.para.next_para) + { + assert(p->type == diParagraph); + if (y < p->member.para.nYPos + p->member.para.nHeight) + { + y -= p->member.para.nYPos; + p = ME_FindItemFwd(p, diStartRow); + break; + } + } + /* find row */ + for (; p != editor->pBuffer->pLast; ) + { + ME_DisplayItem *pp; + assert(p->type == diStartRow); + if (y < p->member.row.nYPos + p->member.row.nHeight) + { + p = ME_FindItemFwd(p, diRun); + break; + } + pp = ME_FindItemFwd(p, diStartRowOrParagraphOrEnd); + if (pp->type != diStartRow) + { + p = ME_FindItemFwd(p, diRun); + break; + } + p = pp; + } + for (; p != editor->pBuffer->pLast; p = p->next) + { + switch (p->type) + { + case diRun: + rx = x - p->member.run.pt.x; + if (rx < p->member.run.nWidth) { - result->pRun = ME_FindItemFwd(p, diRun); - result->nOffset = 0; - return 0; - } - if (ry >= p->member.para.nHeight) - { - p = p->member.para.next_para; - continue; - } - p = ME_FindItemFwd(p, diStartRow); - y = ry; - continue; - } - if (p->type == diStartRow) - { - int ry = y - p->member.row.nYPos; - if (ry < 0) - return 0; - if (ry >= p->member.row.nHeight) - { - p = ME_FindItemFwd(p, diStartRowOrParagraphOrEnd); - if (p->type != diStartRow) - return 0; - continue; - } + found_here: + assert(p->type == diRun); + if ((p->member.run.nFlags & MERF_ENDPARA) || rx < 0) + rx = 0; + result->pRun = p; + result->nOffset = ME_CharFromPointCursor(editor, rx, &p->member.run); + if (editor->pCursors[0].nOffset == p->member.run.strText->nLen && rx) + { + result->pRun = ME_FindItemFwd(editor->pCursors[0].pRun, diRun); + result->nOffset = 0; + } + return; + } + break; + case diStartRow: p = ME_FindItemFwd(p, diRun); - continue; - } - if (p->type == diRun) - { - ME_DisplayItem *pp; - rx = x - p->member.run.pt.x; - if (rx < 0) - rx = 0; - if (rx >= p->member.run.nWidth) /* not this run yet... find next item */ - { - pp = p; - do { - p = p->next; - if (p->type == diRun) - { - rx = x - p->member.run.pt.x; - goto continue_search; - } - if (p->type == diStartRow) - { - p = ME_FindItemFwd(p, diRun); - if (is_eol) - *is_eol = 1; - rx = 0; /* FIXME not sure */ - goto found_here; - } - if (p->type == diParagraph || p->type == diTextEnd) - { - rx = 0; /* FIXME not sure */ - p = pp; - goto found_here; - } - } while(1); - continue; - } - found_here: - if (p->member.run.nFlags & MERF_ENDPARA) - rx = 0; - result->pRun = p; - result->nOffset = ME_CharFromPointCursor(editor, rx, &p->member.run); - if (editor->pCursors[0].nOffset == p->member.run.strText->nLen && rx) - { - result->pRun = ME_FindItemFwd(editor->pCursors[0].pRun, diRun); - result->nOffset = 0; - } - return 1; - } - assert(0); - continue_search: - ; + if (is_eol) *is_eol = 1; + rx = 0; /* FIXME not sure */ + goto found_here; + case diParagraph: + case diTextEnd: + rx = 0; /* FIXME not sure */ + p = last; + goto found_here; + default: assert(0); + } + last = p; } result->pRun = ME_FindItemBack(p, diRun); result->nOffset = 0; assert(result->pRun->member.run.nFlags & MERF_ENDPARA); - return 0; } @@ -832,25 +812,64 @@ tmp_cursor = editor->pCursors[0]; is_selection = ME_IsSelection(editor); - ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd); - - if (GetKeyState(VK_SHIFT)>=0) - { - editor->pCursors[1] = editor->pCursors[0]; - } - else - { - if (!is_selection) { + if (x >= editor->selofs) + { + ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd); + if (GetKeyState(VK_SHIFT)>=0) + { + editor->pCursors[1] = editor->pCursors[0]; + } + else if (!is_selection) { editor->pCursors[1] = tmp_cursor; is_selection = 1; } - } - ME_InvalidateSelection(editor); - HideCaret(editor->hWnd); - ME_MoveCaret(editor); - ShowCaret(editor->hWnd); - ME_ClearTempStyle(editor); - ME_SendSelChange(editor); + + ME_InvalidateSelection(editor); + HideCaret(editor->hWnd); + ME_MoveCaret(editor); + ShowCaret(editor->hWnd); + ME_ClearTempStyle(editor); + ME_SendSelChange(editor); + } + else + { + ME_DisplayItem *pRow; + + editor->linesel = 1; + editor->sely = y; + /* Set pCursors[0] to beginning of line */ + ME_FindPixelPos(editor, x, y, &editor->pCursors[1], &editor->bCaretAtEnd); + /* Set pCursors[1] to end of line */ + pRow = ME_FindItemFwd(editor->pCursors[1].pRun, diStartRowOrParagraphOrEnd); + assert(pRow); + /* pCursor[0] is the position where the cursor will be drawn, + * pCursor[1] is the other end of the selection range + * pCursor[2] and [3] are backups of [0] and [1] so I + * don't have to look them up again + */ + + if (pRow->type == diStartRow) { + /* FIXME WTF was I thinking about here ? */ + ME_DisplayItem *pRun = ME_FindItemFwd(pRow, diRun); + assert(pRun); + editor->pCursors[0].pRun = pRun; + editor->pCursors[0].nOffset = 0; + editor->bCaretAtEnd = 1; + } else { + editor->pCursors[0].pRun = ME_FindItemBack(pRow, diRun); + assert(editor->pCursors[0].pRun && editor->pCursors[0].pRun->member.run.nFlags & MERF_ENDPARA); + editor->pCursors[0].nOffset = 0; + editor->bCaretAtEnd = 0; + } + editor->pCursors[2] = editor->pCursors[0]; + editor->pCursors[3] = editor->pCursors[1]; + ME_InvalidateSelection(editor); + HideCaret(editor->hWnd); + ME_MoveCaret(editor); + ShowCaret(editor->hWnd); + ME_ClearTempStyle(editor); + ME_SendSelChange(editor); + } } void ME_MouseMove(ME_TextEditor *editor, int x, int y) @@ -861,14 +880,33 @@ tmp_cursor = editor->pCursors[0]; /* FIXME: do something with the return value of ME_FindPixelPos */ - ME_FindPixelPos(editor, x, y, &tmp_cursor, &editor->bCaretAtEnd); - - if (tmp_cursor.pRun == editor->pCursors[0].pRun && - tmp_cursor.nOffset == editor->pCursors[0].nOffset) + if (!editor->linesel) + ME_FindPixelPos(editor, x, y, &tmp_cursor, &editor->bCaretAtEnd); + else ME_FindPixelPos(editor, (y > editor->sely) * editor->rcFormat.right, y, &tmp_cursor, &editor->bCaretAtEnd); + + if (!memcmp(&tmp_cursor, editor->pCursors, sizeof(tmp_cursor))) return; - + ME_InvalidateSelection(editor); - editor->pCursors[0] = tmp_cursor; + if (!editor->linesel) + editor->pCursors[0] = tmp_cursor; + else if (!memcmp(&tmp_cursor, editor->pCursors+2, sizeof(tmp_cursor)) || + !memcmp(&tmp_cursor, editor->pCursors+3, sizeof(tmp_cursor))) + { + editor->pCursors[0] = editor->pCursors[2]; + editor->pCursors[1] = editor->pCursors[3]; + } + else if (y < editor->sely) + { + editor->pCursors[0] = tmp_cursor; + editor->pCursors[1] = editor->pCursors[2]; + } + else + { + editor->pCursors[0] = tmp_cursor; + editor->pCursors[1] = editor->pCursors[3]; + } + HideCaret(editor->hWnd); ME_MoveCaret(editor); ME_InvalidateSelection(editor); @@ -1206,11 +1244,11 @@ { ME_Style *style; int from, to; - ME_Cursor c; - + ME_GetSelection(editor, &from, &to); - ME_CursorFromCharOfs(editor, from, &c); if (from != to) { + ME_Cursor c; + ME_CursorFromCharOfs(editor, from, &c); style = c.pRun->member.run.style; ME_AddRefStyle(style); /* ME_GetInsertStyle has already done that */ } @@ -1239,7 +1277,6 @@ sc.seltyp |= SEL_MULTICHAR; SendMessageW(GetParent(editor->hWnd), WM_NOTIFY, sc.nmhdr.idFrom, (LPARAM)&sc); } - BOOL ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) Modified: trunk/reactos/dll/win32/riched20/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/clipboa… ============================================================================== --- trunk/reactos/dll/win32/riched20/clipboard.c (original) +++ trunk/reactos/dll/win32/riched20/clipboard.c Mon Jan 14 18:52:45 2008 @@ -77,7 +77,7 @@ if(!ref) { GlobalFree(This->fmtetc); - richedit_free(This); + heap_free(This); } return ref; @@ -152,7 +152,7 @@ EnumFormatImpl *ret; TRACE("\n"); - ret = richedit_alloc(sizeof(EnumFormatImpl)); + ret = heap_alloc(sizeof(EnumFormatImpl)); ret->lpVtbl = &VT_EnumFormatImpl; ret->ref = 1; ret->cur = 0; @@ -195,7 +195,7 @@ if(This->unicode) GlobalFree(This->unicode); if(This->rtf) GlobalFree(This->rtf); if(This->fmtetc) GlobalFree(This->fmtetc); - richedit_free(This); + heap_free(This); } return ref; @@ -388,7 +388,7 @@ DataObjectImpl *obj; TRACE("(%p,%d,%d)\n", editor, lpchrg->cpMin, lpchrg->cpMax); - obj = richedit_alloc(sizeof(DataObjectImpl)); + obj = heap_alloc(sizeof(DataObjectImpl)); if(cfRTF == 0) cfRTF = RegisterClipboardFormatA("Rich Text Format"); Modified: trunk/reactos/dll/win32/riched20/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/context… ============================================================================== --- trunk/reactos/dll/win32/riched20/context.c (original) +++ trunk/reactos/dll/win32/riched20/context.c Mon Jan 14 18:52:45 2008 @@ -29,6 +29,8 @@ c->pt.y = 0; c->hbrMargin = CreateSolidBrush(RGB(224,224,224)); c->rcView = editor->rcFormat; + c->dpi.cx = GetDeviceCaps(hDC, LOGPIXELSX); + c->dpi.cy = GetDeviceCaps(hDC, LOGPIXELSY); } void ME_DestroyContext(ME_Context *c) Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c (original) +++ trunk/reactos/dll/win32/riched20/editor.c Mon Jan 14 18:52:45 2008 @@ -228,6 +228,7 @@ #include "shlwapi.h" #include "rtf.h" #include "imm.h" +#include "res.h" #define STACK_SIZE_DEFAULT 100 #define STACK_SIZE_MAX 1000 @@ -242,6 +243,8 @@ static const WCHAR RichEdit50W[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0}; static const WCHAR REListBox20W[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; static const WCHAR REComboBox20W[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; +static HCURSOR hLeft; +static HCURSOR hBeam; int me_debug = 0; HANDLE me_heap = NULL; @@ -329,10 +332,11 @@ { case rtfPlain: /* FIXME add more flags once they're implemented */ - fmt.dwMask = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_COLOR | CFM_BACKCOLOR | CFM_SIZE | CFM_WEIGHT; + fmt.dwMask = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINETYPE | CFM_STRIKEOUT | CFM_COLOR | CFM_BACKCOLOR | CFM_SIZE | CFM_WEIGHT; fmt.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; fmt.yHeight = 12*20; /* 12pt */ fmt.wWeight = 400; + fmt.bUnderlineType = CFU_UNDERLINENONE; break; case rtfBold: fmt.dwMask = CFM_BOLD; @@ -343,13 +347,24 @@ fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; break; case rtfUnderline: - fmt.dwMask = CFM_UNDERLINE; - fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; - fmt.bUnderlineType = CFU_CF1UNDERLINE; + fmt.dwMask = CFM_UNDERLINETYPE; + fmt.bUnderlineType = info->rtfParam ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; + break; + case rtfDotUnderline: + fmt.dwMask = CFM_UNDERLINETYPE; + fmt.bUnderlineType = info->rtfParam ? CFU_UNDERLINEDOTTED : CFU_UNDERLINENONE; + break; + case rtfDbUnderline: + fmt.dwMask = CFM_UNDERLINETYPE; + fmt.bUnderlineType = info->rtfParam ? CFU_UNDERLINEDOUBLE : CFU_UNDERLINENONE; + break; + case rtfWordUnderline: + fmt.dwMask = CFM_UNDERLINETYPE; + fmt.bUnderlineType = info->rtfParam ? CFU_UNDERLINEWORD : CFU_UNDERLINENONE; break; case rtfNoUnderline: - fmt.dwMask = CFM_UNDERLINE; - fmt.dwEffects = 0; + fmt.dwMask = CFM_UNDERLINETYPE; + fmt.bUnderlineType = CFU_UNDERLINENONE; break; case rtfStrikeThru: fmt.dwMask = CFM_STRIKEOUT; @@ -404,6 +419,7 @@ fmt.szFaceName[sizeof(fmt.szFaceName)/sizeof(WCHAR)-1] = '\0'; fmt.bCharSet = f->rtfFCharSet; fmt.dwMask = CFM_FACE | CFM_CHARSET; + fmt.bPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; } } break; @@ -1031,6 +1047,27 @@ return -1; } +/* helper to send a msg filter notification */ +static BOOL +ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) +{ + MSGFILTER msgf; + + msgf.nmhdr.hwndFrom = editor->hWnd; + msgf.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); + msgf.nmhdr.code = EN_MSGFILTER; + msgf.msg = msg; + + msgf.wParam = *wParam; + msgf.lParam = *lParam; + if (SendMessageW(GetParent(editor->hWnd), WM_NOTIFY, msgf.nmhdr.idFrom, (LPARAM)&msgf)) + return FALSE; + *wParam = msgf.wParam; + *lParam = msgf.lParam; + msgf.wParam = *wParam; + + return TRUE; +} static BOOL ME_KeyDown(ME_TextEditor *editor, WORD nKey) @@ -1088,6 +1125,14 @@ return FALSE; } +static void ME_SetCursor(ME_TextEditor *editor, int x) +{ + if (x < editor->selofs || editor->linesel) + SetCursor(hLeft); + else + SetCursor(hBeam); +} + static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) { CHARRANGE selrange; @@ -1115,21 +1160,21 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ME_TextEditor *ed = ALLOC_OBJ(ME_TextEditor); - HDC hDC; int i; ed->hWnd = hWnd; ed->bEmulateVersion10 = FALSE; ed->pBuffer = ME_MakeText(); - hDC = GetDC(hWnd); - ME_MakeFirstParagraph(hDC, ed->pBuffer); - ReleaseDC(hWnd, hDC); + ed->nZoomNumerator = ed->nZoomDenominator = 0; + ME_MakeFirstParagraph(ed); ed->bCaretShown = FALSE; - ed->nCursors = 2; + ed->nCursors = 4; ed->pCursors = ALLOC_N_OBJ(ME_Cursor, ed->nCursors); ed->pCursors[0].pRun = ME_FindItemFwd(ed->pBuffer->pFirst, diRun); ed->pCursors[0].nOffset = 0; ed->pCursors[1].pRun = ME_FindItemFwd(ed->pBuffer->pFirst, diRun); ed->pCursors[1].nOffset = 0; + ed->pCursors[2] = ed->pCursors[0]; + ed->pCursors[3] = ed->pCursors[1]; ed->nLastTotalLength = ed->nTotalLength = 0; ed->nHeight = 0; ed->nUDArrowX = -1; @@ -1147,7 +1192,6 @@ ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); - ed->nZoomNumerator = ed->nZoomDenominator = 0; ed->bRedraw = TRUE; ed->bHideSelection = FALSE; ed->nInvalidOfs = -1; @@ -1165,7 +1209,12 @@ } ME_CheckCharOffsets(ed); - + if (GetWindowLongW(hWnd, GWL_STYLE) & ES_SELECTIONBAR) + ed->selofs = 16; + else + ed->selofs = 0; + ed->linesel = 0; + if (GetWindowLongW(hWnd, GWL_STYLE) & ES_PASSWORD) ed->cPasswordMask = '*'; else @@ -1235,7 +1284,8 @@ if (editor->pFontCache[i].hFont) DeleteObject(editor->pFontCache[i].hFont); } - DeleteObject(editor->hbrBackground); + if (editor->rgbBackColor != -1) + DeleteObject(editor->hbrBackground); if(editor->lpOleCallback) IUnknown_Release(editor->lpOleCallback); @@ -1254,6 +1304,8 @@ DisableThreadLibraryCalls(hinstDLL); me_heap = HeapCreate (0, 0x10000, 0); if (!ME_RegisterEditorClass(hinstDLL)) return FALSE; + hLeft = LoadCursorW(hinstDLL, MAKEINTRESOURCEW(OCR_REVERSE)); + hBeam = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); LookupInit(); break; @@ -1551,7 +1603,7 @@ * setting the bit to work */ DWORD mask = ECO_VERTICAL | ECO_AUTOHSCROLL | ECO_AUTOVSCROLL | - ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN; + ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN | ECO_SELECTIONBAR; DWORD raw = GetWindowLongW(hWnd, GWL_STYLE); DWORD settings = mask & raw; @@ -1571,19 +1623,23 @@ } SetWindowLongW(hWnd, GWL_STYLE, (raw & ~mask) | (settings & mask)); - if (lParam & ECO_AUTOWORDSELECTION) + if (settings & ECO_AUTOWORDSELECTION) FIXME("ECO_AUTOWORDSELECTION not implemented yet!\n"); - if (lParam & ECO_SELECTIONBAR) - FIXME("ECO_SELECTIONBAR not implemented yet!\n"); - if (lParam & ECO_VERTICAL) + if (settings & ECO_SELECTIONBAR) + editor->selofs = 16; + else + editor->selofs = 0; + ME_WrapMarkedParagraphs(editor); + + if (settings & ECO_VERTICAL) FIXME("ECO_VERTICAL not implemented yet!\n"); - if (lParam & ECO_AUTOHSCROLL) + if (settings & ECO_AUTOHSCROLL) FIXME("ECO_AUTOHSCROLL not implemented yet!\n"); - if (lParam & ECO_AUTOVSCROLL) + if (settings & ECO_AUTOVSCROLL) FIXME("ECO_AUTOVSCROLL not implemented yet!\n"); - if (lParam & ECO_NOHIDESEL) + if (settings & ECO_NOHIDESEL) FIXME("ECO_NOHIDESEL not implemented yet!\n"); - if (lParam & ECO_WANTRETURN) + if (settings & ECO_WANTRETURN) FIXME("ECO_WANTRETURN not implemented yet!\n"); return settings; @@ -1677,9 +1733,13 @@ } case EM_SETBKGNDCOLOR: { - LRESULT lColor = ME_GetBackColor(editor); - if (editor->rgbBackColor != -1) + LRESULT lColor; + if (editor->rgbBackColor != -1) { DeleteObject(editor->hbrBackground); + lColor = editor->rgbBackColor; + } + else lColor = GetSysColor(COLOR_WINDOW); + if (wParam) { editor->rgbBackColor = -1; @@ -1996,19 +2056,47 @@ return 0; } case WM_GETTEXTLENGTH: - return ME_GetTextLength(editor); + { + GETTEXTLENGTHEX how; + + how.flags = GTL_CLOSE | (editor->bEmulateVersion10 ? 0 : GTL_USECRLF) | GTL_NUMCHARS; + how.codepage = unicode ? 1200 : CP_ACP; + return ME_GetTextLengthEx(editor, &how); + } case EM_GETTEXTLENGTHEX: return ME_GetTextLengthEx(editor, (GETTEXTLENGTHEX *)wParam); case WM_GETTEXT: { GETTEXTEX ex; - - ex.cb = wParam; + LRESULT rc; + LPSTR bufferA = NULL; + LPWSTR bufferW = NULL; + + if (unicode) + bufferW = heap_alloc((wParam + 2) * sizeof(WCHAR)); + else + bufferA = heap_alloc(wParam + 2); + + ex.cb = wParam + (unicode ? 2*sizeof(WCHAR) : 2); ex.flags = GT_USECRLF; ex.codepage = unicode ? 1200 : CP_ACP; ex.lpDefaultChar = NULL; ex.lpUsedDefaultChar = NULL; - return RichEditWndProc_common(hWnd, EM_GETTEXTEX, (WPARAM)&ex, lParam, unicode); + rc = RichEditWndProc_common(hWnd, EM_GETTEXTEX, (WPARAM)&ex, unicode ? (LPARAM)bufferW : (LPARAM)bufferA, unicode); + + if (unicode) + { + memcpy((LPWSTR)lParam, bufferW, wParam); + if (lstrlenW(bufferW) >= wParam / sizeof(WCHAR)) rc = 0; + } + else + { + memcpy((LPSTR)lParam, bufferA, wParam); + if (strlen(bufferA) >= wParam) rc = 0; + } + heap_free(bufferA); + heap_free(bufferW); + return rc; } case EM_GETTEXTEX: { @@ -2039,7 +2127,7 @@ /* potentially each char may be a CR, why calculate the exact value with O(N) when we can just take a bigger buffer? :) */ int crlfmul = (ex->flags & GT_USECRLF) ? 2 : 1; - LPWSTR buffer = richedit_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); + LPWSTR buffer = heap_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); DWORD buflen = ex->cb; LRESULT rc; DWORD flags = 0; @@ -2048,7 +2136,7 @@ rc = WideCharToMultiByte(ex->codepage, flags, buffer, -1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); if (rc) rc--; /* do not count 0 terminator */ - richedit_free(buffer); + heap_free(buffer); return rc; } } @@ -2324,25 +2412,47 @@ SetWindowLongPtrW(hWnd, 0, 0); return 0; case WM_LBUTTONDOWN: + if ((editor->nEventMask & ENM_MOUSEEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; SetFocus(hWnd); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); SetCapture(hWnd); ME_LinkNotify(editor,msg,wParam,lParam); + ME_SetCursor(editor, LOWORD(lParam)); break; case WM_MOUSEMOVE: + if ((editor->nEventMask & ENM_MOUSEEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; if (GetCapture() == hWnd) ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); ME_LinkNotify(editor,msg,wParam,lParam); + ME_SetCursor(editor, LOWORD(lParam)); break; case WM_LBUTTONUP: if (GetCapture() == hWnd) ReleaseCapture(); + if ((editor->nEventMask & ENM_MOUSEEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; + editor->linesel = 0; + ME_SetCursor(editor, LOWORD(lParam)); ME_LinkNotify(editor,msg,wParam,lParam); break; case WM_LBUTTONDBLCLK: + if ((editor->nEventMask & ENM_MOUSEEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; ME_LinkNotify(editor,msg,wParam,lParam); ME_SelectWord(editor); break; + case WM_RBUTTONUP: + case WM_RBUTTONDOWN: + if ((editor->nEventMask & ENM_MOUSEEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; + goto do_default; case WM_CONTEXTMENU: if (!ME_ShowContextMenu(editor, (short)LOWORD(lParam), (short)HIWORD(lParam))) goto do_default; @@ -2384,7 +2494,15 @@ case WM_COMMAND: TRACE("editor wnd command = %d\n", LOWORD(wParam)); return 0; + case WM_KEYUP: + if ((editor->nEventMask & ENM_KEYEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; + goto do_default; case WM_KEYDOWN: + if ((editor->nEventMask & ENM_KEYEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; if (ME_KeyDown(editor, LOWORD(wParam))) return 0; goto do_default; @@ -2491,7 +2609,11 @@ { int gcWheelDelta; UINT pulScrollLines; - + + if ((editor->nEventMask & ENM_MOUSEEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); gcWheelDelta = -GET_WHEEL_DELTA_WPARAM(wParam); @@ -2538,7 +2660,8 @@ ME_SendRequestResize(editor, TRUE); return 0; case WM_SETREDRAW: - editor->bRedraw = wParam; + if ((editor->bRedraw = wParam)) + ME_RewrapRepaint(editor); return 0; case WM_SIZE: { @@ -2804,7 +2927,10 @@ if (!ME_FindItemFwd(item, diRun)) /* No '\r' is appended to the last paragraph. */ nLen = 0; - else { + else if (bCRLF && nChars == 1) { + nLen = 0; + nChars = 0; + } else { *buffer = '\r'; if (bCRLF) { @@ -2847,7 +2973,7 @@ wcW.cbWndExtra = sizeof(ME_TextEditor *); wcW.hInstance = NULL; /* hInstance would register DLL-local class */ wcW.hIcon = NULL; - wcW.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); + wcW.hCursor = hBeam; wcW.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); wcW.lpszMenuName = NULL; Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.h (original) +++ trunk/reactos/dll/win32/riched20/editor.h Mon Jan 14 18:52:45 2008 @@ -23,24 +23,24 @@ extern HANDLE me_heap; -static inline void *richedit_alloc( size_t len ) +static inline void *heap_alloc( size_t len ) { return HeapAlloc( me_heap, 0, len ); } -static inline BOOL richedit_free( void *ptr ) +static inline BOOL heap_free( void *ptr ) { return HeapFree( me_heap, 0, ptr ); } -static inline void *richedit_realloc( void *ptr, size_t len ) +static inline void *heap_realloc( void *ptr, size_t len ) { return HeapReAlloc( me_heap, 0, ptr, len ); } -#define ALLOC_OBJ(type) richedit_alloc(sizeof(type)) -#define ALLOC_N_OBJ(type, count) richedit_alloc((count)*sizeof(type)) -#define FREE_OBJ(ptr) richedit_free(ptr) +#define ALLOC_OBJ(type) heap_alloc(sizeof(type)) +#define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) +#define FREE_OBJ(ptr) heap_free(ptr) #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN) @@ -60,8 +60,8 @@ void ME_ReleaseStyle(ME_Style *item); ME_Style *ME_GetInsertStyle(ME_TextEditor *editor, int nCursor); ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style); -HFONT ME_SelectStyleFont(ME_TextEditor *editor, HDC hDC, ME_Style *s); -void ME_UnselectStyleFont(ME_TextEditor *editor, HDC hDC, ME_Style *s, HFONT hOldFont); +HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s); +void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont); void ME_InitCharFormat2W(CHARFORMAT2W *pFmt); void ME_SaveTempStyle(ME_TextEditor *editor); void ME_ClearTempStyle(ME_TextEditor *editor); @@ -150,7 +150,7 @@ void ME_CheckCharOffsets(ME_TextEditor *editor); void ME_PropagateCharOffset(ME_DisplayItem *p, int shift); void ME_GetGraphicsSize(ME_TextEditor *editor, ME_Run *run, SIZE *pSize); -int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run); +int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run); /* this one accounts for 1/2 char tolerance */ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run); int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset); @@ -181,7 +181,6 @@ void ME_HideCaret(ME_TextEditor *ed); void ME_ShowCaret(ME_TextEditor *ed); void ME_MoveCaret(ME_TextEditor *ed); -int ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol); int ME_CharFromPos(ME_TextEditor *editor, int x, int y); void ME_LButtonDown(ME_TextEditor *editor, int x, int y); void ME_MouseMove(ME_TextEditor *editor, int x, int y); @@ -211,18 +210,16 @@ BOOL ME_UpdateSelection(ME_TextEditor *editor, const ME_Cursor *pTempCursor); /* wrap.c */ -void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp); -ME_DisplayItem *ME_MakeRow(int height, int baseline, int width); -void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd); -void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp); BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor); void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor); void ME_SendRequestResize(ME_TextEditor *editor, BOOL force); +int ME_twips2pointsX(ME_Context *c, int x); +int ME_twips2pointsY(ME_Context *c, int y); /* para.c */ ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run); void ME_GetSelectionParas(ME_TextEditor *editor, ME_DisplayItem **para, ME_DisplayItem **para_end); -void ME_MakeFirstParagraph(HDC hDC, ME_TextBuffer *editor); +void ME_MakeFirstParagraph(ME_TextEditor *editor); ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *rp, ME_Style *style); ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp); void ME_DumpParaStyle(ME_Paragraph *s); @@ -243,7 +240,6 @@ void ME_UpdateRepaint(ME_TextEditor *editor); void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph); void ME_EnsureVisible(ME_TextEditor *editor, ME_DisplayItem *pRun); -COLORREF ME_GetBackColor(const ME_TextEditor *editor); void ME_InvalidateSelection(ME_TextEditor *editor); void ME_QueueInvalidateFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator); @@ -257,6 +253,10 @@ void ME_UpdateScrollBar(ME_TextEditor *editor); int ME_GetYScrollPos(ME_TextEditor *editor); BOOL ME_GetYScrollVisible(ME_TextEditor *editor); + +/* other functions in paint.c */ +int ME_GetParaBorderWidth(ME_TextEditor *editor, int); +int ME_GetParaLineSpace(ME_Context *c, ME_Paragraph*); /* richole.c */ extern LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *); Modified: trunk/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editstr… ============================================================================== --- trunk/reactos/dll/win32/riched20/editstr.h (original) +++ trunk/reactos/dll/win32/riched20/editstr.h Mon Jan 14 18:52:45 2008 @@ -167,7 +167,6 @@ struct tagME_TableCell *pCells; /* list of cells and their properties */ struct tagME_TableCell *pLastCell; /* points to the last cell in the list */ - int nLeftMargin, nRightMargin, nFirstMargin; int nCharOfs; int nFlags; int nYPos, nHeight; @@ -325,6 +324,7 @@ BOOL bHaveFocus; /*for IME */ int imeStartIndex; + DWORD selofs, linesel, sely; } ME_TextEditor; typedef struct tagME_Context @@ -334,6 +334,7 @@ POINT ptRowOffset; RECT rcView; HBRUSH hbrMargin; + SIZE dpi; /* those are valid inside ME_WrapTextParagraph and related */ POINT ptFirstRun; Added: trunk/reactos/dll/win32/riched20/ocr_reverse.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/ocr_rev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/riched20/ocr_reverse.cur ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/paint.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/paint.c (original) +++ trunk/reactos/dll/win32/riched20/paint.c Mon Jan 14 18:52:45 2008 @@ -109,7 +109,8 @@ { /* Should be called whenever the contents of the control have changed */ ME_Cursor *pCursor; - + + if (!editor->bRedraw) return; if (ME_WrapMarkedParagraphs(editor)) ME_UpdateScrollBar(editor); @@ -135,27 +136,47 @@ * looks, but not content. Like resizing. */ ME_MarkAllForWrapping(editor); - ME_WrapMarkedParagraphs(editor); - ME_UpdateScrollBar(editor); - - ME_Repaint(editor); -} - + if (editor->bRedraw) + { + ME_WrapMarkedParagraphs(editor); + ME_UpdateScrollBar(editor); + ME_Repaint(editor); + } +} + +int ME_twips2pointsX(ME_Context *c, int x) +{ + if (c->editor->nZoomNumerator == 0) + return x * c->dpi.cx / 1440; + else + return x * c->dpi.cx * c->editor->nZoomNumerator / 1440 / c->editor->nZoomDenominator; +} + +int ME_twips2pointsY(ME_Context *c, int y) +{ + if (c->editor->nZoomNumerator == 0) + return y * c->dpi.cy / 1440; + else + return y * c->dpi.cy * c->editor->nZoomNumerator / 1440 / c->editor->nZoomDenominator; +} static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, int nChars, ME_Style *s, int *width, int nSelFrom, int nSelTo, int ymin, int cy) { HDC hDC = c->hDC; HGDIOBJ hOldFont; - COLORREF rgbOld, rgbBack; + COLORREF rgbOld; int yOffset = 0, yTwipsOffset = 0; - hOldFont = ME_SelectStyleFont(c->editor, hDC, s); - rgbBack = ME_GetBackColor(c->editor); + SIZE sz; + COLORREF rgb; + + hOldFont = ME_SelectStyleFont(c, s); if ((s->fmt.dwMask & CFM_LINK) && (s->fmt.dwEffects & CFE_LINK)) - rgbOld = SetTextColor(hDC, RGB(0,0,255)); + rgb = RGB(0,0,255); else if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) - rgbOld = SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); + rgb = GetSysColor(COLOR_WINDOWTEXT); else - rgbOld = SetTextColor(hDC, s->fmt.crTextColor); + rgb = s->fmt.crTextColor; + rgbOld = SetTextColor(hDC, rgb); if ((s->fmt.dwMask & s->fmt.dwEffects) & CFM_OFFSET) { yTwipsOffset = s->fmt.yOffset; } @@ -164,26 +185,43 @@ if (s->fmt.dwEffects & CFE_SUBSCRIPT) yTwipsOffset = -s->fmt.yHeight/12; } if (yTwipsOffset) - { - int numerator = 1; - int denominator = 1; - - if (c->editor->nZoomNumerator) - { - numerator = c->editor->nZoomNumerator; - denominator = c->editor->nZoomDenominator; - } - yOffset = yTwipsOffset * GetDeviceCaps(hDC, LOGPIXELSY) * numerator / denominator / 1440; - } + yOffset = ME_twips2pointsY(c, yTwipsOffset); ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, NULL); - if (width) { - SIZE sz; - GetTextExtentPoint32W(hDC, szText, nChars, &sz); - *width = sz.cx; + GetTextExtentPoint32W(hDC, szText, nChars, &sz); + if (width) *width = sz.cx; + if (s->fmt.dwMask & CFM_UNDERLINETYPE) + { + HPEN hPen; + switch (s->fmt.bUnderlineType) + { + case CFU_UNDERLINE: + case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ + case CFU_UNDERLINEDOUBLE: /* native seems to map it to simple underline (MSDN) */ + hPen = CreatePen(PS_SOLID, 1, rgb); + break; + case CFU_UNDERLINEDOTTED: + hPen = CreatePen(PS_DOT, 1, rgb); + break; + default: + WINE_FIXME("Unknown underline type (%u)\n", s->fmt.bUnderlineType); + /* fall through */ + case CFU_CF1UNDERLINE: /* this type is supported in the font, do nothing */ + case CFU_UNDERLINENONE: + hPen = NULL; + break; + } + if (hPen != NULL) + { + HPEN hOldPen = SelectObject(hDC, hPen); + /* FIXME: should use textmetrics info for Descent info */ + MoveToEx(hDC, x, y - yOffset + 1, NULL); + LineTo(hDC, x + sz.cx, y - yOffset + 1); + SelectObject(hDC, hOldPen); + DeleteObject(hPen); + } } if (nSelFrom < nChars && nSelTo >= 0 && nSelFrom<nSelTo) { - SIZE sz; if (nSelFrom < 0) nSelFrom = 0; if (nSelTo > nChars) nSelTo = nChars; GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); @@ -195,7 +233,7 @@ PatBlt(hDC, x, ymin, sz.cx, cy, DSTINVERT); } SetTextColor(hDC, rgbOld); - ME_UnselectStyleFont(c->editor, hDC, s, hOldFont); + ME_UnselectStyleFont(c, s, hOldFont); } static void ME_DebugWrite(HDC hDC, const POINT *pt, LPCWSTR szText) { @@ -239,7 +277,7 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Paragraph *para) { ME_Run *run = &rundi->member.run; - ME_DisplayItem *start = ME_FindItemBack(rundi, diStartRow); + ME_DisplayItem *start; int runofs = run->nCharOfs+para->nCharOfs; int nSelFrom, nSelTo; const WCHAR wszSpace[] = {' ', 0}; @@ -247,6 +285,7 @@ if (run->nFlags & MERF_HIDDEN) return; + start = ME_FindItemBack(rundi, diStartRow); ME_GetSelection(c->editor, &nSelFrom, &nSelTo); /* Draw selected end-of-paragraph mark */ @@ -278,15 +317,184 @@ } } -COLORREF ME_GetBackColor(const ME_TextEditor *editor) -{ -/* Looks like I was seriously confused - return GetSysColor((GetWindowLong(editor->hWnd, GWL_STYLE) & ES_READONLY) ? COLOR_3DFACE: COLOR_WINDOW); -*/ - if (editor->rgbBackColor == -1) - return GetSysColor(COLOR_WINDOW); +static struct {unsigned width_num : 4, width_den : 4, pen_style : 4, dble : 1;} border_details[] = { + /* none */ {0, 0, PS_SOLID, FALSE}, + /* 3/4 */ {3, 4, PS_SOLID, FALSE}, + /* 1 1/2 */ {3, 2, PS_SOLID, FALSE}, + /* 2 1/4 */ {9, 4, PS_SOLID, FALSE}, + /* 3 */ {3, 1, PS_SOLID, FALSE}, + /* 4 1/2 */ {9, 2, PS_SOLID, FALSE}, + /* 6 */ {6, 1, PS_SOLID, FALSE}, + /* 3/4 double */ {3, 4, PS_SOLID, TRUE}, + /* 1 1/2 double */ {3, 2, PS_SOLID, TRUE}, + /* 2 1/4 double */ {9, 4, PS_SOLID, TRUE}, + /* 3/4 gray */ {3, 4, PS_DOT /* FIXME */, FALSE}, + /* 1 1/2 dashed */ {3, 2, PS_DASH, FALSE}, +}; + +static COLORREF pen_colors[16] = { + /* Black */ RGB(0x00, 0x00, 0x00), /* Blue */ RGB(0x00, 0x00, 0xFF), + /* Cyan */ RGB(0x00, 0xFF, 0xFF), /* Green */ RGB(0x00, 0xFF, 0x00), + /* Magenta */ RGB(0xFF, 0x00, 0xFF), /* Red */ RGB(0xFF, 0x00, 0x00), + /* Yellow */ RGB(0xFF, 0xFF, 0x00), /* White */ RGB(0xFF, 0xFF, 0xFF), + /* Dark blue */ RGB(0x00, 0x00, 0x80), /* Dark cyan */ RGB(0x00, 0x80, 0x80), + /* Dark green */ RGB(0x00, 0x80, 0x80), /* Dark magenta */ RGB(0x80, 0x00, 0x80), + /* Dark red */ RGB(0x80, 0x00, 0x00), /* Dark yellow */ RGB(0x80, 0x80, 0x00), + /* Dark gray */ RGB(0x80, 0x80, 0x80), /* Light gray */ RGB(0xc0, 0xc0, 0xc0), +}; + +static int ME_GetBorderPenWidth(ME_TextEditor* editor, int idx) +{ + int width; + + if (editor->nZoomNumerator == 0) + { + width = border_details[idx].width_num + border_details[idx].width_den / 2; + width /= border_details[idx].width_den; + } else - return editor->rgbBackColor; + { + width = border_details[idx].width_num * editor->nZoomNumerator; + width += border_details[idx].width_den * editor->nZoomNumerator / 2; + width /= border_details[idx].width_den * editor->nZoomDenominator; + } + return width; +} + +int ME_GetParaBorderWidth(ME_TextEditor* editor, int flags) +{ + int idx = (flags >> 8) & 0xF; + int width; + + if (idx >= sizeof(border_details) / sizeof(border_details[0])) + { + FIXME("Unsupported border value %d\n", idx); + return 0; + } + width = ME_GetBorderPenWidth(editor, idx); + if (border_details[idx].dble) width = width * 2 + 1; + return width; +} + +int ME_GetParaLineSpace(ME_Context* c, ME_Paragraph* para) +{ + int sp = 0, ls = 0; + if (!(para->pFmt->dwMask & PFM_LINESPACING)) return 0; + + /* FIXME: how to compute simply the line space in ls ??? */ + /* FIXME: does line spacing include the line itself ??? */ + switch (para->pFmt->bLineSpacingRule) + { + case 0: sp = ls; break; + case 1: sp = (3 * ls) / 2; break; + case 2: sp = 2 * ls; break; + case 3: sp = ME_twips2pointsY(c, para->pFmt->dyLineSpacing); if (sp < ls) sp = ls; break; + case 4: sp = ME_twips2pointsY(c, para->pFmt->dyLineSpacing); break; + case 5: sp = para->pFmt->dyLineSpacing / 20; break; + default: FIXME("Unsupported spacing rule value %d\n", para->pFmt->bLineSpacingRule); + } + if (c->editor->nZoomNumerator == 0) + return sp; + else + return sp * c->editor->nZoomNumerator / c->editor->nZoomDenominator; +} + +static int ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y) +{ + int idx, border_width; + int ybefore, yafter; + RECT rc; + + if (!(para->pFmt->dwMask & (PFM_BORDER | PFM_SPACEBEFORE | PFM_SPACEAFTER))) return 0; + + if (para->pFmt->dwMask & PFM_SPACEBEFORE) + { + rc.left = c->rcView.left; + rc.right = c->rcView.right; + rc.top = y; + ybefore = ME_twips2pointsY(c, para->pFmt->dySpaceBefore); + rc.bottom = y + ybefore; + FillRect(c->hDC, &rc, c->editor->hbrBackground); + } + else ybefore = 0; + if (para->pFmt->dwMask & PFM_SPACEAFTER) + { + rc.left = c->rcView.left; + rc.right = c->rcView.right; + rc.bottom = y + para->nHeight; + yafter = ME_twips2pointsY(c, para->pFmt->dySpaceAfter); + rc.top = rc.bottom - yafter; + FillRect(c->hDC, &rc, c->editor->hbrBackground); + } + else yafter = 0; + + border_width = 0; + idx = (para->pFmt->wBorders >> 8) & 0xF; + if ((para->pFmt->dwMask & PFM_BORDER) && idx != 0 && (para->pFmt->wBorders & 0xF)) { + int pen_width; + COLORREF pencr; + HPEN pen = NULL, oldpen = NULL; + POINT pt; + + if (para->pFmt->wBorders & 0x00B0) + FIXME("Unsupported border flags %x\n", para->pFmt->wBorders); + border_width = ME_GetParaBorderWidth(c->editor, para->pFmt->wBorders); + + if (para->pFmt->wBorders & 64) /* autocolor */ + pencr = GetSysColor(COLOR_WINDOWTEXT); + else + pencr = pen_colors[(para->pFmt->wBorders >> 12) & 0xF]; + + pen_width = ME_GetBorderPenWidth(c->editor, idx); + pen = CreatePen(border_details[idx].pen_style, pen_width, pencr); + oldpen = SelectObject(c->hDC, pen); + MoveToEx(c->hDC, 0, 0, &pt); + + /* before & after spaces are not included in border */ + if (para->pFmt->wBorders & 1) + { + MoveToEx(c->hDC, c->rcView.left, y + ybefore, NULL); + LineTo(c->hDC, c->rcView.left, y + para->nHeight - yafter); + if (border_details[idx].dble) { + MoveToEx(c->hDC, c->rcView.left + pen_width + 1, y + ybefore + pen_width + 1, NULL); + LineTo(c->hDC, c->rcView.left + pen_width + 1, y + para->nHeight - yafter - pen_width - 1); + } + } + if (para->pFmt->wBorders & 2) + { + MoveToEx(c->hDC, c->rcView.right, y + ybefore, NULL); + LineTo(c->hDC, c->rcView.right, y + para->nHeight - yafter); + if (border_details[idx].dble) { + MoveToEx(c->hDC, c->rcView.right - pen_width - 1, y + ybefore + pen_width + 1, NULL); + LineTo(c->hDC, c->rcView.right - pen_width - 1, y + para->nHeight - yafter - pen_width - 1); + } + } + if (para->pFmt->wBorders & 4) + { + MoveToEx(c->hDC, c->rcView.left, y + ybefore, NULL); + LineTo(c->hDC, c->rcView.right, y + ybefore); + if (border_details[idx].dble) { + MoveToEx(c->hDC, c->rcView.left + pen_width + 1, y + ybefore + pen_width + 1, NULL); + LineTo(c->hDC, c->rcView.right - pen_width - 1, y + ybefore + pen_width + 1); + } + } + if (para->pFmt->wBorders & 8) + { + MoveToEx(c->hDC, c->rcView.left, y + para->nHeight - yafter - 1, NULL); + LineTo(c->hDC, c->rcView.right, y + para->nHeight - yafter - 1); + if (border_details[idx].dble) { + MoveToEx(c->hDC, c->rcView.left + pen_width + 1, y + para->nHeight - yafter - 1 - pen_width - 1, NULL); + LineTo(c->hDC, c->rcView.right - pen_width - 1, y + para->nHeight - yafter - 1 - pen_width - 1); + } + } + + MoveToEx(c->hDC, pt.x, pt.y, NULL); + SelectObject(c->hDC, oldpen); + DeleteObject(pen); + } + return ybefore + + ((para->pFmt->dwMask & PFM_BORDER) && (para->pFmt->wBorders & 4) ? + border_width : 0); } void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { @@ -297,10 +505,10 @@ RECT rc, rcPara; int y = c->pt.y; int height = 0, baseline = 0, no=0, pno = 0; - int xs, xe; - int visible = 0; + int xs = 0, xe = 0; + BOOL visible = FALSE; int nMargWidth = 0; - + c->pt.x = c->rcView.left; rcPara.left = c->rcView.left; rcPara.right = c->rcView.right; @@ -308,33 +516,33 @@ switch(p->type) { case diParagraph: para = &p->member.para; + assert(para); + nMargWidth = ME_twips2pointsX(c, para->pFmt->dxStartIndent); + if (pno != 0) + nMargWidth += ME_twips2pointsX(c, para->pFmt->dxOffset); + xs = c->rcView.left+nMargWidth; + xe = c->rcView.right - ME_twips2pointsX(c, para->pFmt->dxRightIndent); + y += ME_DrawParaDecoration(c, para, y); break; case diStartRow: - assert(para); - nMargWidth = (pno==0?para->nFirstMargin:para->nLeftMargin); - xs = c->rcView.left+nMargWidth; - xe = c->rcView.right-para->nRightMargin; y += height; rcPara.top = y; rcPara.bottom = y+p->member.row.nHeight; visible = RectVisible(c->hDC, &rcPara); if (visible) { - HBRUSH hbr; - hbr = CreateSolidBrush(ME_GetBackColor(c->editor)); /* left margin */ rc.left = c->rcView.left; rc.right = c->rcView.left+nMargWidth; rc.top = y; rc.bottom = y+p->member.row.nHeight; - FillRect(c->hDC, &rc, hbr/* c->hbrMargin */); + FillRect(c->hDC, &rc, c->editor->hbrBackground); /* right margin */ rc.left = xe; rc.right = c->rcView.right; - FillRect(c->hDC, &rc, hbr/* c->hbrMargin */); + FillRect(c->hDC, &rc, c->editor->hbrBackground); rc.left = c->rcView.left+nMargWidth; rc.right = xe; - FillRect(c->hDC, &rc, hbr); - DeleteObject(hbr); + FillRect(c->hDC, &rc, c->editor->hbrBackground); } if (me_debug) { @@ -489,8 +697,7 @@ SCROLLINFO si; si.cbSize = sizeof(si); si.fMask = SIF_POS; - GetScrollInfo(editor->hWnd, SB_VERT, &si); - return si.nPos; + return GetScrollInfo(editor->hWnd, SB_VERT, &si) ? si.nPos : 0; } BOOL ME_GetYScrollVisible(ME_TextEditor *editor) @@ -558,25 +765,26 @@ assert(para2->type == diParagraph); /* last selection markers aren't always updated, which means they can point past the end of the document */ - if (editor->nLastSelStart > len) - editor->nLastSelEnd = len; - if (editor->nLastSelEnd > len) - editor->nLastSelEnd = len; - - /* if the start part of selection is being expanded or contracted... */ - if (nStart < editor->nLastSelStart) { - ME_MarkForPainting(editor, para1, ME_FindItemFwd(editor->pLastSelStartPara, diParagraphOrEnd)); - } else - if (nStart > editor->nLastSelStart) { - ME_MarkForPainting(editor, editor->pLastSelStartPara, ME_FindItemFwd(para1, diParagraphOrEnd)); - } - - /* if the end part of selection is being contracted or expanded... */ - if (nEnd < editor->nLastSelEnd) { - ME_MarkForPainting(editor, para2, ME_FindItemFwd(editor->pLastSelEndPara, diParagraphOrEnd)); - } else - if (nEnd > editor->nLastSelEnd) { - ME_MarkForPainting(editor, editor->pLastSelEndPara, ME_FindItemFwd(para2, diParagraphOrEnd)); + if (editor->nLastSelStart > len || editor->nLastSelEnd > len) { + ME_MarkForPainting(editor, + ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph), + ME_FindItemFwd(editor->pBuffer->pFirst, diTextEnd)); + } else { + /* if the start part of selection is being expanded or contracted... */ + if (nStart < editor->nLastSelStart) { + ME_MarkForPainting(editor, para1, ME_FindItemFwd(editor->pLastSelStartPara, diParagraphOrEnd)); + } else + if (nStart > editor->nLastSelStart) { + ME_MarkForPainting(editor, editor->pLastSelStartPara, ME_FindItemFwd(para1, diParagraphOrEnd)); + } + + /* if the end part of selection is being contracted or expanded... */ + if (nEnd < editor->nLastSelEnd) { + ME_MarkForPainting(editor, para2, ME_FindItemFwd(editor->pLastSelEndPara, diParagraphOrEnd)); + } else + if (nEnd > editor->nLastSelEnd) { + ME_MarkForPainting(editor, editor->pLastSelEndPara, ME_FindItemFwd(para2, diParagraphOrEnd)); + } } ME_InvalidateMarkedParagraphs(editor); Modified: trunk/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/para.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/para.c (original) +++ trunk/reactos/dll/win32/riched20/para.c Mon Jan 14 18:52:45 2008 @@ -25,16 +25,22 @@ static const WCHAR wszParagraphSign[] = {0xB6, 0}; -void ME_MakeFirstParagraph(HDC hDC, ME_TextBuffer *text) -{ +void ME_MakeFirstParagraph(ME_TextEditor *editor) +{ + ME_Context c; + HDC hDC; PARAFORMAT2 fmt; CHARFORMAT2W cf; LOGFONTW lf; HFONT hf; + ME_TextBuffer *text = editor->pBuffer; ME_DisplayItem *para = ME_MakeDI(diParagraph); ME_DisplayItem *run; ME_Style *style; + hDC = GetDC(editor->hWnd); + + ME_InitContext(&c, editor, hDC); hf = (HFONT)GetStockObject(SYSTEM_FONT); assert(hf); GetObjectW(hf, sizeof(LOGFONTW), &lf); @@ -44,21 +50,23 @@ cf.dwMask |= CFM_ALLCAPS|CFM_BOLD|CFM_DISABLED|CFM_EMBOSS|CFM_HIDDEN; cf.dwMask |= CFM_IMPRINT|CFM_ITALIC|CFM_LINK|CFM_OUTLINE|CFM_PROTECTED; cf.dwMask |= CFM_REVISED|CFM_SHADOW|CFM_SMALLCAPS|CFM_STRIKEOUT; - cf.dwMask |= CFM_SUBSCRIPT|CFM_UNDERLINE; + cf.dwMask |= CFM_SUBSCRIPT|CFM_UNDERLINETYPE|CFM_WEIGHT; cf.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; lstrcpyW(cf.szFaceName, lf.lfFaceName); - cf.yHeight=lf.lfHeight*1440/GetDeviceCaps(hDC, LOGPIXELSY); - if (lf.lfWeight>=700) /* FIXME correct weight ? */ - cf.dwEffects |= CFE_BOLD; + cf.yHeight = ME_twips2pointsY(&c, lf.lfHeight); + if (lf.lfWeight >= 700) cf.dwEffects |= CFE_BOLD; cf.wWeight = lf.lfWeight; if (lf.lfItalic) cf.dwEffects |= CFE_ITALIC; - if (lf.lfUnderline) cf.dwEffects |= CFE_UNDERLINE; + cf.bUnderlineType = (lf.lfUnderline) ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; if (lf.lfStrikeOut) cf.dwEffects |= CFE_STRIKEOUT; - + cf.bPitchAndFamily = lf.lfPitchAndFamily; + cf.bCharSet = lf.lfCharSet; + ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); fmt.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_STARTINDENT | PFM_RIGHTINDENT | PFM_TABSTOPS; + fmt.wAlignment = PFA_LEFT; CopyMemory(para->member.para.pFmt, &fmt, sizeof(PARAFORMAT2)); @@ -76,6 +84,9 @@ text->pLast->member.para.prev_para = para; text->pLast->member.para.nCharOfs = 1; + + ME_DestroyContext(&c); + ReleaseDC(editor->hWnd, hDC); } void ME_MarkAllForWrapping(ME_TextEditor *editor) @@ -138,11 +149,6 @@ new_para->member.para.nFlags = MEPF_REWRAP; /* FIXME copy flags (if applicable) */ /* FIXME initialize format style and call ME_SetParaFormat blah blah */ CopyMemory(new_para->member.para.pFmt, run_para->member.para.pFmt, sizeof(PARAFORMAT2)); - - /* FIXME remove this as soon as nLeftMargin etc are replaced with proper fields of PARAFORMAT2 */ - new_para->member.para.nLeftMargin = run_para->member.para.nLeftMargin; - new_para->member.para.nRightMargin = run_para->member.para.nRightMargin; - new_para->member.para.nFirstMargin = run_para->member.para.nFirstMargin; new_para->member.para.bTable = run_para->member.para.bTable; @@ -277,45 +283,67 @@ return ME_FindItemBackOrHere(item, diParagraph); } -static void ME_DumpStyleEffect(char **p, const char *name, const PARAFORMAT2 *fmt, int mask) -{ - *p += sprintf(*p, "%-22s%s\n", name, (fmt->dwMask & mask) ? ((fmt->wEffects & mask) ? "yes" : "no") : "N/A"); -} - void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) { - /* FIXME only PARAFORMAT styles implemented */ char *p; p = buf; - p += sprintf(p, "Alignment: %s\n", - !(pFmt->dwMask & PFM_ALIGNMENT) ? "N/A" : - ((pFmt->wAlignment == PFA_LEFT) ? "left" : - ((pFmt->wAlignment == PFA_RIGHT) ? "right" : - ((pFmt->wAlignment == PFA_CENTER) ? "center" : - /*((pFmt->wAlignment == PFA_JUSTIFY) ? "justify" : "incorrect")*/ - "incorrect")))); - - if (pFmt->dwMask & PFM_OFFSET) - p += sprintf(p, "Offset: %d\n", (int)pFmt->dxOffset); - else - p += sprintf(p, "Offset: N/A\n"); - - if (pFmt->dwMask & PFM_OFFSETINDENT) - p += sprintf(p, "Offset indent: %d\n", (int)pFmt->dxStartIndent); - else - p += sprintf(p, "Offset indent: N/A\n"); - - if (pFmt->dwMask & PFM_STARTINDENT) - p += sprintf(p, "Start indent: %d\n", (int)pFmt->dxStartIndent); - else - p += sprintf(p, "Start indent: N/A\n"); - - if (pFmt->dwMask & PFM_RIGHTINDENT) - p += sprintf(p, "Right indent: %d\n", (int)pFmt->dxRightIndent); - else - p += sprintf(p, "Right indent: N/A\n"); - - ME_DumpStyleEffect(&p, "Page break before:", pFmt, PFM_PAGEBREAKBEFORE); + +#define DUMP(mask, name, fmt, field) \ + if (pFmt->dwMask & (mask)) p += sprintf(p, "%-22s" fmt "\n", name, pFmt->field); \ + else p += sprintf(p, "%-22sN/A\n", name); + +/* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ +#define DUMP_EFFECT(mask, name) \ + p += sprintf(p, "%-22s%s\n", name, (pFmt->dwMask & (mask)) ? ((pFmt->wEffects & ((mask) >> 8)) ? "yes" : "no") : "N/A"); + + DUMP(PFM_NUMBERING, "Numbering:", "%u", wNumbering); + DUMP_EFFECT(PFM_DONOTHYPHEN, "Disable auto-hyphen:"); + DUMP_EFFECT(PFM_KEEP, "No page break in para:"); + DUMP_EFFECT(PFM_KEEPNEXT, "No page break in para & next:"); + DUMP_EFFECT(PFM_NOLINENUMBER, "No line number:"); + DUMP_EFFECT(PFM_NOWIDOWCONTROL, "No widow & orphan:"); + DUMP_EFFECT(PFM_PAGEBREAKBEFORE, "Page break before:"); + DUMP_EFFECT(PFM_RTLPARA, "RTL para:"); + DUMP_EFFECT(PFM_SIDEBYSIDE, "Side by side:"); + DUMP_EFFECT(PFM_TABLE, "Table:"); + DUMP(PFM_OFFSETINDENT, "Offset indent:", "%d", dxStartIndent); + DUMP(PFM_STARTINDENT, "Start indent:", "%d", dxStartIndent); + DUMP(PFM_RIGHTINDENT, "Right indent:", "%d", dxRightIndent); + DUMP(PFM_OFFSET, "Offset:", "%d", dxOffset); + if (pFmt->dwMask & PFM_ALIGNMENT) { + switch (pFmt->wAlignment) { + case PFA_LEFT : p += sprintf(p, "Alignment: left\n"); break; + case PFA_RIGHT : p += sprintf(p, "Alignment: right\n"); break; + case PFA_CENTER : p += sprintf(p, "Alignment: center\n"); break; + case PFA_JUSTIFY: p += sprintf(p, "Alignment: justify\n"); break; + default : p += sprintf(p, "Alignment: incorrect %d\n", pFmt->wAlignment); break; + } + } + else p += sprintf(p, "Alignment: N/A\n"); + DUMP(PFM_TABSTOPS, "Tab Stops:", "%d", cTabCount); + if (pFmt->dwMask & PFM_TABSTOPS) { + int i; + p += sprintf(p, "\t"); + for (i = 0; i < pFmt->cTabCount; i++) p += sprintf(p, "%x ", pFmt->rgxTabs[i]); + p += sprintf(p, "\n"); + } + DUMP(PFM_SPACEBEFORE, "Space Before:", "%d", dySpaceBefore); + DUMP(PFM_SPACEAFTER, "Space After:", "%d", dySpaceAfter); + DUMP(PFM_LINESPACING, "Line spacing:", "%d", dyLineSpacing); + DUMP(PFM_STYLE, "Text style:", "%d", sStyle); + DUMP(PFM_LINESPACING, "Line spacing rule:", "%u", bLineSpacingRule); + /* bOutlineLevel should be 0 */ + DUMP(PFM_SHADING, "Shading Weigth:", "%u", wShadingWeight); + DUMP(PFM_SHADING, "Shading Style:", "%u", wShadingStyle); + DUMP(PFM_NUMBERINGSTART, "Numbering Start:", "%u", wNumberingStart); + DUMP(PFM_NUMBERINGSTYLE, "Numbering Style:", "0x%x", wNumberingStyle); + DUMP(PFM_NUMBERINGTAB, "Numbering Tab:", "%u", wNumberingStyle); + DUMP(PFM_BORDER, "Border Space:", "%u", wBorderSpace); + DUMP(PFM_BORDER, "Border Width:", "%u", wBorderWidth); + DUMP(PFM_BORDER, "Borders:", "%u", wBorders); + +#undef DUMP +#undef DUMP_EFFECT } void ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFORMAT2 *pFmt) @@ -326,22 +354,51 @@ CopyMemory(&copy, para->member.para.pFmt, sizeof(PARAFORMAT2)); - if (pFmt->dwMask & PFM_ALIGNMENT) - para->member.para.pFmt->wAlignment = pFmt->wAlignment; - if (pFmt->dwMask & PFM_STARTINDENT) - para->member.para.pFmt->dxStartIndent = pFmt->dxStartIndent; - if (pFmt->dwMask & PFM_OFFSET) - para->member.para.pFmt->dxOffset = pFmt->dxOffset; +#define COPY_FIELD(m, f) \ + if (pFmt->dwMask & (m)) { \ + para->member.para.pFmt->dwMask |= m; \ + para->member.para.pFmt->f = pFmt->f; \ + } + + COPY_FIELD(PFM_NUMBERING, wNumbering); +#define EFFECTS_MASK (PFM_RTLPARA|PFM_KEEP|PFM_KEEPNEXT|PFM_PAGEBREAKBEFORE| \ + PFM_NOLINENUMBER|PFM_NOWIDOWCONTROL|PFM_DONOTHYPHEN|PFM_SIDEBYSIDE| \ + PFM_TABLE) + /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ + if (pFmt->dwMask & EFFECTS_MASK) { + para->member.para.pFmt->dwMask &= ~(pFmt->dwMask & EFFECTS_MASK); + para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(pFmt->dwMask); + } +#undef EFFECTS_MASK + + COPY_FIELD(PFM_STARTINDENT, dxStartIndent); if (pFmt->dwMask & PFM_OFFSETINDENT) para->member.para.pFmt->dxStartIndent += pFmt->dxStartIndent; - + COPY_FIELD(PFM_RIGHTINDENT, dxRightIndent); + COPY_FIELD(PFM_OFFSET, dxOffset); + COPY_FIELD(PFM_ALIGNMENT, wAlignment); + if (pFmt->dwMask & PFM_TABSTOPS) { para->member.para.pFmt->cTabCount = pFmt->cTabCount; - memcpy(para->member.para.pFmt->rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(int)); - } - - /* FIXME to be continued (indents, bulleting and such) */ + memcpy(para->member.para.pFmt->rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(LONG)); + } + COPY_FIELD(PFM_SPACEBEFORE, dySpaceBefore); + COPY_FIELD(PFM_SPACEAFTER, dySpaceAfter); + COPY_FIELD(PFM_LINESPACING, dyLineSpacing); + COPY_FIELD(PFM_STYLE, sStyle); + COPY_FIELD(PFM_LINESPACING, bLineSpacingRule); + COPY_FIELD(PFM_SHADING, wShadingWeight); + COPY_FIELD(PFM_SHADING, wShadingStyle); + COPY_FIELD(PFM_NUMBERINGSTART, wNumberingStart); + COPY_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); + COPY_FIELD(PFM_NUMBERINGTAB, wNumberingTab); + COPY_FIELD(PFM_BORDER, wBorderSpace); + COPY_FIELD(PFM_BORDER, wBorderWidth); + COPY_FIELD(PFM_BORDER, wBorders); + + para->member.para.pFmt->dwMask |= pFmt->dwMask; +#undef COPY_FIELD if (memcmp(&copy, para->member.para.pFmt, sizeof(PARAFORMAT2))) para->member.para.nFlags |= MEPF_REWRAP; @@ -410,28 +467,45 @@ ZeroMemory(&tmp, sizeof(tmp)); tmp.cbSize = sizeof(tmp); ME_GetParaFormat(editor, para, &tmp); - - assert(tmp.dwMask & PFM_ALIGNMENT); - if (pFmt->wAlignment != tmp.wAlignment) - pFmt->dwMask &= ~PFM_ALIGNMENT; - + +#define CHECK_FIELD(m, f) \ + if (pFmt->f != tmp.f) pFmt->dwMask &= ~(m); + + CHECK_FIELD(PFM_NUMBERING, wNumbering); + /* para->member.para.pFmt->wEffects = pFmt->wEffects; */ + assert(tmp.dwMask & PFM_ALIGNMENT); + CHECK_FIELD(PFM_NUMBERING, wNumbering); assert(tmp.dwMask & PFM_STARTINDENT); - if (pFmt->dxStartIndent != tmp.dxStartIndent) - pFmt->dwMask &= ~PFM_STARTINDENT; - + CHECK_FIELD(PFM_STARTINDENT, dxStartIndent); + assert(tmp.dwMask & PFM_RIGHTINDENT); + CHECK_FIELD(PFM_RIGHTINDENT, dxRightIndent); assert(tmp.dwMask & PFM_OFFSET); - if (pFmt->dxOffset != tmp.dxOffset) - pFmt->dwMask &= ~PFM_OFFSET; - - assert(tmp.dwMask & PFM_TABSTOPS); + CHECK_FIELD(PFM_OFFSET, dxOffset); + CHECK_FIELD(PFM_ALIGNMENT, wAlignment); + + assert(tmp.dwMask & PFM_TABSTOPS); if (pFmt->dwMask & PFM_TABSTOPS) { - if (pFmt->cTabCount != tmp.cTabCount) - pFmt->dwMask &= ~PFM_TABSTOPS; - else - if (memcmp(pFmt->rgxTabs, tmp.rgxTabs, tmp.cTabCount*sizeof(int))) + if (pFmt->cTabCount != tmp.cTabCount || + memcmp(pFmt->rgxTabs, tmp.rgxTabs, tmp.cTabCount*sizeof(int))) pFmt->dwMask &= ~PFM_TABSTOPS; } - + + CHECK_FIELD(PFM_SPACEBEFORE, dySpaceBefore); + CHECK_FIELD(PFM_SPACEAFTER, dySpaceAfter); + CHECK_FIELD(PFM_LINESPACING, dyLineSpacing); + CHECK_FIELD(PFM_STYLE, sStyle); + CHECK_FIELD(PFM_SPACEAFTER, bLineSpacingRule); + CHECK_FIELD(PFM_SHADING, wShadingWeight); + CHECK_FIELD(PFM_SHADING, wShadingStyle); + CHECK_FIELD(PFM_NUMBERINGSTART, wNumberingStart); + CHECK_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); + CHECK_FIELD(PFM_NUMBERINGTAB, wNumberingTab); + CHECK_FIELD(PFM_BORDER, wBorderSpace); + CHECK_FIELD(PFM_BORDER, wBorderWidth); + CHECK_FIELD(PFM_BORDER, wBorders); + +#undef CHECK_FIELD + if (para == para_end) return; para = para->member.para.next_para; Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… ============================================================================== --- trunk/reactos/dll/win32/riched20/reader.c (original) +++ trunk/reactos/dll/win32/riched20/reader.c Mon Jan 14 18:52:45 2008 @@ -76,18 +76,6 @@ /* ---------------------------------------------------------------------- */ -/* - * Memory allocation routines - */ - - -/* - * Return pointer to block of size bytes, or NULL if there's - * not enough memory available. - */ -#define RTFAlloc(size) richedit_alloc(size) -#define RTFReAlloc(ptr, size) richedit_realloc(ptr, size) -#define RTFFree(ptr) richedit_free(ptr) /* * Saves a string on the heap and returns a pointer to it. @@ -96,7 +84,7 @@ { char *p; - p = RTFAlloc (lstrlenA(s) + 1); + p = heap_alloc (lstrlenA(s) + 1); if (p == NULL) return NULL; return lstrcpyA (p, s); @@ -143,14 +131,14 @@ while (info->fontList) { fp = info->fontList->rtfNextFont; - RTFFree (info->fontList->rtfFName); - RTFFree (info->fontList); + heap_free (info->fontList->rtfFName); + heap_free (info->fontList); info->fontList = fp; } while (info->colorList) { cp = info->colorList->rtfNextColor; - RTFFree (info->colorList); + heap_free (info->colorList); info->colorList = cp; } while (info->styleList) @@ -160,12 +148,12 @@ while (eltList) { ep = eltList->rtfNextSE; - RTFFree (eltList->rtfSEText); - RTFFree (eltList); + heap_free (eltList->rtfSEText); + heap_free (eltList); eltList = ep; } - RTFFree (info->styleList->rtfSName); - RTFFree (info->styleList); + heap_free (info->styleList->rtfSName); + heap_free (info->styleList); info->styleList = sp; } } @@ -176,11 +164,11 @@ { if (info->rtfTextBuf) { - RTFFree(info->rtfTextBuf); - RTFFree(info->pushedTextBuf); + heap_free(info->rtfTextBuf); + heap_free(info->pushedTextBuf); } RTFDestroyAttrs(info); - RTFFree(info->cpOutputBuffer); + heap_free(info->cpOutputBuffer); } @@ -196,15 +184,15 @@ if (info->rtfTextBuf == NULL) /* initialize the text buffers */ { - info->rtfTextBuf = RTFAlloc (rtfBufSiz); - info->pushedTextBuf = RTFAlloc (rtfBufSiz); + info->rtfTextBuf = heap_alloc (rtfBufSiz); + info->pushedTextBuf = heap_alloc (rtfBufSiz); if (info->rtfTextBuf == NULL || info->pushedTextBuf == NULL) ERR ("Cannot allocate text buffers.\n"); info->rtfTextBuf[0] = info->pushedTextBuf[0] = '\0'; } - RTFFree (info->inputName); - RTFFree (info->outputName); + heap_free (info->inputName); + heap_free (info->outputName); info->inputName = info->outputName = NULL; for (i = 0; i < rtfMaxClass; i++) @@ -245,7 +233,7 @@ if (!info->cpOutputBuffer) { info->dwMaxCPOutputCount = 0x1000; - info->cpOutputBuffer = RTFAlloc(info->dwMaxCPOutputCount); + info->cpOutputBuffer = heap_alloc(info->dwMaxCPOutputCount); } } @@ -564,7 +552,7 @@ /* FIXME: TranslateCharsetInfo does not work as good as it * should, so let's use it only when all else fails */ if (!TranslateCharsetInfo(&n, &csi, TCI_SRCCHARSET)) - ERR("%s: unknown charset %u\n", __FUNCTION__, charset); + ERR("unknown charset %d\n", charset); else return csi.ciACP; } @@ -2300,9 +2288,9 @@ rp->rtfKHash = Hash (rp->rtfKStr); index = rp->rtfKHash % (RTF_KEY_COUNT * 2); if (!rtfHashTable[index].count) - rtfHashTable[index].value = RTFAlloc(sizeof(RTFKey *)); + rtfHashTable[index].value = heap_alloc(sizeof(RTFKey *)); else - rtfHashTable[index].value = RTFReAlloc(rtfHashTable[index].value, sizeof(RTFKey *) * (rtfHashTable[index].count + 1)); + rtfHashTable[index].value = heap_realloc(rtfHashTable[index].value, sizeof(RTFKey *) * (rtfHashTable[index].count + 1)); rtfHashTable[index].value[rtfHashTable[index].count++] = rp; } } @@ -2313,7 +2301,7 @@ for (i=0; i<RTF_KEY_COUNT*2; i++) { - RTFFree( rtfHashTable[i].value ); + heap_free( rtfHashTable[i].value ); rtfHashTable[i].value = NULL; rtfHashTable[i].count = 0; } @@ -2682,7 +2670,7 @@ RTFFlushCPOutputBuffer(RTF_Info *info) { int bufferMax = info->dwCPOutputCount * 2 * sizeof(WCHAR); - WCHAR *buffer = RTFAlloc(bufferMax); + WCHAR *buffer = heap_alloc(bufferMax); int length; length = MultiByteToWideChar(info->codePage, 0, info->cpOutputBuffer, @@ -2690,7 +2678,7 @@ info->dwCPOutputCount = 0; RTFPutUnicodeString(info, buffer, length); - RTFFree((char *)buffer); + heap_free((char *)buffer); } void @@ -2719,7 +2707,7 @@ if (info->dwCPOutputCount >= info->dwMaxCPOutputCount) { info->dwMaxCPOutputCount *= 2; - info->cpOutputBuffer = RTFReAlloc(info->cpOutputBuffer, info->dwMaxCPOutputCount); + info->cpOutputBuffer = heap_realloc(info->cpOutputBuffer, info->dwMaxCPOutputCount); } info->cpOutputBuffer[info->dwCPOutputCount++] = c; } Added: trunk/reactos/dll/win32/riched20/res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/res.h?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/res.h (added) +++ trunk/reactos/dll/win32/riched20/res.h Mon Jan 14 18:52:45 2008 @@ -1,0 +1,21 @@ +/* + * Top level resource file for MOUSE driver dll + * + * Copyright 2007 Maarten Lankhorst for CodeWeavers + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define OCR_REVERSE 32768 Propchange: trunk/reactos/dll/win32/riched20/res.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/riched2… ============================================================================== --- trunk/reactos/dll/win32/riched20/riched20.rbuild (original) +++ trunk/reactos/dll/win32/riched20/riched20.rbuild Mon Jan 14 18:52:45 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true"> <importlibrary definition="riched20.spec.def" /> <include base="riched20">.</include> @@ -35,3 +36,4 @@ <file>version.rc</file> <file>riched20.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/richole… ============================================================================== --- trunk/reactos/dll/win32/riched20/richole.c (original) +++ trunk/reactos/dll/win32/riched20/richole.c Mon Jan 14 18:52:45 2008 @@ -112,7 +112,7 @@ if (!ref) { TRACE ("Destroying %p\n", This); - richedit_free(This); + heap_free(This); } return ref; } @@ -529,7 +529,7 @@ { IRichEditOleImpl *reo; - reo = richedit_alloc(sizeof(IRichEditOleImpl)); + reo = heap_alloc(sizeof(IRichEditOleImpl)); if (!reo) return 0; Modified: trunk/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/rtf.h?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/rtf.h (original) +++ trunk/reactos/dll/win32/riched20/rtf.h Mon Jan 14 18:52:45 2008 @@ -36,7 +36,7 @@ * that only care about gross token distinctions. * Major/minor numbers: Within their class, tokens have a major * number, and may also have a minor number to further - * distinquish tokens with the same major number. + * distinguish tokens with the same major number. * * *** Class, major and minor token numbers are all >= 0 *** * @@ -1005,7 +1005,7 @@ * if no memory available. */ -# define New(t) ((t *) RTFAlloc ((int) sizeof (t))) +# define New(t) (heap_alloc (sizeof (t))) /* Parser stack size */ Modified: trunk/reactos/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/run.c?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/run.c (original) +++ trunk/reactos/dll/win32/riched20/run.c Mon Jan 14 18:52:45 2008 @@ -487,11 +487,10 @@ * pixel horizontal position. This version rounds left (ie. if the second * character is at pixel position 8, then for cx=0..7 it returns 0). */ -int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run) +int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run) { int fit = 0; HGDIOBJ hOldFont; - HDC hDC; SIZE sz; if (!run->strText->nLen) return 0; @@ -505,29 +504,28 @@ if (run->nFlags & MERF_GRAPHICS) { SIZE sz; - ME_GetGraphicsSize(editor, run, &sz); + ME_GetGraphicsSize(c->editor, run, &sz); if (cx < sz.cx) return 0; return 1; } - hDC = GetDC(editor->hWnd); - hOldFont = ME_SelectStyleFont(editor, hDC, run->style); - - if (editor->cPasswordMask) - { - ME_String *strMasked = ME_MakeStringR(editor->cPasswordMask,ME_StrVLen(run->strText)); - GetTextExtentExPointW(hDC, strMasked->szData, run->strText->nLen, + hOldFont = ME_SelectStyleFont(c, run->style); + + if (c->editor->cPasswordMask) + { + ME_String *strMasked = ME_MakeStringR(c->editor->cPasswordMask,ME_StrVLen(run->strText)); + GetTextExtentExPointW(c->hDC, strMasked->szData, run->strText->nLen, cx, &fit, NULL, &sz); ME_DestroyString(strMasked); } else { - GetTextExtentExPointW(hDC, run->strText->szData, run->strText->nLen, + GetTextExtentExPointW(c->hDC, run->strText->szData, run->strText->nLen, cx, &fit, NULL, &sz); } - ME_UnselectStyleFont(editor, hDC, run->style, hOldFont); - ReleaseDC(editor->hWnd, hDC); + ME_UnselectStyleFont(c, run->style, hOldFont); + return fit; } @@ -548,8 +546,8 @@ /* This could point to either the run's real text, or it's masked form in a password control */ int fit = 0, fit1 = 0; + ME_Context c; HGDIOBJ hOldFont; - HDC hDC; SIZE sz, sz2, sz3; if (!run->strText->nLen) return 0; @@ -574,17 +572,17 @@ else strRunText = run->strText; - hDC = GetDC(editor->hWnd); - hOldFont = ME_SelectStyleFont(editor, hDC, run->style); - GetTextExtentExPointW(hDC, strRunText->szData, strRunText->nLen, - cx, &fit, NULL, &sz); + ME_InitContext(&c, editor, GetDC(editor->hWnd)); + hOldFont = ME_SelectStyleFont(&c, run->style); + GetTextExtentExPointW(c.hDC, strRunText->szData, strRunText->nLen, + cx, &fit, NULL, &sz); if (fit != strRunText->nLen) { int chars = 1; - GetTextExtentPoint32W(hDC, strRunText->szData, fit, &sz2); + GetTextExtentPoint32W(c.hDC, strRunText->szData, fit, &sz2); fit1 = ME_StrRelPos(strRunText, fit, &chars); - GetTextExtentPoint32W(hDC, strRunText->szData, fit1, &sz3); + GetTextExtentPoint32W(c.hDC, strRunText->szData, fit1, &sz3); if (cx >= (sz2.cx+sz3.cx)/2) fit = fit1; } @@ -592,44 +590,9 @@ if (editor->cPasswordMask) ME_DestroyString(strRunText); - ME_UnselectStyleFont(editor, hDC, run->style, hOldFont); - ReleaseDC(editor->hWnd, hDC); + ME_UnselectStyleFont(&c, run->style, hOldFont); + ReleaseDC(editor->hWnd, c.hDC); return fit; -} - -/****************************************************************************** - * ME_PointFromChar - * - * Returns a run-relative pixel position given a run-relative character - * position (character offset) - */ -int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) -{ - SIZE size; - HDC hDC = GetDC(editor->hWnd); - HGDIOBJ hOldFont; - ME_String *strRunText; - /* This could point to either the run's real text, or it's masked form in a password control */ - - if (pRun->nFlags & MERF_GRAPHICS) - { - if (!nOffset) return 0; - ME_GetGraphicsSize(editor, pRun, &size); - return 1; - } - - if (editor->cPasswordMask) - strRunText = ME_MakeStringR(editor->cPasswordMask,ME_StrVLen(pRun->strText)); - else - strRunText = pRun->strText; - - hOldFont = ME_SelectStyleFont(editor, hDC, pRun->style); - GetTextExtentPoint32W(hDC, strRunText->szData, nOffset, &size); - ME_UnselectStyleFont(editor, hDC, pRun->style, hOldFont); - ReleaseDC(editor->hWnd, hDC); - if (editor->cPasswordMask) - ME_DestroyString(strRunText); - return size.cx; } /****************************************************************************** @@ -639,11 +602,43 @@ */ static void ME_GetTextExtent(ME_Context *c, LPCWSTR szText, int nChars, ME_Style *s, SIZE *size) { - HDC hDC = c->hDC; HGDIOBJ hOldFont; - hOldFont = ME_SelectStyleFont(c->editor, hDC, s); - GetTextExtentPoint32W(hDC, szText, nChars, size); - ME_UnselectStyleFont(c->editor, hDC, s, hOldFont); + hOldFont = ME_SelectStyleFont(c, s); + GetTextExtentPoint32W(c->hDC, szText, nChars, size); + ME_UnselectStyleFont(c, s, hOldFont); +} + +/****************************************************************************** + * ME_PointFromChar + * + * Returns a run-relative pixel position given a run-relative character + * position (character offset) + */ +int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) +{ + SIZE size; + ME_Context c; + ME_String *strRunText; + /* This could point to either the run's real text, or it's masked form in a password control */ + + if (pRun->nFlags & MERF_GRAPHICS) + { + if (!nOffset) return 0; + ME_GetGraphicsSize(editor, pRun, &size); + return 1; + } + + if (editor->cPasswordMask) + strRunText = ME_MakeStringR(editor->cPasswordMask,ME_StrVLen(pRun->strText)); + else + strRunText = pRun->strText; + + ME_InitContext(&c, editor, GetDC(editor->hWnd)); + ME_GetTextExtent(&c, strRunText->szData, nOffset, pRun->style, &size); + ReleaseDC(editor->hWnd, c.hDC); + if (editor->cPasswordMask) + ME_DestroyString(strRunText); + return size.cx; } /****************************************************************************** @@ -683,7 +678,7 @@ if (run->nFlags & MERF_TAB) { int pos = 0, i = 0, ppos; - int lpsx = GetDeviceCaps(c->hDC, LOGPIXELSX); + PARAFORMAT2 *pFmt = para->pFmt; do { if (i < pFmt->cTabCount) @@ -695,7 +690,7 @@ { pos += 720-(pos%720); } - ppos = pos*lpsx/1440; + ppos = ME_twips2pointsX(c, pos); if (ppos>run->pt.x) { size.cx = ppos - run->pt.x; break; @@ -714,9 +709,7 @@ } if (run->nFlags & MERF_CELL) { - int lpsx = GetDeviceCaps(c->hDC, LOGPIXELSX); - - size.cx = run->pCell->nRightBoundary * lpsx / 1440 - run->pt.x; + size.cx = ME_twips2pointsX(c, run->pCell->nRightBoundary) - run->pt.x; return size; } return size; @@ -938,8 +931,8 @@ do { /* FIXME add more style feature comparisons */ - int nAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR; - int nEffects = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE; + int nAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR | CFM_UNDERLINETYPE; + int nEffects = CFM_BOLD | CFM_ITALIC; run = ME_FindItemFwd(run, diRun); @@ -957,11 +950,14 @@ { if (!(tmp.dwMask & CFM_FACE)) pFmt->dwMask &= ~CFM_FACE; - else if (lstrcmpW(pFmt->szFaceName, tmp.szFaceName)) + else if (lstrcmpW(pFmt->szFaceName, tmp.szFaceName) || + pFmt->bPitchAndFamily != tmp.bPitchAndFamily) pFmt->dwMask &= ~CFM_FACE; } if (pFmt->yHeight != tmp.yHeight) pFmt->dwMask &= ~CFM_SIZE; + if (pFmt->bUnderlineType != tmp.bUnderlineType) + pFmt->dwMask &= ~CFM_UNDERLINETYPE; if (pFmt->dwMask & CFM_COLOR) { if (!((pFmt->dwEffects&CFE_AUTOCOLOR) & (tmp.dwEffects&CFE_AUTOCOLOR))) Modified: trunk/reactos/dll/win32/riched20/style.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/style.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/style.c (original) +++ trunk/reactos/dll/win32/riched20/style.c Mon Jan 14 18:52:45 2008 @@ -25,12 +25,20 @@ static int all_refs = 0; +/* the following routines assume that: + * - char2[AW] extends char[AW] by adding fields at the end of the charA form) + * - szFaceName is the last field of char[AW] form, and wWeight the first of 2[AW] + * - the difference between A and W form is the szFaceName as Ansi vs Unicode string + * - because of alignment, offset of wWeight field in 2[AW] structure *IS NOT* + * sizeof(char[AW]) + */ + CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) { if (from->cbSize == sizeof(CHARFORMATA)) { CHARFORMATA *f = (CHARFORMATA *)from; - CopyMemory(to, f, sizeof(*f)-sizeof(f->szFaceName)); + CopyMemory(to, f, FIELD_OFFSET(CHARFORMATA, szFaceName)); to->cbSize = sizeof(CHARFORMAT2W); if (f->dwMask & CFM_FACE) { MultiByteToWideChar(0, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); @@ -42,20 +50,20 @@ CHARFORMATW *f = (CHARFORMATW *)from; CopyMemory(to, f, sizeof(*f)); /* theoretically, we don't need to zero the remaining memory */ - ZeroMemory(((CHARFORMATW *)to)+1, sizeof(CHARFORMAT2W)-sizeof(CHARFORMATW)); + ZeroMemory(&to->wWeight, sizeof(CHARFORMAT2W)-FIELD_OFFSET(CHARFORMAT2W, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); return to; } if (from->cbSize == sizeof(CHARFORMAT2A)) { - CHARFORMATA *f = (CHARFORMATA *)from; + CHARFORMAT2A *f = (CHARFORMAT2A *)from; /* copy the A structure without face name */ - CopyMemory(to, f, sizeof(CHARFORMATA)-sizeof(f->szFaceName)); + CopyMemory(to, f, FIELD_OFFSET(CHARFORMATA, szFaceName)); /* convert face name */ if (f->dwMask & CFM_FACE) MultiByteToWideChar(0, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); /* copy the rest of the 2A structure to 2W */ - CopyMemory(1+((CHARFORMATW *)to), f+1, sizeof(CHARFORMAT2A)-sizeof(CHARFORMATA)); + CopyMemory(&to->wWeight, &f->wWeight, sizeof(CHARFORMAT2A)-FIELD_OFFSET(CHARFORMAT2A, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); return to; } @@ -75,8 +83,22 @@ if (to->cbSize == sizeof(CHARFORMATA)) { CHARFORMATA *t = (CHARFORMATA *)to; - CopyMemory(t, from, sizeof(*t)-sizeof(t->szFaceName)); + CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); WideCharToMultiByte(0, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), 0, 0); + if (from->dwMask & CFM_UNDERLINETYPE) + { + switch (from->bUnderlineType) + { + case CFU_CF1UNDERLINE: + to->dwMask |= CFM_UNDERLINE; + to->dwEffects |= CFE_UNDERLINE; + break; + case CFU_UNDERLINENONE: + to->dwMask |= CFM_UNDERLINE; + to->dwEffects &= ~CFE_UNDERLINE; + break; + } + } t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ return to; } @@ -84,6 +106,20 @@ { CHARFORMATW *t = (CHARFORMATW *)to; CopyMemory(t, from, sizeof(*t)); + if (from->dwMask & CFM_UNDERLINETYPE) + { + switch (from->bUnderlineType) + { + case CFU_CF1UNDERLINE: + to->dwMask |= CFM_UNDERLINE; + to->dwEffects |= CFE_UNDERLINE; + break; + case CFU_UNDERLINENONE: + to->dwMask |= CFM_UNDERLINE; + to->dwEffects &= ~CFE_UNDERLINE; + break; + } + } t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ return to; } @@ -91,15 +127,15 @@ { CHARFORMAT2A *t = (CHARFORMAT2A *)to; /* copy the A structure without face name */ - CopyMemory(t, from, sizeof(CHARFORMATA)-sizeof(t->szFaceName)); + CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); /* convert face name */ WideCharToMultiByte(0, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), 0, 0); /* copy the rest of the 2A structure to 2W */ - CopyMemory(&t->wWeight, &from->wWeight, sizeof(CHARFORMAT2A)-sizeof(CHARFORMATA)); + CopyMemory(&t->wWeight, &from->wWeight, sizeof(CHARFORMAT2W)-FIELD_OFFSET(CHARFORMAT2W,wWeight)); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ return to; } - assert(to->cbSize >= sizeof(CHARFORMAT2W)); + assert(to->cbSize >= sizeof(CHARFORMAT2W)); return from; } @@ -166,7 +202,9 @@ COPY_STYLE_ITEM(CFM_STYLE, sStyle); COPY_STYLE_ITEM(CFM_UNDERLINETYPE, bUnderlineType); COPY_STYLE_ITEM(CFM_WEIGHT, wWeight); - + /* FIXME: this is not documented this way, but that's the more logical */ + COPY_STYLE_ITEM(CFM_FACE, bPitchAndFamily); + s->fmt.dwEffects &= ~(style->dwMask); s->fmt.dwEffects |= style->dwEffects & style->dwMask; s->fmt.dwMask |= style->dwMask; @@ -176,6 +214,13 @@ s->fmt.dwEffects |= CFE_AUTOCOLOR; else s->fmt.dwEffects &= ~CFE_AUTOCOLOR; + } + if (style->dwMask & CFM_UNDERLINE) + { + s->fmt.dwMask |= CFM_UNDERLINETYPE; + s->fmt.dwMask &= ~CFM_UNDERLINE; + s->fmt.bUnderlineType = (style->dwEffects & CFM_UNDERLINE) ? + CFU_CF1UNDERLINE : CFU_UNDERLINENONE; } return s; } @@ -252,37 +297,33 @@ static void -ME_LogFontFromStyle(HDC hDC, LOGFONTW *lf, const ME_Style *s, int nZoomNumerator, int nZoomDenominator) -{ - int rx, ry; - rx = GetDeviceCaps(hDC, LOGPIXELSX); - ry = GetDeviceCaps(hDC, LOGPIXELSY); +ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s) +{ ZeroMemory(lf, sizeof(LOGFONTW)); lstrcpyW(lf->lfFaceName, s->fmt.szFaceName); - if (nZoomNumerator == 0) - { - nZoomNumerator = 1; - nZoomDenominator = 1; - } - lf->lfHeight = -s->fmt.yHeight*ry*nZoomNumerator/nZoomDenominator/1440; + lf->lfHeight = ME_twips2pointsY(c, -s->fmt.yHeight); lf->lfWeight = 400; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_BOLD) lf->lfWeight = 700; - if (s->fmt.dwEffects & s->fmt.dwMask & CFM_WEIGHT) + if (s->fmt.dwMask & CFM_WEIGHT) lf->lfWeight = s->fmt.wWeight; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_ITALIC) lf->lfItalic = 1; if (s->fmt.dwEffects & s->fmt.dwMask & (CFM_UNDERLINE | CFE_LINK)) + lf->lfUnderline = 1; + if (s->fmt.dwMask & CFM_UNDERLINETYPE && s->fmt.bUnderlineType == CFU_CF1UNDERLINE) lf->lfUnderline = 1; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_STRIKEOUT) lf->lfStrikeOut = 1; if (s->fmt.dwEffects & s->fmt.dwMask & (CFM_SUBSCRIPT|CFM_SUPERSCRIPT)) lf->lfHeight = (lf->lfHeight*2)/3; /*lf.lfQuality = PROOF_QUALITY; */ - lf->lfPitchAndFamily = s->fmt.bPitchAndFamily; - lf->lfCharSet = s->fmt.bCharSet; + if (s->fmt.dwMask & CFM_FACE) + lf->lfPitchAndFamily = s->fmt.bPitchAndFamily; + if (s->fmt.dwMask & CFM_CHARSET) + lf->lfCharSet = s->fmt.bCharSet; } void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt) @@ -316,22 +357,22 @@ return TRUE; } -HFONT ME_SelectStyleFont(ME_TextEditor *editor, HDC hDC, ME_Style *s) +HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) { HFONT hOldFont; LOGFONTW lf; int i, nEmpty, nAge = 0x7FFFFFFF; ME_FontCacheItem *item; - assert(hDC); + assert(c->hDC); assert(s); - ME_LogFontFromStyle(hDC, &lf, s, editor->nZoomNumerator, editor->nZoomDenominator); + ME_LogFontFromStyle(c, &lf, s); for (i=0; i<HFONT_CACHE_SIZE; i++) - editor->pFontCache[i].nAge++; + c->editor->pFontCache[i].nAge++; for (i=0, nEmpty=-1, nAge=0; i<HFONT_CACHE_SIZE; i++) { - item = &editor->pFontCache[i]; + item = &c->editor->pFontCache[i]; if (!item->nRefs) { if (item->nAge > nAge) @@ -342,7 +383,7 @@ } if (i < HFONT_CACHE_SIZE) /* found */ { - item = &editor->pFontCache[i]; + item = &c->editor->pFontCache[i]; TRACE_(richedit_style)("font reused %d\n", i); s->hFont = item->hFont; @@ -350,7 +391,7 @@ } else { - item = &editor->pFontCache[nEmpty]; /* this legal even when nEmpty == -1, as we don't dereference it */ + item = &c->editor->pFontCache[nEmpty]; /* this legal even when nEmpty == -1, as we don't dereference it */ assert(nEmpty != -1); /* otherwise we leak cache entries or get too many fonts at once*/ if (item->hFont) { @@ -365,22 +406,22 @@ item->nRefs = 1; memcpy(&item->lfSpecs, &lf, sizeof(LOGFONTW)); } - hOldFont = SelectObject(hDC, s->hFont); + hOldFont = SelectObject(c->hDC, s->hFont); /* should be cached too, maybe ? */ - GetTextMetricsW(hDC, &s->tm); + GetTextMetricsW(c->hDC, &s->tm); return hOldFont; } -void ME_UnselectStyleFont(ME_TextEditor *editor, HDC hDC, ME_Style *s, HFONT hOldFont) +void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) { int i; - assert(hDC); + assert(c->hDC); assert(s); - SelectObject(hDC, hOldFont); + SelectObject(c->hDC, hOldFont); for (i=0; i<HFONT_CACHE_SIZE; i++) { - ME_FontCacheItem *pItem = &editor->pFontCache[i]; + ME_FontCacheItem *pItem = &c->editor->pFontCache[i]; if (pItem->hFont == s->hFont && pItem->nRefs > 0) { pItem->nRefs--; Modified: trunk/reactos/dll/win32/riched20/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/version… ============================================================================== --- trunk/reactos/dll/win32/riched20/version.rc (original) +++ trunk/reactos/dll/win32/riched20/version.rc Mon Jan 14 18:52:45 2008 @@ -24,3 +24,7 @@ #define WINE_PRODUCTVERSION_STR "5,30,23,1215" #include "wine/wine_common_ver.rc" + +#include "res.h" + +OCR_REVERSE CURSOR ocr_reverse.cur Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/wrap.c (original) +++ trunk/reactos/dll/win32/riched20/wrap.c Mon Jan 14 18:52:45 2008 @@ -32,7 +32,7 @@ * - no tabs */ -ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) +static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) { ME_DisplayItem *item = ME_MakeDI(diStartRow); @@ -51,7 +51,7 @@ wc->pt.x = 0; } -void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) +static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) { ME_DisplayItem *p, *row, *para; int ascent = 0, descent = 0, width=0, shift = 0, align = 0; @@ -168,7 +168,7 @@ int i, idesp, len; ME_Run *run = &p->member.run; - idesp = i = ME_CharFromPoint(wc->context->editor, loc, run); + idesp = i = ME_CharFromPoint(wc->context, loc, run); len = ME_StrVLen(run->strText); assert(len>0); assert(i<len); @@ -336,10 +336,13 @@ return p->next; } -void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { +static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp); + +static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD beginofs) { ME_DisplayItem *p; ME_WrapContext wc; - int dpi = GetDeviceCaps(c->hDC, LOGPIXELSX); + int border = 0; + int linespace = 0; assert(tp->type == diParagraph); if (!(tp->member.para.nFlags & MEPF_REWRAP)) { @@ -350,36 +353,56 @@ wc.context = c; /* wc.para_style = tp->member.para.style; */ wc.style = NULL; - tp->member.para.nRightMargin = tp->member.para.pFmt->dxRightIndent*dpi/1440; - tp->member.para.nFirstMargin = tp->member.para.pFmt->dxStartIndent*dpi/1440; - tp->member.para.nLeftMargin = (tp->member.para.pFmt->dxStartIndent+tp->member.para.pFmt->dxOffset)*dpi/1440; - wc.nFirstMargin = tp->member.para.nFirstMargin; - wc.nLeftMargin = tp->member.para.nLeftMargin; - wc.nRightMargin = tp->member.para.nRightMargin; + wc.nFirstMargin = ME_twips2pointsX(c, tp->member.para.pFmt->dxStartIndent) + beginofs; + wc.nLeftMargin = wc.nFirstMargin + ME_twips2pointsX(c, tp->member.para.pFmt->dxOffset) + beginofs; + wc.nRightMargin = ME_twips2pointsX(c, tp->member.para.pFmt->dxRightIndent); wc.nRow = 0; wc.pt.x = 0; wc.pt.y = 0; + if (tp->member.para.pFmt->dwMask & PFM_SPACEBEFORE) + wc.pt.y += ME_twips2pointsY(c, tp->member.para.pFmt->dySpaceBefore); + if (tp->member.para.pFmt->dwMask & PFM_BORDER) + { + border = ME_GetParaBorderWidth(c->editor, tp->member.para.pFmt->wBorders); + if (tp->member.para.pFmt->wBorders & 1) { + wc.nFirstMargin += border; + wc.nLeftMargin += border; + } + if (tp->member.para.pFmt->wBorders & 2) + wc.nRightMargin -= border; + if (tp->member.para.pFmt->wBorders & 4) + wc.pt.y += border; + } + wc.nTotalWidth = c->rcView.right - c->rcView.left; wc.nAvailWidth = wc.nTotalWidth - wc.nFirstMargin - wc.nRightMargin; wc.pRowStart = NULL; + + linespace = ME_GetParaLineSpace(c, &tp->member.para); ME_BeginRow(&wc); for (p = tp->next; p!=tp->member.para.next_para; ) { assert(p->type != diStartRow); if (p->type == diRun) { p = ME_WrapHandleRun(&wc, p); - continue; - } - p = p->next; + } + else p = p->next; + if (wc.nRow && p == wc.pRowStart) + wc.pt.y += linespace; } ME_WrapEndParagraph(&wc, p); + if ((tp->member.para.pFmt->dwMask & PFM_BORDER) && (tp->member.para.pFmt->wBorders & 8)) + wc.pt.y += border; + if (tp->member.para.pFmt->dwMask & PFM_SPACEAFTER) + wc.pt.y += ME_twips2pointsY(c, tp->member.para.pFmt->dySpaceAfter); + tp->member.para.nFlags &= ~MEPF_REWRAP; tp->member.para.nHeight = wc.pt.y; tp->member.para.nRows = wc.nRow; } -void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { +static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { ME_DisplayItem *p, *pRow; /* remove all items that will be reinserted by paragraph wrapper anyway */ @@ -441,7 +464,7 @@ bRedraw = TRUE; item->member.para.nYPos = c.pt.y; - ME_WrapTextParagraph(&c, item); + ME_WrapTextParagraph(&c, item, editor->selofs); if (bRedraw) { @@ -519,9 +542,11 @@ info.nmhdr.code = EN_REQUESTRESIZE; info.rc = rc; info.rc.bottom = editor->nTotalLength; - + + editor->nEventMask &= ~ENM_REQUESTRESIZE; SendMessageW(GetParent(editor->hWnd), WM_NOTIFY, info.nmhdr.idFrom, (LPARAM)&info); - } - } -} + editor->nEventMask |= ENM_REQUESTRESIZE; + } + } +}

1 0

[winesync] 31788: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 18:50:17 2008 New Revision: 31788 URL: http://svn.reactos.org/svn/reactos?rev=31788&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc (with props) Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c trunk/reactos/dll/win32/oledlg/oledlg.rbuild trunk/reactos/dll/win32/oledlg/pastespl.c trunk/reactos/dll/win32/oledlg/rsrc.rc Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/insobjdlg… ============================================================================== --- trunk/reactos/dll/win32/oledlg/insobjdlg.c (original) +++ trunk/reactos/dll/win32/oledlg/insobjdlg.c Mon Jan 14 18:50:17 2008 @@ -332,38 +332,39 @@ */ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo) { + static const WCHAR szClsid[] = {'C','L','S','I','D',0}; + static const WCHAR szInsertable[] = {'I','n','s','e','r','t','a','b','l','e',0}; + static const WCHAR szNotInsertable[] = {'N','o','t','I','n','s','e','r','t','a','b','l','e',0}; DWORD i; LONG len; HKEY hkclsids; HKEY hkey; CLSID clsid; HRESULT ret; - CHAR szclsid[128]; - CHAR keydesc[MAX_PATH]; - CHAR keyname[MAX_PATH]; - WCHAR wszclsid[128]; + WCHAR keydesc[MAX_PATH]; + WCHAR keyname[MAX_PATH]; + WCHAR szclsid[128]; DWORD index = 0; UIINSERTOBJECTDLG_FreeObjectTypes(pdlgInfo); - RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &hkclsids); - - while (ERROR_SUCCESS == (ret = RegEnumKeyA(hkclsids, index, szclsid, MAX_PATH))) + RegOpenKeyExW(HKEY_CLASSES_ROOT, szClsid, 0, KEY_READ, &hkclsids); + + while (ERROR_SUCCESS == (ret = RegEnumKeyW(hkclsids, index, szclsid, sizeof(szclsid)/sizeof(szclsid[0])))) { index++; - RegOpenKeyExA(hkclsids, szclsid, 0, KEY_READ, &hkey); - - len = MAX_PATH; - if (ERROR_SUCCESS != RegQueryValueA(hkey, "Insertable", keyname, &len)) + RegOpenKeyExW(hkclsids, szclsid, 0, KEY_READ, &hkey); + + len = sizeof(keyname); + if (ERROR_SUCCESS != RegQueryValueW(hkey, szInsertable, keyname, &len)) continue; - len = MAX_PATH; - if (ERROR_SUCCESS == RegQueryValueA(hkey, "NotInsertable", keyname, &len)) + len = sizeof(keyname); + if (ERROR_SUCCESS == RegQueryValueW(hkey, szNotInsertable, keyname, &len)) continue; - RtlMultiByteToUnicodeN(wszclsid, MAX_PATH, NULL, szclsid, MAX_PATH); - CLSIDFromString(wszclsid, &clsid); + CLSIDFromString(szclsid, &clsid); for (i = 0; i < pdlgInfo->lpOleUIInsertObject->cClsidExclude; i++) if (IsEqualGUID(&pdlgInfo->lpOleUIInsertObject->lpClsidExclude[i], &clsid)) @@ -372,14 +373,14 @@ if (i < pdlgInfo->lpOleUIInsertObject->cClsidExclude) continue; - len = MAX_PATH; - if (ERROR_SUCCESS == RegQueryValueA(hkey, NULL, keydesc, &len)) + len = sizeof(keydesc); + if (ERROR_SUCCESS == RegQueryValueW(hkey, NULL, keydesc, &len)) { CLSID* lpclsid = HeapAlloc(GetProcessHeap(), 0, sizeof(CLSID)); memcpy(lpclsid, &clsid, sizeof(CLSID)); - len = SendMessageA(pdlgInfo->hwndObjTypeLB, LB_ADDSTRING, 0, (LPARAM)keydesc); - SendMessageA(pdlgInfo->hwndObjTypeLB, LB_SETITEMDATA, (WPARAM)len, (LPARAM)lpclsid); + len = SendMessageW(pdlgInfo->hwndObjTypeLB, LB_ADDSTRING, 0, (LPARAM)keydesc); + SendMessageW(pdlgInfo->hwndObjTypeLB, LB_SETITEMDATA, (WPARAM)len, (LPARAM)lpclsid); } } @@ -471,17 +472,15 @@ } else if (BST_CHECKED == SendMessageA(pdlgInfo->hwndCreateFromFileCB, BM_GETCHECK, 0, 0)) { - char fname[MAX_PATH]; - if (pdlgInfo->lpOleUIInsertObject->lpszFile) { HRESULT hres; WCHAR wcsFile[MAX_PATH]; - SendMessageA(pdlgInfo->hwndFileTB, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)fname); - lstrcpynA(pdlgInfo->lpOleUIInsertObject->lpszFile, fname, pdlgInfo->lpOleUIInsertObject->cchFile); - - RtlMultiByteToUnicodeN(wcsFile, MAX_PATH, NULL, fname, MAX_PATH); + if (SendMessageW(pdlgInfo->hwndFileTB, WM_GETTEXT, MAX_PATH, (LPARAM)wcsFile)) + WideCharToMultiByte(CP_ACP, 0, wcsFile, -1, + pdlgInfo->lpOleUIInsertObject->lpszFile, pdlgInfo->lpOleUIInsertObject->cchFile, NULL, NULL); + if (ERROR_SUCCESS == (hres = GetClassFile(wcsFile, &pdlgInfo->lpOleUIInsertObject->clsid))) { if (pdlgInfo->lpOleUIInsertObject->dwFlags & IOF_CREATEFILEOBJECT) Modified: trunk/reactos/dll/win32/oledlg/oledlg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg.rb… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg.rbuild (original) +++ trunk/reactos/dll/win32/oledlg/oledlg.rbuild Mon Jan 14 18:50:17 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="oledlg" type="win32dll" baseaddress="${BASEADDRESS_OLEDLG}" installbase="system32" installname="oledlg.dll" allowwarnings="true"> <importlibrary definition="oledlg.spec.def" /> <include base="oledlg">.</include> @@ -20,3 +21,4 @@ <file>rsrc.rc</file> <file>oledlg.spec</file> </module> +</group> Added: trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ru… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc (added) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc Mon Jan 14 18:50:17 2008 @@ -1,0 +1,95 @@ +/* + * Copyright 2007 Vitaly Lipatov for Etersoft + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Âñòàâèòü îáúåêò" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Òèï îáúåêòà:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Îòìåíà",IDCANCEL,221,24,66,14 + GROUPBOX "Ðåçóëüòàò",IDC_RESULT,7,103,208,41 + CONTROL "Ñîçäàòü íîâûé",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Ñîçäàòü ýëåìåíò óïðàâëåíèÿ",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Ñîçäàòü èç ôàéëà",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Äîáàâèòü ýëåìåíò óïðàâëåíèÿ...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Display As Icon",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Âûáðàòü...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Ôàéë:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Äîáàâëåíèå íîâîãî îáúåêòà %s â äîêóìåíò" + IDS_RESULTFILEOBJDESC "Äîáàâëåíèå îáúåêòà èç ôàéëà â äîêóìåíò. Ðàáîòàòü ñ îáúåêòîì ìîæíî áóäåò â ñîçäàâøåé åãî ïðîãðàììå." + IDS_BROWSE "Ïðîñìîòð" + IDS_NOTOLEMOD "Ôàéë íå ÿâëÿåòñÿ êîððåêòíûì ìîäóëåì OLE. Íåâîçìîæíî çàðåãèñòðèðîâàòü ýëåìåíò óïðàâëåíèÿ OLE." + IDS_NOTOLEMODCAPTION "Äîáàâèòü ýëåìåíò óïðàâëåíèÿ" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ñïåöèàëüíàÿ âñòàâêà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Èñòî÷íèê:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "&Âñòàâèòü", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Âñòàâèòü &Ññûëêó", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Êàê:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Îòìåíà", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "Ñ&ïðàâêà", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Ïîêàçûâàòü êàê çíà÷îê", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "Èçìåíèòü &çíà÷îê...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Ðåçóëüòàò", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Âñòàâêà ñîäåðæèìîãî áóôåðà îáìåíà â äîêóìåíò êàê %s." + IDS_PS_PASTE_OBJECT "Âñòàâêà ñîäåðæèìîãî áóôåðà îáìåíà â äîêóìåíò òàê, ÷òî åãî ìîæíî àêòèâèðîâàòü, èñïîëüçóÿ %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Âñòàâêà ñîäåðæèìîãî áóôåðà îáìåíà â äîêóìåíò òàê, ÷òî åãî ìîæíî àêòèâèðîâàòü, èñïîëüçóÿ %s. Îí áóäåò îòîáðàæàòüñÿ â âèäå çíà÷êà." + IDS_PS_PASTE_LINK_DATA "Âñòàâêà ñîäåðæèìîãî áóôåðà îáìåíà â äîêóìåíò êàê %s. Äàííûå áóäóò ñâÿçàíû ñ èñõîäíûì ôàéëîì, òàê ÷òî èçìåíåíèÿ â í¸ì áóäóò îòðàæàòüñÿ â äîêóìåíòå." + IDS_PS_PASTE_LINK_OBJECT "Âñòàâêà èçîáðàæåíèÿ èç áóôåðà îáìåíà â äîêóìåíò. Èçáðàæåíèå áóäåò ñâÿçàíî ñ èñõîäíûì ôàéëîì, òàê ÷òî èçìåíåíèÿ â í¸ì áóäóò îòðàæàòüñÿ â äîêóìåíòå." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Âñòàâêà ññûëêè, êîòîðàÿ áóäåò óêàçûâàòü íà ðàñïîëîæåíèå ñîäåðæèìîãî áóôåðà îáìåíà. Ññûëêà áóäåò ñâÿçàíà ñ èñõîäíûì ôàéëîì, òàê ÷òî èçìåíåíèÿ â í¸ì áóäóò îòðàæàòüñÿ â äîêóìåíòå." + IDS_PS_NON_OLE "Âñòàâêà ñîäåðæèìîå áóôåðà îáìåíà â äîêóìåíò." + IDS_PS_UNKNOWN_TYPE "Íåèçâåñòíûé òèï" + IDS_PS_UNKNOWN_SRC "Íåèçâåñòíûé èñòî÷íèê" + IDS_PS_UNKNOWN_APP "ïðîãðàììà, êîòîðàÿ åãî ñîçäàëà" +} Propchange: trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oledlg/pastespl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/pastespl.… ============================================================================== --- trunk/reactos/dll/win32/oledlg/pastespl.c (original) +++ trunk/reactos/dll/win32/oledlg/pastespl.c Mon Jan 14 18:50:17 2008 @@ -434,7 +434,7 @@ LoadStringW(OLEDLG_hInstance, res_id, resource_txt, sizeof(resource_txt)/sizeof(WCHAR)); if((ptr = strstrW(resource_txt, percent_s))) { - /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropiate type name */ + /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropriate type name */ size_t result_txt_len = strlenW(pent->lpstrResultText); ptrdiff_t offs = (char*)ptr - (char*)resource_txt; result_txt = HeapAlloc(GetProcessHeap(), 0, (strlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/oledlg/rsrc.rc (original) +++ trunk/reactos/dll/win32/oledlg/rsrc.rc Mon Jan 14 18:50:17 2008 @@ -46,6 +46,7 @@ #include "oledlg_No.rc" #include "oledlg_Pl.rc" #include "oledlg_Pt.rc" +#include "oledlg_Ru.rc" #include "oledlg_Sv.rc" #include "oledlg_Tr.rc" #include "oledlg_Uk.rc"

1 0

[winesync] 31787: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 18:45:45 2008 New Revision: 31787 URL: http://svn.reactos.org/svn/reactos?rev=31787&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/ole32/drag_copy.cur (with props) trunk/reactos/dll/win32/ole32/drag_link.cur (with props) trunk/reactos/dll/win32/ole32/drag_move.cur (with props) trunk/reactos/dll/win32/ole32/irot.idl (with props) trunk/reactos/dll/win32/ole32/nodrop.cur (with props) trunk/reactos/dll/win32/ole32/ole32_ros.diff (with props) trunk/reactos/dll/win32/ole32/version16.rc (with props) Modified: trunk/reactos/dll/win32/ole32/bindctx.c trunk/reactos/dll/win32/ole32/classmoniker.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj.spec trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/compositemoniker.c trunk/reactos/dll/win32/ole32/datacache.c trunk/reactos/dll/win32/ole32/dcom.idl trunk/reactos/dll/win32/ole32/defaulthandler.c trunk/reactos/dll/win32/ole32/errorinfo.c trunk/reactos/dll/win32/ole32/filemoniker.c trunk/reactos/dll/win32/ole32/git.c trunk/reactos/dll/win32/ole32/hglobalstream.c trunk/reactos/dll/win32/ole32/ifs.c trunk/reactos/dll/win32/ole32/itemmoniker.c trunk/reactos/dll/win32/ole32/marshal.c trunk/reactos/dll/win32/ole32/memlockbytes.c trunk/reactos/dll/win32/ole32/memlockbytes16.c trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/ole16.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole2_16.c trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/ole32_main.c trunk/reactos/dll/win32/ole32/ole32res.rc trunk/reactos/dll/win32/ole32/oleobj.c trunk/reactos/dll/win32/ole32/oleproxy.c trunk/reactos/dll/win32/ole32/regsvr.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/stg_prop.c trunk/reactos/dll/win32/ole32/stg_stream.c trunk/reactos/dll/win32/ole32/storage.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/stubmanager.c trunk/reactos/dll/win32/ole32/usrmarshal.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/ole32/bindctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/bindctx.c?… Modified: trunk/reactos/dll/win32/ole32/classmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/classmonik… Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… Modified: trunk/reactos/dll/win32/ole32/compobj.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.sp… Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… Modified: trunk/reactos/dll/win32/ole32/compositemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compositem… Modified: trunk/reactos/dll/win32/ole32/datacache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/datacache.… Modified: trunk/reactos/dll/win32/ole32/dcom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/dcom.idl?r… Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan… Added: trunk/reactos/dll/win32/ole32/drag_copy.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/drag_copy.… Added: trunk/reactos/dll/win32/ole32/drag_link.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/drag_link.… Added: trunk/reactos/dll/win32/ole32/drag_move.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/drag_move.… Modified: trunk/reactos/dll/win32/ole32/errorinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/errorinfo.… Modified: trunk/reactos/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike… Modified: trunk/reactos/dll/win32/ole32/git.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/git.c?rev=… Modified: trunk/reactos/dll/win32/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/hglobalstr… Modified: trunk/reactos/dll/win32/ole32/ifs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ifs.c?rev=… Added: trunk/reactos/dll/win32/ole32/irot.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/irot.idl?r… Modified: trunk/reactos/dll/win32/ole32/itemmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/itemmonike… Modified: trunk/reactos/dll/win32/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?… Modified: trunk/reactos/dll/win32/ole32/memlockbytes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/memlockbyt… Modified: trunk/reactos/dll/win32/ole32/memlockbytes16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/memlockbyt… Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… Added: trunk/reactos/dll/win32/ole32/nodrop.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/nodrop.cur… Modified: trunk/reactos/dll/win32/ole32/ole16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole16.c?re… Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… Modified: trunk/reactos/dll/win32/ole32/ole2_16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2_16.c?… Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… Modified: trunk/reactos/dll/win32/ole32/ole32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_main… Added: trunk/reactos/dll/win32/ole32/ole32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_ros.… Modified: trunk/reactos/dll/win32/ole32/ole32res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32res.r… Modified: trunk/reactos/dll/win32/ole32/oleobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleobj.c?r… Modified: trunk/reactos/dll/win32/ole32/oleproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleproxy.c… Modified: trunk/reactos/dll/win32/ole32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/regsvr.c?r… Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… Modified: trunk/reactos/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c… Modified: trunk/reactos/dll/win32/ole32/stg_stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_stream… Modified: trunk/reactos/dll/win32/ole32/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage.c?… Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/stubmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stubmanage… Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal… Added: trunk/reactos/dll/win32/ole32/version16.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/version16.…

1 0

[winesync] 31786: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 18:42:52 2008 New Revision: 31786 URL: http://svn.reactos.org/svn/reactos?rev=31786&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild Mon Jan 14 18:42:52 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true"> <importlibrary definition="odbccp32.spec.def" /> <include base="odbccp32">.</include> @@ -8,7 +9,6 @@ <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> <library>wine</library> - <library>ole32</library> <library>advapi32</library> <library>kernel32</library> <library>uuid</library> @@ -16,3 +16,4 @@ <file>odbccp32.c</file> <file>odbccp32.spec</file> </module> +</group>

1 0

[winesync] 31785: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Jan '08

14 Jan '08

Author: winesync Date: Mon Jan 14 18:41:33 2008 New Revision: 31785 URL: http://svn.reactos.org/svn/reactos?rev=31785&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/objsel/objsel.rbuild Modified: trunk/reactos/dll/win32/objsel/objsel.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.rb… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel.rbuild (original) +++ trunk/reactos/dll/win32/objsel/objsel.rbuild Mon Jan 14 18:41:33 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="objsel" type="win32dll" baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32" installname="objsel.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="objsel.spec.def" /> @@ -10,7 +11,6 @@ <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>ole32</library> - <library>oleaut32</library> <library>user32</library> <library>advapi32</library> <library>kernel32</library> @@ -22,3 +22,4 @@ <file>objsel.rc</file> <file>objsel.spec</file> </module> +</group>

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