Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[winesync] 31790: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

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

16 years, 8 months

[winesync] 31789: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

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; + } + } +}

16 years, 8 months

[winesync] 31788: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

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"

16 years, 8 months

[winesync] 31787: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

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.…

16 years, 8 months

[winesync] 31786: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

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>

16 years, 8 months

[winesync] 31785: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

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>

16 years, 8 months

[winesync] 31784: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Mon Jan 14 18:39:30 2008 New Revision: 31784 URL: http://svn.reactos.org/svn/reactos?rev=31784&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/local_group.c trunk/reactos/dll/win32/netapi32/netapi32.rbuild Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c (original) +++ trunk/reactos/dll/win32/netapi32/access.c Mon Jan 14 18:39:30 2008 @@ -57,10 +57,6 @@ DWORD user_flags; LPWSTR user_logon_script_path; }; - -static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a','t', - 'o','r',0}; -static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; static struct list user_list = LIST_INIT( user_list ); @@ -604,7 +600,7 @@ NetApiBufferAllocate(dwSize + admin_size - sizeof(NET_DISPLAY_USER) + guest_size - sizeof(NET_DISPLAY_USER), - (LPVOID *) SortedBuffer); + SortedBuffer); inf = (PNET_DISPLAY_USER) *SortedBuffer; str = (LPWSTR) ((PBYTE) inf + sizeof(NET_DISPLAY_USER) * records); inf->usri1_name = str; Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c Mon Jan 14 18:39:30 2008 @@ -166,6 +166,39 @@ FIXME("(%s %s %d %p %d, %p %p %p) stub!\n", debugstr_w(servername), debugstr_w(localgroupname), level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); + + if (level == 3) + { + WCHAR userName[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD userNameLen; + DWORD len,needlen; + PLOCALGROUP_MEMBERS_INFO_3 ptr; + + /* still a stub, current user is belonging to all groups */ + + *totalentries = 1; + *entriesread = 0; + + userNameLen = MAX_COMPUTERNAME_LENGTH + 1; + GetUserNameW(userName,&userNameLen); + needlen = sizeof(LOCALGROUP_MEMBERS_INFO_3) + + (userNameLen+2) * sizeof(WCHAR); + if (prefmaxlen != MAX_PREFERRED_LENGTH) + len = min(prefmaxlen,needlen); + else + len = needlen; + + NetApiBufferAllocate(len, (LPVOID *) bufptr); + if (len < needlen) + return ERROR_MORE_DATA; + + ptr = (PLOCALGROUP_MEMBERS_INFO_3)*bufptr; + ptr->lgrmi3_domainandname = (LPWSTR)(*bufptr+sizeof(LOCALGROUP_MEMBERS_INFO_3)); + lstrcpyW(ptr->lgrmi3_domainandname,userName); + + *entriesread = 1; + } + return NERR_Success; } Modified: trunk/reactos/dll/win32/netapi32/netapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.rbuild (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.rbuild Mon Jan 14 18:39:30 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" allowwarnings="true"> <importlibrary definition="netapi32.spec.def" /> <include base="netapi32">.</include> @@ -27,3 +28,4 @@ <file>wksta.c</file> <file>netapi32.spec</file> </module> +</group>

16 years, 8 months

[winesync] 31783: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Mon Jan 14 18:37:24 2008 New Revision: 31783 URL: http://svn.reactos.org/svn/reactos?rev=31783&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc (with props) Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild trunk/reactos/dll/win32/msvfw32/msvideo16.c trunk/reactos/dll/win32/msvfw32/msvideo_main.c trunk/reactos/dll/win32/msvfw32/rsrc.rc Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/drawdib.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/drawdib.c (original) +++ trunk/reactos/dll/win32/msvfw32/drawdib.c Mon Jan 14 18:37:24 2008 @@ -183,7 +183,7 @@ WINE_HDD *whdd; TRACE("(%p,%p,%d,%d,%p,%d,%d,0x%08x)\n", - hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, (DWORD)wFlags); + hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, wFlags); TRACE("lpbi: %d,%d/%d,%d,%d,%d,%d,%d,%d,%d,%d\n", lpbi->biSize, lpbi->biWidth, lpbi->biHeight, lpbi->biPlanes, @@ -305,7 +305,7 @@ BOOL ret = TRUE; TRACE("(%p,%p,%d,%d,%d,%d,%p,%p,%d,%d,%d,%d,0x%08x)\n", - hdd, hdc, xDst, yDst, dxDst, dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, (DWORD)wFlags); + hdd, hdc, xDst, yDst, dxDst, dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, wFlags); whdd = MSVIDEO_GetHddPtr(hdd); if (!whdd) return FALSE; @@ -313,7 +313,7 @@ TRACE("whdd=%p\n", whdd); if (wFlags & ~(DDF_SAME_HDC | DDF_SAME_DRAW | DDF_NOTKEYFRAME | DDF_UPDATE | DDF_DONTDRAW | DDF_BACKGROUNDPAL)) - FIXME("wFlags == 0x%08x not handled\n", (DWORD)wFlags); + FIXME("wFlags == 0x%08x not handled\n", wFlags); if (!lpBits) { Modified: trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild (original) +++ trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild Mon Jan 14 18:37:24 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll" allowwarnings="true"> <importlibrary definition="msvfw32.spec.def" /> <include base="msvfw32">.</include> @@ -9,8 +10,8 @@ <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>winmm</library> + <library>version</library> <library>comctl32</library> - <library>version</library> <library>user32</library> <library>gdi32</library> <library>advapi32</library> @@ -22,3 +23,4 @@ <file>rsrc.rc</file> <file>msvfw32.spec</file> </module> +</group> Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc Mon Jan 14 18:37:24 2008 @@ -1,0 +1,51 @@ +/* + * Copyright 2007 Luis Carlos Busquets PÃ©rez + * + * 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_SPANISH, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "CompresiÃ³n de vÃdeo" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "Aceptar",IDOK,129,2,49,14 + PUSHBUTTON "Cancelar",IDCANCEL,129,18,49,14 + + LTEXT "&Compresor:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "C&onfigurar...",882,129,36,49,14 + PUSHBUTTON "&Acerca de...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "C&alidad de compresiÃ³n:",886,9,34,80,8 + + CONTROL "C&uadro clave cada",887,"BotÃ³n",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "cuadros",889,103,62,26,10 + + CONTROL "&Velocidad de datos",894,"BotÃ³n",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/s",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Cuadros completos (no comprimidos)" +} Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msvfw32/msvideo16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo1… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo16.c (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo16.c Mon Jan 14 18:37:24 2008 @@ -693,7 +693,7 @@ args[2] = LOWORD(lp1); args[1] = HIWORD(lp2); args[0] = LOWORD(lp2); - WOWCallback16Ex( (DWORD)whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &ret ); + WOWCallback16Ex( whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &ret ); switch (msg) { @@ -745,7 +745,7 @@ args[2] = LOWORD(lParam1); args[1] = HIWORD(lParam2); args[0] = LOWORD(lParam2); - WOWCallback16Ex( (DWORD)whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &result ); + WOWCallback16Ex( whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &result ); ret = result; } else @@ -813,7 +813,7 @@ } } - if (nr || !found) + if (!found) { TRACE("No more VID* entries found nr=%d\n", nr); return 20; Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_main.c (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c Mon Jan 14 18:37:24 2008 @@ -87,7 +87,7 @@ { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinst); - MSVFW32_hModule = (HMODULE)hinst; + MSVFW32_hModule = hinst; break; } return TRUE; @@ -327,7 +327,7 @@ if (driver && driver->proc) /* The driver has been registered at runtime with its driverproc */ - return MSVIDEO_OpenFunction(fccType, fccHandler, wMode, (DRIVERPROC)driver->proc, (DWORD)NULL); + return MSVIDEO_OpenFunction(fccType, fccHandler, wMode, driver->proc, 0); /* Well, lParam2 is in fact a LPVIDEO_OPEN_PARMS, but it has the * same layout as ICOPEN @@ -1088,7 +1088,7 @@ XX(ICM_DECOMPRESSEX_END); XX(ICM_SET_STATUS_PROC); default: - FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,(DWORD)msg,lParam1,lParam2); + FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,msg,lParam1,lParam2); } #undef XX @@ -1360,7 +1360,7 @@ GlobalFree(hMem); hMem = NULL; } - return (HANDLE)hMem; + return hMem; } /*********************************************************************** Modified: trunk/reactos/dll/win32/msvfw32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/rsrc.rc (original) +++ trunk/reactos/dll/win32/msvfw32/rsrc.rc Mon Jan 14 18:37:24 2008 @@ -22,6 +22,7 @@ #include "msvfw32_De.rc" #include "msvfw32_En.rc" +#include "msvfw32_Es.rc" #include "msvfw32_Fr.rc" #include "msvfw32_Hu.rc" #include "msvfw32_Ko.rc"

16 years, 8 months

[hpoussin] 31782: Update _ros.diff file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Jan 14 18:36:21 2008 New Revision: 31782 URL: http://svn.reactos.org/svn/reactos?rev=31782&view=rev Log: Update _ros.diff file Modified: trunk/reactos/dll/win32/msi/msi_ros.diff [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/msi_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_ros.diff…

16 years, 8 months

[winesync] 31781: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Mon Jan 14 18:34:43 2008 New Revision: 31781 URL: http://svn.reactos.org/svn/reactos?rev=31781&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec (with props) Removed: trunk/reactos/dll/win32/msvcrt20/msvcrt20.def trunk/reactos/dll/win32/msvcrt20/msvcrt20.rc Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.c trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.c (original) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.c Mon Jan 14 18:34:43 2008 @@ -23,9 +23,9 @@ #include "windef.h" extern void CDECL __getmainargs(int *argc, char** *argv, char** *envp, - int expand_wildcards, int *new_mode); + int expand_wildcards, int *new_mode); extern void CDECL __wgetmainargs(int *argc, WCHAR** *wargv, WCHAR** *wenvp, - int expand_wildcards, int *new_mode); + int expand_wildcards, int *new_mode); /********************************************************************* * __getmainargs (MSVCRT20.@) @@ -33,7 +33,7 @@ * new_mode is not a pointer in msvcrt20. */ void CDECL MSVCRT20__getmainargs( int *argc, char** *argv, char** *envp, - int expand_wildcards, int new_mode ) + int expand_wildcards, int new_mode ) { __getmainargs( argc, argv, envp, expand_wildcards, &new_mode ); } @@ -44,7 +44,7 @@ * new_mode is not a pointer in msvcrt20. */ void CDECL MSVCRT20__wgetmainargs( int *argc, WCHAR** *wargv, WCHAR** *wenvp, - int expand_wildcards, int new_mode ) + int expand_wildcards, int new_mode ) { __wgetmainargs( argc, wargv, wenvp, expand_wildcards, &new_mode ); } Removed: trunk/reactos/dll/win32/msvcrt20/msvcrt20.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.def (original) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.def (removed) @@ -1,708 +1,0 @@ -; File generated automatically from msvcrt20/msvcrt20.spec; do not edit! - -LIBRARY msvcrt20.dll - -EXPORTS - ??2@YAPAXI@Z=msvcrt.??2@YAPAXI@Z @80 - ??3@YAXPAX@Z=msvcrt.??3@YAXPAX@Z @81 - ?_query_new_handler@@YAP6AHI@ZXZ=msvcrt.?_query_new_handler@@YAP6AHI@ZXZ @227 - ?_query_new_mode@@YAHXZ=msvcrt.?_query_new_mode@@YAHXZ @228 - ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z=msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z @229 - ?_set_new_mode@@YAHH@Z=msvcrt.?_set_new_mode@@YAHH@Z @230 - ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z=msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z @231 - ?set_terminate@@YAP6AXXZP6AXXZ@Z=msvcrt.?set_terminate@@YAP6AXXZP6AXXZ@Z @366 - ?set_unexpected@@YAP6AXXZP6AXXZ@Z=msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ@Z @367 - ?terminate@@YAXXZ=msvcrt.?terminate@@YAXXZ @410 - ?unexpected@@YAXXZ=msvcrt.?unexpected@@YAXXZ @419 - _CIacos=msvcrt._CIacos @439 - _CIasin=msvcrt._CIasin @440 - _CIatan=msvcrt._CIatan @441 - _CIatan2=msvcrt._CIatan2 @442 - _CIcos=msvcrt._CIcos @443 - _CIcosh=msvcrt._CIcosh @444 - _CIexp=msvcrt._CIexp @445 - _CIfmod=msvcrt._CIfmod @446 - _CIlog=msvcrt._CIlog @447 - _CIlog10=msvcrt._CIlog10 @448 - _CIpow=msvcrt._CIpow @449 - _CIsin=msvcrt._CIsin @450 - _CIsinh=msvcrt._CIsinh @451 - _CIsqrt=msvcrt._CIsqrt @452 - _CItan=msvcrt._CItan @453 - _CItanh=msvcrt._CItanh @454 - _CxxThrowException=msvcrt._CxxThrowException @455 - _HUGE=msvcrt._HUGE @456 DATA - _XcptFilter=msvcrt._XcptFilter @457 - __CxxFrameHandler=msvcrt.__CxxFrameHandler @458 - __CxxLongjmpUnwind(a)4=msvcrt.__CxxLongjmpUnwind @459 - __STRINGTOLD=msvcrt.__STRINGTOLD @460 - __argc=msvcrt.__argc @461 DATA - __argv=msvcrt.__argv @462 DATA - __dllonexit=msvcrt.__dllonexit @463 - __doserrno=msvcrt.__doserrno @464 - __fpecode=msvcrt.__fpecode @465 - __getmainargs=MSVCRT20__getmainargs @466 - __initenv=msvcrt.__initenv @467 DATA - __isascii=msvcrt.__isascii @468 - __iscsym=msvcrt.__iscsym @469 - __iscsymf=msvcrt.__iscsymf @470 - __lconv_init=msvcrt.__lconv_init @471 - __mb_cur_max=msvcrt.__mb_cur_max @472 DATA - __p___argc=msvcrt.__p___argc @473 - __p___argv=msvcrt.__p___argv @474 - __p___initenv=msvcrt.__p___initenv @475 - __p___mb_cur_max=msvcrt.__p___mb_cur_max @476 - __p___wargv=msvcrt.__p___wargv @477 - __p___winitenv=msvcrt.__p___winitenv @478 - __p__acmdln=msvcrt.__p__acmdln @479 - __p__amblksiz=msvcrt.__p__amblksiz @480 - __p__commode=msvcrt.__p__commode @481 - __p__daylight=msvcrt.__p__daylight @482 - __p__environ=msvcrt.__p__environ @483 - __p__fmode=msvcrt.__p__fmode @484 - __p__iob=msvcrt.__p__iob @485 - __p__mbctype=msvcrt.__p__mbctype @486 - __p__osver=msvcrt.__p__osver @487 - __p__pctype=msvcrt.__p__pctype @488 - __p__pgmptr=msvcrt.__p__pgmptr @489 - __p__pwctype=msvcrt.__p__pwctype @490 - __p__timezone=msvcrt.__p__timezone @491 - __p__tzname=msvcrt.__p__tzname @492 - __p__wcmdln=msvcrt.__p__wcmdln @493 - __p__wenviron=msvcrt.__p__wenviron @494 - __p__winmajor=msvcrt.__p__winmajor @495 - __p__winminor=msvcrt.__p__winminor @496 - __p__winver=msvcrt.__p__winver @497 - __p__wpgmptr=msvcrt.__p__wpgmptr @498 - __pxcptinfoptrs=msvcrt.__pxcptinfoptrs @499 - __threadhandle=msvcrt.__threadhandle @501 - __threadid=msvcrt.__threadid @502 - __toascii=msvcrt.__toascii @503 - __wargv=msvcrt.__wargv @504 DATA - __wgetmainargs=MSVCRT20__wgetmainargs @505 - __winitenv=msvcrt.__winitenv @506 DATA - _abnormal_termination=msvcrt._abnormal_termination @507 - _access=msvcrt._access @508 - _acmdln=msvcrt._acmdln @509 DATA - _adj_fdiv_m16i=msvcrt._adj_fdiv_m16i @510 - _adj_fdiv_m32=msvcrt._adj_fdiv_m32 @511 - _adj_fdiv_m32i=msvcrt._adj_fdiv_m32i @512 - _adj_fdiv_m64=msvcrt._adj_fdiv_m64 @513 - _adj_fdiv_r=msvcrt._adj_fdiv_r @514 - _adj_fdivr_m16i=msvcrt._adj_fdivr_m16i @515 - _adj_fdivr_m32=msvcrt._adj_fdivr_m32 @516 - _adj_fdivr_m32i=msvcrt._adj_fdivr_m32i @517 - _adj_fdivr_m64=msvcrt._adj_fdivr_m64 @518 - _adj_fpatan=msvcrt._adj_fpatan @519 - _adj_fprem=msvcrt._adj_fprem @520 - _adj_fprem1=msvcrt._adj_fprem1 @521 - _adj_fptan=msvcrt._adj_fptan @522 - _adjust_fdiv=msvcrt._adjust_fdiv @523 - _aexit_rtn=msvcrt._aexit_rtn @524 DATA - _amsg_exit=msvcrt._amsg_exit @525 - _assert=msvcrt._assert @526 - _atodbl=msvcrt._atodbl @527 - _atoi64=msvcrt._atoi64 @528 - _atoldbl=msvcrt._atoldbl @529 - _beep=msvcrt._beep @530 - _beginthread=msvcrt._beginthread @531 - _beginthreadex=msvcrt._beginthreadex @532 - _c_exit=msvcrt._c_exit @533 - _cabs=msvcrt._cabs @534 - _cexit=msvcrt._cexit @535 - _cgets=msvcrt._cgets @536 - _chdir=msvcrt._chdir @537 - _chdrive=msvcrt._chdrive @538 - _chgsign=msvcrt._chgsign @539 - _chmod=msvcrt._chmod @540 - _chsize=msvcrt._chsize @541 - _clearfp=msvcrt._clearfp @542 - _close=msvcrt._close @543 - _commit=msvcrt._commit @544 - _commode=msvcrt._commode @545 DATA - _control87=msvcrt._control87 @546 - _controlfp=msvcrt._controlfp @547 - _copysign=msvcrt._copysign @548 - _cprintf=msvcrt._cprintf @549 - _cputs=msvcrt._cputs @550 - _creat=msvcrt._creat @551 - _cscanf=msvcrt._cscanf @552 - _ctype=msvcrt._ctype @553 DATA - _cwait=msvcrt._cwait @554 - _daylight=msvcrt._daylight @555 DATA - _dup=msvcrt._dup @556 - _dup2=msvcrt._dup2 @557 - _ecvt=msvcrt._ecvt @558 - _endthread=msvcrt._endthread @559 - _endthreadex=msvcrt._endthreadex @560 - _environ=msvcrt._environ @561 DATA - _eof=msvcrt._eof @562 - _errno=msvcrt._errno @563 - _except_handler2=msvcrt._except_handler2 @564 - _except_handler3=msvcrt._except_handler3 @565 - _execl=msvcrt._execl @566 - _execle=msvcrt._execle @567 - _execlp=msvcrt._execlp @568 - _execlpe=msvcrt._execlpe @569 - _execv=msvcrt._execv @570 - _execve=msvcrt._execve @571 - _execvp=msvcrt._execvp @572 - _execvpe=msvcrt._execvpe @573 - _exit=msvcrt._exit @574 - _expand=msvcrt._expand @575 - _fcloseall=msvcrt._fcloseall @576 - _fcvt=msvcrt._fcvt @577 - _fdopen=msvcrt._fdopen @578 - _fgetchar=msvcrt._fgetchar @579 - _fgetwchar=msvcrt._fgetwchar @580 - _filbuf=msvcrt._filbuf @581 - _fileinfo=msvcrt._fileinfo @582 DATA - _filelength=msvcrt._filelength @583 - _fileno=msvcrt._fileno @584 - _findclose=msvcrt._findclose @585 - _findfirst=msvcrt._findfirst @586 - _findnext=msvcrt._findnext @587 - _finite=msvcrt._finite @588 - _flsbuf=msvcrt._flsbuf @589 - _flushall=msvcrt._flushall @590 - _fmode=msvcrt._fmode @591 DATA - _fpclass=msvcrt._fpclass @592 - _fpieee_flt=msvcrt._fpieee_flt @593 - _fpreset=msvcrt._fpreset @594 - _fputchar=msvcrt._fputchar @595 - _fputwchar=msvcrt._fputwchar @596 - _fsopen=msvcrt._fsopen @597 - _fstat=msvcrt._fstat @598 - _ftime=msvcrt._ftime @599 - _ftol=msvcrt._ftol @600 - _fullpath=msvcrt._fullpath @601 - _futime=msvcrt._futime @602 - _gcvt=msvcrt._gcvt @603 - _get_osfhandle=msvcrt._get_osfhandle @604 - _getch=msvcrt._getch @605 - _getche=msvcrt._getche @606 - _getcwd=msvcrt._getcwd @607 - _getdcwd=msvcrt._getdcwd @608 - _getdiskfree=msvcrt._getdiskfree @609 - _getdllprocaddr=msvcrt._getdllprocaddr @610 - _getdrive=msvcrt._getdrive @611 - _getdrives=msvcrt._getdrives @612 - _getmbcp=msvcrt._getmbcp @613 - _getpid=msvcrt._getpid @614 - _getsystime=msvcrt._getsystime @615 - _getw=msvcrt._getw @616 - _getws=msvcrt._getws @617 - _global_unwind2=msvcrt._global_unwind2 @618 - _heapadd=msvcrt._heapadd @619 - _heapchk=msvcrt._heapchk @620 - _heapmin=msvcrt._heapmin @621 - _heapset=msvcrt._heapset @622 - _heapused=msvcrt._heapused @623 - _heapwalk=msvcrt._heapwalk @624 - _hypot=msvcrt._hypot @625 - _i64toa=msvcrt._i64toa @626 - _i64tow=msvcrt._i64tow @627 - _initterm=msvcrt._initterm @628 - _iob=msvcrt._iob @629 DATA - _isatty=msvcrt._isatty @630 - _isctype=msvcrt._isctype @631 - _ismbbalnum=msvcrt._ismbbalnum @632 - _ismbbalpha=msvcrt._ismbbalpha @633 - _ismbbgraph=msvcrt._ismbbgraph @634 - _ismbbkalnum=msvcrt._ismbbkalnum @635 - _ismbbkana=msvcrt._ismbbkana @636 - _ismbbkprint=msvcrt._ismbbkprint @637 - _ismbbkpunct=msvcrt._ismbbkpunct @638 - _ismbblead=msvcrt._ismbblead @639 - _ismbbprint=msvcrt._ismbbprint @640 - _ismbbpunct=msvcrt._ismbbpunct @641 - _ismbbtrail=msvcrt._ismbbtrail @642 - _ismbcalnum=msvcrt._ismbcalnum @643 - _ismbcalpha=msvcrt._ismbcalpha @644 - _ismbcdigit=msvcrt._ismbcdigit @645 - _ismbcgraph=msvcrt._ismbcgraph @646 - _ismbchira=msvcrt._ismbchira @647 - _ismbckata=msvcrt._ismbckata @648 - _ismbcl0=msvcrt._ismbcl0 @649 - _ismbcl1=msvcrt._ismbcl1 @650 - _ismbcl2=msvcrt._ismbcl2 @651 - _ismbclegal=msvcrt._ismbclegal @652 - _ismbclower=msvcrt._ismbclower @653 - _ismbcprint=msvcrt._ismbcprint @654 - _ismbcpunct=msvcrt._ismbcpunct @655 - _ismbcspace=msvcrt._ismbcspace @656 - _ismbcsymbol=msvcrt._ismbcsymbol @657 - _ismbcupper=msvcrt._ismbcupper @658 - _ismbslead=msvcrt._ismbslead @659 - _ismbstrail=msvcrt._ismbstrail @660 - _isnan=msvcrt._isnan @661 - _itoa=msvcrt._itoa @662 - _itow=msvcrt._itow @663 - _j0=msvcrt._j0 @664 - _j1=msvcrt._j1 @665 - _jn=msvcrt._jn @666 - _kbhit=msvcrt._kbhit @667 - _lfind=msvcrt._lfind @668 - _loaddll=msvcrt._loaddll @669 - _local_unwind2=msvcrt._local_unwind2 @670 - _locking=msvcrt._locking @671 - _logb=msvcrt._logb @672 - _longjmpex=msvcrt._longjmpex @673 - _lrotl=msvcrt._lrotl @674 - _lrotr=msvcrt._lrotr @675 - _lsearch=msvcrt._lsearch @676 - _lseek=msvcrt._lseek @677 - _ltoa=msvcrt._ltoa @678 - _ltow=msvcrt._ltow @679 - _makepath=msvcrt._makepath @680 - _matherr=msvcrt._matherr @681 - _mbbtombc=msvcrt._mbbtombc @682 - _mbbtype=msvcrt._mbbtype @683 - _mbccpy=msvcrt._mbccpy @684 - _mbcjistojms=msvcrt._mbcjistojms @685 - _mbcjmstojis=msvcrt._mbcjmstojis @686 - _mbclen=msvcrt._mbclen @687 - _mbctohira=msvcrt._mbctohira @688 - _mbctokata=msvcrt._mbctokata @689 - _mbctolower=msvcrt._mbctolower @690 - _mbctombb=msvcrt._mbctombb @691 - _mbctoupper=msvcrt._mbctoupper @692 - _mbctype=msvcrt._mbctype @693 DATA - _mbsbtype=msvcrt._mbsbtype @694 - _mbscat=msvcrt._mbscat @695 - _mbschr=msvcrt._mbschr @696 - _mbscmp=msvcrt._mbscmp @697 - _mbscoll=msvcrt._mbscoll @698 - _mbscpy=msvcrt._mbscpy @699 - _mbscspn=msvcrt._mbscspn @700 - _mbsdec=msvcrt._mbsdec @701 - _mbsdup=msvcrt._mbsdup @702 - _mbsicmp=msvcrt._mbsicmp @703 - _mbsicoll=msvcrt._mbsicoll @704 - _mbsinc=msvcrt._mbsinc @705 - _mbslen=msvcrt._mbslen @706 - _mbslwr=msvcrt._mbslwr @707 - _mbsnbcat=msvcrt._mbsnbcat @708 - _mbsnbcmp=msvcrt._mbsnbcmp @709 - _mbsnbcnt=msvcrt._mbsnbcnt @710 - _mbsnbcoll=msvcrt._mbsnbcoll @711 - _mbsnbcpy=msvcrt._mbsnbcpy @712 - _mbsnbicmp=msvcrt._mbsnbicmp @713 - _mbsnbicoll=msvcrt._mbsnbicoll @714 - _mbsnbset=msvcrt._mbsnbset @715 - _mbsncat=msvcrt._mbsncat @716 - _mbsnccnt=msvcrt._mbsnccnt @717 - _mbsncmp=msvcrt._mbsncmp @718 - _mbsncoll=msvcrt._mbsncoll @719 - _mbsncpy=msvcrt._mbsncpy @720 - _mbsnextc=msvcrt._mbsnextc @721 - _mbsnicmp=msvcrt._mbsnicmp @722 - _mbsnicoll=msvcrt._mbsnicoll @723 - _mbsninc=msvcrt._mbsninc @724 - _mbsnset=msvcrt._mbsnset @725 - _mbspbrk=msvcrt._mbspbrk @726 - _mbsrchr=msvcrt._mbsrchr @727 - _mbsrev=msvcrt._mbsrev @728 - _mbsset=msvcrt._mbsset @729 - _mbsspn=msvcrt._mbsspn @730 - _mbsspnp=msvcrt._mbsspnp @731 - _mbsstr=msvcrt._mbsstr @732 - _mbstok=msvcrt._mbstok @733 - _mbstrlen=msvcrt._mbstrlen @734 - _mbsupr=msvcrt._mbsupr @735 - _memccpy=msvcrt._memccpy @736 - _memicmp=msvcrt._memicmp @737 - _mkdir=msvcrt._mkdir @738 - _mktemp=msvcrt._mktemp @739 - _msize=msvcrt._msize @740 - _nextafter=msvcrt._nextafter @743 - _onexit=msvcrt._onexit @744 - _open=msvcrt._open @745 - _open_osfhandle=msvcrt._open_osfhandle @746 - _osver=msvcrt._osver @747 DATA - _pclose=msvcrt._pclose @748 - _pctype=msvcrt._pctype @749 DATA - _pgmptr=msvcrt._pgmptr @750 DATA - _pipe=msvcrt._pipe @751 - _popen=msvcrt._popen @752 - _purecall=msvcrt._purecall @753 - _putch=msvcrt._putch @754 - _putenv=msvcrt._putenv @755 - _putw=msvcrt._putw @756 - _putws=msvcrt._putws @757 - _pwctype=msvcrt._pwctype @758 DATA - _read=msvcrt._read @759 - _rmdir=msvcrt._rmdir @760 - _rmtmp=msvcrt._rmtmp @761 - _rotl=msvcrt._rotl @762 - _rotr=msvcrt._rotr @763 - _safe_fdiv=msvcrt._safe_fdiv @764 - _safe_fdivr=msvcrt._safe_fdivr @765 - _safe_fprem=msvcrt._safe_fprem @766 - _safe_fprem1=msvcrt._safe_fprem1 @767 - _scalb=msvcrt._scalb @768 - _searchenv=msvcrt._searchenv @769 - __seh_longjmp_unwind(a)4=msvcrt._seh_longjmp_unwind @500 - _seterrormode=msvcrt._seterrormode @770 - _setjmp=msvcrt._setjmp @771 - _setjmp3=msvcrt._setjmp3 @772 - _setmbcp=msvcrt._setmbcp @773 - _setmode=msvcrt._setmode @774 - _setsystime=msvcrt._setsystime @775 - _sleep=msvcrt._sleep @776 - _snprintf=msvcrt._snprintf @777 - _snwprintf=msvcrt._snwprintf @778 - _sopen=msvcrt._sopen @779 - _spawnl=msvcrt._spawnl @780 - _spawnle=msvcrt._spawnle @781 - _spawnlp=msvcrt._spawnlp @782 - _spawnlpe=msvcrt._spawnlpe @783 - _spawnv=msvcrt._spawnv @784 - _spawnve=msvcrt._spawnve @785 - _spawnvp=msvcrt._spawnvp @786 - _spawnvpe=msvcrt._spawnvpe @787 - _splitpath=msvcrt._splitpath @788 - _stat=msvcrt._stat @789 - _statusfp=msvcrt._statusfp @790 - _strcmpi=msvcrt._strcmpi @791 - _strdate=msvcrt._strdate @792 - _strdup=msvcrt._strdup @793 - _strerror=msvcrt._strerror @794 - _stricmp=msvcrt._stricmp @795 - _stricoll=msvcrt._stricoll @796 - _strlwr=msvcrt._strlwr @797 - _strncoll=msvcrt._strncoll @798 - _strnicmp=msvcrt._strnicmp @799 - _strnicoll=msvcrt._strnicoll @800 - _strnset=msvcrt._strnset @801 - _strrev=msvcrt._strrev @802 - _strset=msvcrt._strset @803 - _strtime=msvcrt._strtime @804 - _strupr=msvcrt._strupr @805 - _swab=msvcrt._swab @806 - _sys_errlist=msvcrt._sys_errlist @807 DATA - _sys_nerr=msvcrt._sys_nerr @808 DATA - _tccpy=msvcrt._mbccpy @809 - _tclen=msvcrt._mbclen @810 - _tcschr=msvcrt._mbschr @811 - _tcsclen=msvcrt._mbslen @812 - _tcscmp=msvcrt._mbscmp @813 - _tcscspn=msvcrt._mbscspn @814 - _tcsdec=msvcrt._mbsdec @815 - _tcsicmp=msvcrt._mbsicmp @816 - _tcsinc=msvcrt._mbsinc @817 - _tcslwr=msvcrt._mbslwr @818 - _tcsnbcnt=msvcrt._mbsnbcnt @819 - _tcsncat=msvcrt._mbsnbcat @820 - _tcsnccat=msvcrt._mbsncat @821 - _tcsnccmp=msvcrt._mbsncmp @822 - _tcsnccnt=msvcrt._mbsnccnt @823 - _tcsnccpy=msvcrt._mbsncpy @824 - _tcsncicmp=msvcrt._mbsnicmp @825 - _tcsncmp=msvcrt._mbsnbcmp @826 - _tcsncpy=msvcrt._mbsnbcpy @827 - _tcsncset=msvcrt._mbsnset @828 - _tcsnextc=msvcrt._mbsnextc @829 - _tcsnicmp=msvcrt._mbsnbicmp @830 - _tcsninc=msvcrt._mbsninc @831 - _tcsnset=msvcrt._mbsnbset @832 - _tcspbrk=msvcrt._mbspbrk @833 - _tcsrchr=msvcrt._mbsrchr @834 - _tcsrev=msvcrt._mbsrev @835 - _tcsset=msvcrt._mbsset @836 - _tcsspn=msvcrt._mbsspn @837 - _tcsspnp=msvcrt._mbsspnp @838 - _tcsstr=msvcrt._mbsstr @839 - _tcstok=msvcrt._mbstok @840 - _tcsupr=msvcrt._mbsupr @841 - _tell=msvcrt._tell @842 - _tempnam=msvcrt._tempnam @843 - _timezone=msvcrt._timezone @844 DATA - _tolower=msvcrt._tolower @845 - _toupper=msvcrt._toupper @846 - _tzname=msvcrt._tzname @847 DATA - _tzset=msvcrt._tzset @848 - _ui64toa=msvcrt._ui64toa @849 - _ui64tow=msvcrt._ui64tow @850 - _ultoa=msvcrt._ultoa @851 - _ultow=msvcrt._ultow @852 - _umask=msvcrt._umask @853 - _ungetch=msvcrt._ungetch @854 - _unlink=msvcrt._unlink @855 - _unloaddll=msvcrt._unloaddll @856 - _utime=msvcrt._utime @857 - _vsnprintf=msvcrt._vsnprintf @858 - _vsnwprintf=msvcrt._vsnwprintf @859 - _waccess=msvcrt._waccess @860 - _wasctime=msvcrt._wasctime @861 - _wchdir=msvcrt._wchdir @862 - _wchmod=msvcrt._wchmod @863 - _wcmdln=msvcrt._wcmdln @864 DATA - _wcreat=msvcrt._wcreat @865 - _wcsdup=msvcrt._wcsdup @866 - _wcsicmp=msvcrt._wcsicmp @867 - _wcsicoll=msvcrt._wcsicoll @868 - _wcslwr=msvcrt._wcslwr @869 - _wcsncoll=msvcrt._wcsncoll @870 - _wcsnicmp=msvcrt._wcsnicmp @871 - _wcsnicoll=msvcrt._wcsnicoll @872 - _wcsnset=msvcrt._wcsnset @873 - _wcsrev=msvcrt._wcsrev @874 - _wcsset=msvcrt._wcsset @875 - _wcsupr=msvcrt._wcsupr @876 - _wctime=msvcrt._wctime @877 - _wenviron=msvcrt._wenviron @878 DATA - _wexecl=msvcrt._wexecl @879 - _wexecle=msvcrt._wexecle @880 - _wexeclp=msvcrt._wexeclp @881 - _wexeclpe=msvcrt._wexeclpe @882 - _wexecv=msvcrt._wexecv @883 - _wexecve=msvcrt._wexecve @884 - _wexecvp=msvcrt._wexecvp @885 - _wexecvpe=msvcrt._wexecvpe @886 - _wfdopen=msvcrt._wfdopen @887 - _wfindfirst=msvcrt._wfindfirst @888 - _wfindnext=msvcrt._wfindnext @889 - _wfopen=msvcrt._wfopen @890 - _wfreopen=msvcrt._wfreopen @891 - _wfsopen=msvcrt._wfsopen @892 - _wfullpath=msvcrt._wfullpath @893 - _wgetcwd=msvcrt._wgetcwd @894 - _wgetdcwd=msvcrt._wgetdcwd @895 - _wgetenv=msvcrt._wgetenv @896 - _winmajor=msvcrt._winmajor @897 DATA - _winminor=msvcrt._winminor @898 DATA - _winver=msvcrt._winver @899 DATA - _wmakepath=msvcrt._wmakepath @900 - _wmkdir=msvcrt._wmkdir @901 - _wmktemp=msvcrt._wmktemp @902 - _wopen=msvcrt._wopen @903 - _wperror=msvcrt._wperror @904 - _wpgmptr=msvcrt._wpgmptr @905 DATA - _wpopen=msvcrt._wpopen @906 - _wputenv=msvcrt._wputenv @907 - _wremove=msvcrt._wremove @908 - _wrename=msvcrt._wrename @909 - _write=msvcrt._write @910 - _wrmdir=msvcrt._wrmdir @911 - _wsearchenv=msvcrt._wsearchenv @912 - _wsetlocale=msvcrt._wsetlocale @913 - _wsopen=msvcrt._wsopen @914 - _wspawnl=msvcrt._wspawnl @915 - _wspawnle=msvcrt._wspawnle @916 - _wspawnlp=msvcrt._wspawnlp @917 - _wspawnlpe=msvcrt._wspawnlpe @918 - _wspawnv=msvcrt._wspawnv @919 - _wspawnve=msvcrt._wspawnve @920 - _wspawnvp=msvcrt._wspawnvp @921 - _wspawnvpe=msvcrt._wspawnvpe @922 - _wsplitpath=msvcrt._wsplitpath @923 - _wstat=msvcrt._wstat @924 - _wstrdate=msvcrt._wstrdate @925 - _wstrtime=msvcrt._wstrtime @926 - _wsystem=msvcrt._wsystem @927 - _wtempnam=msvcrt._wtempnam @928 - _wtmpnam=msvcrt._wtmpnam @929 - _wtoi=msvcrt._wtoi @930 - _wtoi64=msvcrt._wtoi64 @931 - _wtol=msvcrt._wtol @932 - _wunlink=msvcrt._wunlink @933 - _wutime=msvcrt._wutime @934 - _y0=msvcrt._y0 @935 - _y1=msvcrt._y1 @936 - _yn=msvcrt._yn @937 - abort=msvcrt.abort @938 - abs=msvcrt.abs @939 - acos=msvcrt.acos @940 - asctime=msvcrt.asctime @941 - asin=msvcrt.asin @942 - atan=msvcrt.atan @943 - atan2=msvcrt.atan2 @944 - atexit=msvcrt.atexit @945 - atof=msvcrt.atof @946 - atoi=msvcrt.atoi @947 - atol=msvcrt.atol @948 - bsearch=msvcrt.bsearch @949 - calloc=msvcrt.calloc @950 - ceil=msvcrt.ceil @951 - clearerr=msvcrt.clearerr @952 - clock=msvcrt.clock @953 - cos=msvcrt.cos @954 - cosh=msvcrt.cosh @955 - ctime=msvcrt.ctime @956 - difftime=msvcrt.difftime @957 - div=msvcrt.div @958 - exit=msvcrt.exit @959 - exp=msvcrt.exp @960 - fabs=msvcrt.fabs @961 - fclose=msvcrt.fclose @962 - feof=msvcrt.feof @963 - ferror=msvcrt.ferror @964 - fflush=msvcrt.fflush @965 - fgetc=msvcrt.fgetc @966 - fgetpos=msvcrt.fgetpos @967 - fgets=msvcrt.fgets @968 - fgetwc=msvcrt.fgetwc @969 - fgetws=msvcrt.fgetws @970 - floor=msvcrt.floor @971 - fmod=msvcrt.fmod @972 - fopen=msvcrt.fopen @973 - fprintf=msvcrt.fprintf @974 - fputc=msvcrt.fputc @975 - fputs=msvcrt.fputs @976 - fputwc=msvcrt.fputwc @977 - fputws=msvcrt.fputws @978 - fread=msvcrt.fread @979 - free=msvcrt.free @980 - freopen=msvcrt.freopen @981 - frexp=msvcrt.frexp @982 - fscanf=msvcrt.fscanf @983 - fseek=msvcrt.fseek @984 - fsetpos=msvcrt.fsetpos @985 - ftell=msvcrt.ftell @986 - fwprintf=msvcrt.fwprintf @987 - fwrite=msvcrt.fwrite @988 - fwscanf=msvcrt.fwscanf @989 - getc=msvcrt.getc @990 - getchar=msvcrt.getchar @991 - getenv=msvcrt.getenv @992 - gets=msvcrt.gets @993 - getwc=msvcrt.getwc @994 - getwchar=msvcrt.getwchar @995 - gmtime=msvcrt.gmtime @996 - is_wctype=msvcrt.is_wctype @997 - isalnum=msvcrt.isalnum @998 - isalpha=msvcrt.isalpha @999 - iscntrl=msvcrt.iscntrl @1000 - isdigit=msvcrt.isdigit @1001 - isgraph=msvcrt.isgraph @1002 - isleadbyte=msvcrt.isleadbyte @1003 - islower=msvcrt.islower @1004 - isprint=msvcrt.isprint @1005 - ispunct=msvcrt.ispunct @1006 - isspace=msvcrt.isspace @1007 - isupper=msvcrt.isupper @1008 - iswalnum=msvcrt.iswalnum @1009 - iswalpha=msvcrt.iswalpha @1010 - iswascii=msvcrt.iswascii @1011 - iswcntrl=msvcrt.iswcntrl @1012 - iswctype=msvcrt.iswctype @1013 - iswdigit=msvcrt.iswdigit @1014 - iswgraph=msvcrt.iswgraph @1015 - iswlower=msvcrt.iswlower @1016 - iswprint=msvcrt.iswprint @1017 - iswpunct=msvcrt.iswpunct @1018 - iswspace=msvcrt.iswspace @1019 - iswupper=msvcrt.iswupper @1020 - iswxdigit=msvcrt.iswxdigit @1021 - isxdigit=msvcrt.isxdigit @1022 - labs=msvcrt.labs @1023 - ldexp=msvcrt.ldexp @1024 - ldiv=msvcrt.ldiv @1025 - localeconv=msvcrt.localeconv @1026 - localtime=msvcrt.localtime @1027 - log=msvcrt.log @1028 - log10=msvcrt.log10 @1029 - longjmp=msvcrt.longjmp @1030 - malloc=msvcrt.malloc @1031 - mblen=msvcrt.mblen @1032 - mbstowcs=msvcrt.mbstowcs @1033 - mbtowc=msvcrt.mbtowc @1034 - memchr=msvcrt.memchr @1035 - memcmp=msvcrt.memcmp @1036 - memcpy=msvcrt.memcpy @1037 - memmove=msvcrt.memmove @1038 - memset=msvcrt.memset @1039 - mktime=msvcrt.mktime @1040 - modf=msvcrt.modf @1041 - perror=msvcrt.perror @1042 - pow=msvcrt.pow @1043 - printf=msvcrt.printf @1044 - putc=msvcrt.putc @1045 - putchar=msvcrt.putchar @1046 - puts=msvcrt.puts @1047 - putwc=msvcrt.putwc @1048 - putwchar=msvcrt.putwchar @1049 - qsort=msvcrt.qsort @1050 - raise=msvcrt.raise @1051 - rand=msvcrt.rand @1052 - realloc=msvcrt.realloc @1053 - remove=msvcrt.remove @1054 - rename=msvcrt.rename @1055 - rewind=msvcrt.rewind @1056 - scanf=msvcrt.scanf @1057 - setbuf=msvcrt.setbuf @1058 - setlocale=msvcrt.setlocale @1059 - setvbuf=msvcrt.setvbuf @1060 - signal=msvcrt.signal @1061 - sin=msvcrt.sin @1062 - sinh=msvcrt.sinh @1063 - sprintf=msvcrt.sprintf @1064 - sqrt=msvcrt.sqrt @1065 - srand=msvcrt.srand @1066 - sscanf=msvcrt.sscanf @1067 - strcat=msvcrt.strcat @1068 - strchr=msvcrt.strchr @1069 - strcmp=msvcrt.strcmp @1070 - strcoll=msvcrt.strcoll @1071 - strcpy=msvcrt.strcpy @1072 - strcspn=msvcrt.strcspn @1073 - strerror=msvcrt.strerror @1074 - strftime=msvcrt.strftime @1075 - strlen=msvcrt.strlen @1076 - strncat=msvcrt.strncat @1077 - strncmp=msvcrt.strncmp @1078 - strncpy=msvcrt.strncpy @1079 - strpbrk=msvcrt.strpbrk @1080 - strrchr=msvcrt.strrchr @1081 - strspn=msvcrt.strspn @1082 - strstr=msvcrt.strstr @1083 - strtod=msvcrt.strtod @1084 - strtok=msvcrt.strtok @1085 - strtol=msvcrt.strtol @1086 - strtoul=msvcrt.strtoul @1087 - strxfrm=msvcrt.strxfrm @1088 - swprintf=msvcrt.swprintf @1089 - swscanf=msvcrt.swscanf @1090 - system=msvcrt.system @1091 - tan=msvcrt.tan @1092 - tanh=msvcrt.tanh @1093 - time=msvcrt.time @1094 - tmpfile=msvcrt.tmpfile @1095 - tmpnam=msvcrt.tmpnam @1096 - tolower=msvcrt.tolower @1097 - toupper=msvcrt.toupper @1098 - towlower=msvcrt.towlower @1099 - towupper=msvcrt.towupper @1100 - ungetc=msvcrt.ungetc @1101 - ungetwc=msvcrt.ungetwc @1102 - vfprintf=msvcrt.vfprintf @1103 - vfwprintf=msvcrt.vfwprintf @1104 - vprintf=msvcrt.vprintf @1105 - vsprintf=msvcrt.vsprintf @1106 - vswprintf=msvcrt.vswprintf @1107 - vwprintf=msvcrt.vwprintf @1108 - wcscat=msvcrt.wcscat @1109 - wcschr=msvcrt.wcschr @1110 - wcscmp=msvcrt.wcscmp @1111 - wcscoll=msvcrt.wcscoll @1112 - wcscpy=msvcrt.wcscpy @1113 - wcscspn=msvcrt.wcscspn @1114 - wcsftime=msvcrt.wcsftime @1115 - wcslen=msvcrt.wcslen @1116 - wcsncat=msvcrt.wcsncat @1117 - wcsncmp=msvcrt.wcsncmp @1118 - wcsncpy=msvcrt.wcsncpy @1119 - wcspbrk=msvcrt.wcspbrk @1120 - wcsrchr=msvcrt.wcsrchr @1121 - wcsspn=msvcrt.wcsspn @1122 - wcsstr=msvcrt.wcsstr @1123 - wcstod=msvcrt.wcstod @1124 - wcstok=msvcrt.wcstok @1125 - wcstol=msvcrt.wcstol @1126 - wcstombs=msvcrt.wcstombs @1127 - wcstoul=msvcrt.wcstoul @1128 - wcsxfrm=msvcrt.wcsxfrm @1129 - wctomb=msvcrt.wctomb @1130 - wprintf=msvcrt.wprintf @1131 - wscanf=msvcrt.wscanf @1132 Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild (original) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild Mon Jan 14 18:34:43 2008 @@ -1,16 +1,18 @@ -<module name="msvcrt20" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MSVCRT20}" mangledsymbols="yes" installbase="system32" installname="msvcrt20.dll"> - <importlibrary definition="msvcrt20.def" /> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="msvcrt20" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT20}" installbase="system32" installname="msvcrt20.dll" allowwarnings="true" entrypoint="0"> + <importlibrary definition="msvcrt20.spec.def" /> <include base="msvcrt20">.</include> - <define name="_DISABLE_TIDENTS" /> - <define name="__REACTOS__" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="USE_MSVCRT_PREFIX" /> - <define name="_MT" /> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> + <library>msvcrt</library> + <library>kernel32</library> <library>ntdll</library> - <library>kernel32</library> - <library>msvcrt</library> <file>msvcrt20.c</file> - <file>msvcrt20.rc</file> + <file>msvcrt20.spec</file> </module> +</group> Removed: trunk/reactos/dll/win32/msvcrt20/msvcrt20.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.rc (original) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.rc (removed) @@ -1,5 +1,0 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "MSVCRT20.DLL Compatibility Library\0" -#define REACTOS_STR_INTERNAL_NAME "msvcrt20\0" -#define REACTOS_STR_ORIGINAL_FILENAME "msvcrt20.dll\0" -#include <reactos/version.rc> Added: trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec (added) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec Mon Jan 14 18:34:43 2008 @@ -1,0 +1,1127 @@ +# msvcrt20.dll - MS VC++ Run Time Library +@ stub ??0Iostream_init@@QAE@AAVios@@H@Z # +@ stub ??0Iostream_init@@QAE@XZ # +@ stub ??0filebuf@@QAE@ABV0@@Z # +@ stub ??0filebuf@@QAE@H@Z # +@ stub ??0filebuf@@QAE@HPADH@Z # +@ stub ??0filebuf@@QAE@XZ # +@ stub ??0fstream@@QAE@ABV0@@Z # +@ stub ??0fstream@@QAE@H@Z # +@ stub ??0fstream@@QAE@HPADH@Z # +@ stub ??0fstream@@QAE@PBDHH@Z # +@ stub ??0fstream@@QAE@XZ # +@ stub ??0ifstream@@QAE@ABV0@@Z # +@ stub ??0ifstream@@QAE@H@Z # +@ stub ??0ifstream@@QAE@HPADH@Z # +@ stub ??0ifstream@@QAE@PBDHH@Z # +@ stub ??0ifstream@@QAE@XZ # +@ stub ??0ios@@IAE@ABV0@@Z # +@ stub ??0ios@@IAE@XZ # +@ stub ??0ios@@QAE@PAVstreambuf@@@Z # +@ stub ??0iostream@@IAE@ABV0@@Z # +@ stub ??0iostream@@IAE@XZ # +@ stub ??0iostream@@QAE@PAVstreambuf@@@Z # +@ stub ??0istream@@IAE@ABV0@@Z # +@ stub ??0istream@@IAE@XZ # +@ stub ??0istream@@QAE@PAVstreambuf@@@Z # +@ stub ??0istream_withassign@@QAE@ABV0@@Z # +@ stub ??0istream_withassign@@QAE@PAVstreambuf@@@Z # +@ stub ??0istream_withassign@@QAE@XZ # +@ stub ??0istrstream@@QAE@ABV0@@Z # +@ stub ??0istrstream@@QAE@PAD@Z # +@ stub ??0istrstream@@QAE@PADH@Z # +@ stub ??0ofstream@@QAE@ABV0@@Z # +@ stub ??0ofstream@@QAE@H@Z # +@ stub ??0ofstream@@QAE@HPADH@Z # +@ stub ??0ofstream@@QAE@PBDHH@Z # +@ stub ??0ofstream@@QAE@XZ # +@ stub ??0ostream@@IAE@ABV0@@Z # +@ stub ??0ostream@@IAE@XZ # +@ stub ??0ostream@@QAE@PAVstreambuf@@@Z # +@ stub ??0ostream_withassign@@QAE@ABV0@@Z # +@ stub ??0ostream_withassign@@QAE@PAVstreambuf@@@Z # +@ stub ??0ostream_withassign@@QAE@XZ # +@ stub ??0ostrstream@@QAE@ABV0@@Z # +@ stub ??0ostrstream@@QAE@PADHH@Z # +@ stub ??0ostrstream@@QAE@XZ # +@ stub ??0stdiobuf@@QAE@ABV0@@Z # +@ stub ??0stdiobuf@@QAE@PAU_iobuf@@@Z # +@ stub ??0stdiostream@@QAE@ABV0@@Z # +@ stub ??0stdiostream@@QAE@PAU_iobuf@@@Z # +@ stub ??0streambuf@@IAE@PADH@Z # +@ stub ??0streambuf@@IAE@XZ # +@ stub ??0streambuf@@QAE@ABV0@@Z # +@ stub ??0strstream@@QAE@ABV0@@Z # +@ stub ??0strstream@@QAE@PADHH@Z # +@ stub ??0strstream@@QAE@XZ # +@ stub ??0strstreambuf@@QAE@ABV0@@Z # +@ stub ??0strstreambuf@@QAE@H@Z # +@ stub ??0strstreambuf@@QAE@P6APAXJ@ZP6AXPAX@Z@Z # +@ stub ??0strstreambuf@@QAE@PADH0@Z # +@ stub ??0strstreambuf@@QAE@XZ # +@ stub ??1Iostream_init@@QAE@XZ # +@ stub ??1filebuf@@UAE@XZ # +@ stub ??1fstream@@UAE@XZ # +@ stub ??1ifstream@@UAE@XZ # +@ stub ??1ios@@UAE@XZ # +@ stub ??1iostream@@UAE@XZ # +@ stub ??1istream@@UAE@XZ # +@ stub ??1istream_withassign@@UAE@XZ # +@ stub ??1istrstream@@UAE@XZ # +@ stub ??1ofstream@@UAE@XZ # +@ stub ??1ostream@@UAE@XZ # +@ stub ??1ostream_withassign@@UAE@XZ # +@ stub ??1ostrstream@@UAE@XZ # +@ stub ??1stdiobuf@@UAE@XZ # +@ stub ??1stdiostream@@UAE@XZ # +@ stub ??1streambuf@@UAE@XZ # +@ stub ??1strstream@@UAE@XZ # +@ stub ??1strstreambuf@@UAE@XZ # +@ cdecl ??2@YAPAXI@Z(long) msvcrt.??2@YAPAXI@Z +@ cdecl ??3@YAXPAX@Z(ptr) msvcrt.??3@YAXPAX@Z +@ stub ??4Iostream_init@@QAEAAV0@ABV0@@Z # +@ stub ??4filebuf@@QAEAAV0@ABV0@@Z # +@ stub ??4fstream@@QAEAAV0@AAV0@@Z # +@ stub ??4ifstream@@QAEAAV0@ABV0@@Z # +@ stub ??4ios@@IAEAAV0@ABV0@@Z # +@ stub ??4iostream@@IAEAAV0@AAV0@@Z # +@ stub ??4iostream@@IAEAAV0@PAVstreambuf@@@Z # +@ stub ??4istream@@IAEAAV0@ABV0@@Z # +@ stub ??4istream@@IAEAAV0@PAVstreambuf@@@Z # +@ stub ??4istream_withassign@@QAEAAV0@ABV0@@Z # +@ stub ??4istream_withassign@@QAEAAVistream@@ABV1@@Z # +@ stub ??4istream_withassign@@QAEAAVistream@@PAVstreambuf@@@Z # +@ stub ??4istrstream@@QAEAAV0@ABV0@@Z # +@ stub ??4ofstream@@QAEAAV0@ABV0@@Z # +@ stub ??4ostream@@IAEAAV0@ABV0@@Z # +@ stub ??4ostream@@IAEAAV0@PAVstreambuf@@@Z # +@ stub ??4ostream_withassign@@QAEAAV0@ABV0@@Z # +@ stub ??4ostream_withassign@@QAEAAVostream@@ABV1@@Z # +@ stub ??4ostream_withassign@@QAEAAVostream@@PAVstreambuf@@@Z # +@ stub ??4ostrstream@@QAEAAV0@ABV0@@Z # +@ stub ??4stdiobuf@@QAEAAV0@ABV0@@Z # +@ stub ??4stdiostream@@QAEAAV0@AAV0@@Z # +@ stub ??4streambuf@@QAEAAV0@ABV0@@Z # +@ stub ??4strstream@@QAEAAV0@AAV0@@Z # +@ stub ??4strstreambuf@@QAEAAV0@ABV0@@Z # +@ stub ??5istream@@QAEAAV0@AAC@Z # +@ stub ??5istream@@QAEAAV0@AAD@Z # +@ stub ??5istream@@QAEAAV0@AAE@Z # +@ stub ??5istream@@QAEAAV0@AAF@Z # +@ stub ??5istream@@QAEAAV0@AAG@Z # +@ stub ??5istream@@QAEAAV0@AAH@Z # +@ stub ??5istream@@QAEAAV0@AAI@Z # +@ stub ??5istream@@QAEAAV0@AAJ@Z # +@ stub ??5istream@@QAEAAV0@AAK@Z # +@ stub ??5istream@@QAEAAV0@AAM@Z # +@ stub ??5istream@@QAEAAV0@AAN@Z # +@ stub ??5istream@@QAEAAV0@AAO@Z # +@ stub ??5istream@@QAEAAV0@P6AAAV0@AAV0@@Z@Z # +@ stub ??5istream@@QAEAAV0@P6AAAVios@@AAV1@@Z@Z # +@ stub ??5istream@@QAEAAV0@PAC@Z # +@ stub ??5istream@@QAEAAV0@PAD@Z # +@ stub ??5istream@@QAEAAV0@PAE@Z # +@ stub ??5istream@@QAEAAV0@PAVstreambuf@@@Z # +@ stub ??6ostream@@QAEAAV0@C@Z # +@ stub ??6ostream@@QAEAAV0@D@Z # +@ stub ??6ostream@@QAEAAV0@E@Z # +@ stub ??6ostream@@QAEAAV0@F@Z # +@ stub ??6ostream@@QAEAAV0@G@Z # +@ stub ??6ostream@@QAEAAV0@H@Z # +@ stub ??6ostream@@QAEAAV0@I@Z # +@ stub ??6ostream@@QAEAAV0@J@Z # +@ stub ??6ostream@@QAEAAV0@K@Z # +@ stub ??6ostream@@QAEAAV0@M@Z # +@ stub ??6ostream@@QAEAAV0@N@Z # +@ stub ??6ostream@@QAEAAV0@O@Z # +@ stub ??6ostream@@QAEAAV0@P6AAAV0@AAV0@@Z@Z # +@ stub ??6ostream@@QAEAAV0@P6AAAVios@@AAV1@@Z@Z # +@ stub ??6ostream@@QAEAAV0@PAVstreambuf@@@Z # +@ stub ??6ostream@@QAEAAV0@PBC@Z # +@ stub ??6ostream@@QAEAAV0@PBD@Z # +@ stub ??6ostream@@QAEAAV0@PBE@Z # +@ stub ??6ostream@@QAEAAV0@PBX@Z # +@ stub ??7ios@@QBEHXZ # +@ stub ??Bios@@QBEPAXXZ # +@ stub ??_7filebuf@@6B@ # +@ stub ??_7fstream@@6B@ # +@ stub ??_7ifstream@@6B@ # +@ stub ??_7ios@@6B@ # +@ stub ??_7iostream@@6B@ # +@ stub ??_7istream@@6B@ # +@ stub ??_7istream_withassign@@6B@ # +@ stub ??_7istrstream@@6B@ # +@ stub ??_7ofstream@@6B@ # +@ stub ??_7ostream@@6B@ # +@ stub ??_7ostream_withassign@@6B@ # +@ stub ??_7ostrstream@@6B@ # +@ stub ??_7stdiobuf@@6B@ # +@ stub ??_7stdiostream@@6B@ # +@ stub ??_7streambuf@@6B@ # +@ stub ??_7strstream@@6B@ # +@ stub ??_7strstreambuf@@6B@ # +@ stub ??_8fstream@@7Bistream@@@ # +@ stub ??_8fstream@@7Bostream@@@ # +@ stub ??_8ifstream@@7B@ # +@ stub ??_8iostream@@7Bistream@@@ # +@ stub ??_8iostream@@7Bostream@@@ # +@ stub ??_8istream@@7B@ # +@ stub ??_8istream_withassign@@7B@ # +@ stub ??_8istrstream@@7B@ # +@ stub ??_8ofstream@@7B@ # +@ stub ??_8ostream@@7B@ # +@ stub ??_8ostream_withassign@@7B@ # +@ stub ??_8ostrstream@@7B@ # +@ stub ??_8stdiostream@@7Bistream@@@ # +@ stub ??_8stdiostream@@7Bostream@@@ # +@ stub ??_8strstream@@7Bistream@@@ # +@ stub ??_8strstream@@7Bostream@@@ # +@ stub ??_Dfstream@@QAEXXZ # +@ stub ??_Difstream@@QAEXXZ # +@ stub ??_Diostream@@QAEXXZ # +@ stub ??_Distream@@QAEXXZ # +@ stub ??_Distream_withassign@@QAEXXZ # +@ stub ??_Distrstream@@QAEXXZ # +@ stub ??_Dofstream@@QAEXXZ # +@ stub ??_Dostream@@QAEXXZ # +@ stub ??_Dostream_withassign@@QAEXXZ # +@ stub ??_Dostrstream@@QAEXXZ # +@ stub ??_Dstdiostream@@QAEXXZ # +@ stub ??_Dstrstream@@QAEXXZ # +@ stub ??_EIostream_init@@QAEPAXI@Z # +@ stub ??_Efilebuf@@UAEPAXI@Z # +@ stub ??_Efstream@@UAEPAXI@Z # +@ stub ??_Eifstream@@UAEPAXI@Z # +@ stub ??_Eios@@UAEPAXI@Z # +@ stub ??_Eiostream@@UAEPAXI@Z # +@ stub ??_Eistream@@UAEPAXI@Z # +@ stub ??_Eistream_withassign@@UAEPAXI@Z # +@ stub ??_Eistrstream@@UAEPAXI@Z # +@ stub ??_Eofstream@@UAEPAXI@Z # +@ stub ??_Eostream@@UAEPAXI@Z # +@ stub ??_Eostream_withassign@@UAEPAXI@Z # +@ stub ??_Eostrstream@@UAEPAXI@Z # +@ stub ??_Estdiobuf@@UAEPAXI@Z # +@ stub ??_Estdiostream@@UAEPAXI@Z # +@ stub ??_Estreambuf@@UAEPAXI@Z # +@ stub ??_Estrstream@@UAEPAXI@Z # +@ stub ??_Estrstreambuf@@UAEPAXI@Z # +@ stub ??_GIostream_init@@QAEPAXI@Z # +@ stub ??_Gfilebuf@@UAEPAXI@Z # +@ stub ??_Gfstream@@UAEPAXI@Z # +@ stub ??_Gifstream@@UAEPAXI@Z # +@ stub ??_Gios@@UAEPAXI@Z # +@ stub ??_Giostream@@UAEPAXI@Z # +@ stub ??_Gistream@@UAEPAXI@Z # +@ stub ??_Gistream_withassign@@UAEPAXI@Z # +@ stub ??_Gistrstream@@UAEPAXI@Z # +@ stub ??_Gofstream@@UAEPAXI@Z # +@ stub ??_Gostream@@UAEPAXI@Z # +@ stub ??_Gostream_withassign@@UAEPAXI@Z # +@ stub ??_Gostrstream@@UAEPAXI@Z # +@ stub ??_Gstdiobuf@@UAEPAXI@Z # +@ stub ??_Gstdiostream@@UAEPAXI@Z # +@ stub ??_Gstreambuf@@UAEPAXI@Z # +@ stub ??_Gstrstream@@UAEPAXI@Z # +@ stub ??_Gstrstreambuf@@UAEPAXI@Z # +@ cdecl ?_query_new_handler@@YAP6AHI@ZXZ() msvcrt.?_query_new_handler@@YAP6AHI@ZXZ +@ cdecl ?_query_new_mode@@YAHXZ() msvcrt.?_query_new_mode@@YAHXZ +@ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z +@ cdecl ?_set_new_mode@@YAHH@Z(long) msvcrt.?_set_new_mode@@YAHH@Z +@ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z +@ stub ?adjustfield@ios@@2JB # +@ stub ?allocate@streambuf@@IAEHXZ # +@ stub ?attach@filebuf@@QAEPAV1@H@Z # +@ stub ?attach@fstream@@QAEXH@Z # +@ stub ?attach@ifstream@@QAEXH@Z # +@ stub ?attach@ofstream@@QAEXH@Z # +@ stub ?bad@ios@@QBEHXZ # +@ stub ?base@streambuf@@IBEPADXZ # +@ stub ?basefield@ios@@2JB # +@ stub ?binary@filebuf@@2HB # +@ stub ?bitalloc@ios@@SAJXZ # +@ stub ?blen@streambuf@@IBEHXZ # +@ stub ?cerr@@3Vostream_withassign@@A # +@ stub ?cin@@3Vistream_withassign@@A # +@ stub ?clear@ios@@QAEXH@Z # +@ stub ?clog@@3Vostream_withassign@@A # +@ stub ?close@filebuf@@QAEPAV1@XZ # +@ stub ?close@fstream@@QAEXXZ # +@ stub ?close@ifstream@@QAEXXZ # +@ stub ?close@ofstream@@QAEXXZ # +@ stub ?clrlock@ios@@QAAXXZ # +@ stub ?clrlock@streambuf@@QAEXXZ # +@ stub ?cout@@3Vostream_withassign@@A # +@ stub ?dbp@streambuf@@QAEXXZ # +@ stub ?dec@@YAAAVios@@AAV1@@Z # +@ stub ?delbuf@ios@@QAEXH@Z # +@ stub ?delbuf@ios@@QBEHXZ # +@ stub ?doallocate@streambuf@@MAEHXZ # +@ stub ?doallocate@strstreambuf@@MAEHXZ # +@ stub ?eatwhite@istream@@QAEXXZ # +@ stub ?eback@streambuf@@IBEPADXZ # +@ stub ?ebuf@streambuf@@IBEPADXZ # +@ stub ?egptr@streambuf@@IBEPADXZ # +@ stub ?endl@@YAAAVostream@@AAV1@@Z # +@ stub ?ends@@YAAAVostream@@AAV1@@Z # +@ stub ?eof@ios@@QBEHXZ # +@ stub ?epptr@streambuf@@IBEPADXZ # +@ stub ?fLockcInit@ios@@0HA # +@ stub ?fail@ios@@QBEHXZ # +@ stub ?fd@filebuf@@QBEHXZ # +@ stub ?fd@fstream@@QBEHXZ # +@ stub ?fd@ifstream@@QBEHXZ # +@ stub ?fd@ofstream@@QBEHXZ # +@ stub ?fill@ios@@QAEDD@Z # +@ stub ?fill@ios@@QBEDXZ # +@ stub ?flags@ios@@QAEJJ@Z # +@ stub ?flags@ios@@QBEJXZ # +@ stub ?floatfield@ios@@2JB # +@ stub ?flush@@YAAAVostream@@AAV1@@Z # +@ stub ?flush@ostream@@QAEAAV1@XZ # +@ stub ?freeze@strstreambuf@@QAEXH@Z # +@ stub ?gbump@streambuf@@IAEXH@Z # +@ stub ?gcount@istream@@QBEHXZ # +@ stub ?get@istream@@QAEAAV1@AAC@Z # +@ stub ?get@istream@@QAEAAV1@AAD@Z # +@ stub ?get@istream@@QAEAAV1@AAE@Z # +@ stub ?get@istream@@QAEAAV1@AAVstreambuf@@D@Z # +@ stub ?get@istream@@QAEAAV1@PACHD@Z # +@ stub ?get@istream@@QAEAAV1@PADHD@Z # +@ stub ?get@istream@@QAEAAV1@PAEHD@Z # +@ stub ?get@istream@@QAEHXZ # +@ stub ?getdouble@istream@@AAEHPADH@Z # +@ stub ?getint@istream@@AAEHPAD@Z # +@ stub ?getline@istream@@QAEAAV1@PACHD@Z # +@ stub ?getline@istream@@QAEAAV1@PADHD@Z # +@ stub ?getline@istream@@QAEAAV1@PAEHD@Z # +@ stub ?good@ios@@QBEHXZ # +@ stub ?gptr@streambuf@@IBEPADXZ # +@ stub ?hex@@YAAAVios@@AAV1@@Z # +@ stub ?ignore@istream@@QAEAAV1@HH@Z # +@ stub ?in_avail@streambuf@@QBEHXZ # +@ stub ?init@ios@@IAEXPAVstreambuf@@@Z # +@ stub ?ipfx@istream@@QAEHH@Z # +@ stub ?is_open@filebuf@@QBEHXZ # +@ stub ?is_open@fstream@@QBEHXZ # +@ stub ?is_open@ifstream@@QBEHXZ # +@ stub ?is_open@ofstream@@QBEHXZ # +@ stub ?isfx@istream@@QAEXXZ # +@ stub ?iword@ios@@QBEAAJH@Z # +@ stub ?lock@ios@@QAAXXZ # +@ stub ?lock@streambuf@@QAEXXZ # +@ stub ?lockbuf@ios@@QAAXXZ # +@ stub ?lockc@ios@@KAXXZ # +@ stub ?lockptr@ios@@IAEPAU_RTL_CRITICAL_SECTION@@XZ # +@ stub ?lockptr@streambuf@@IAEPAU_RTL_CRITICAL_SECTION@@XZ # +@ stub ?oct@@YAAAVios@@AAV1@@Z # +@ stub ?open@filebuf@@QAEPAV1@PBDHH@Z # +@ stub ?open@fstream@@QAEXPBDHH@Z # +@ stub ?open@ifstream@@QAEXPBDHH@Z # +@ stub ?open@ofstream@@QAEXPBDHH@Z # +@ stub ?openprot@filebuf@@2HB # +@ stub ?opfx@ostream@@QAEHXZ # +@ stub ?osfx@ostream@@QAEXXZ # +@ stub ?out_waiting@streambuf@@QBEHXZ # +@ stub ?overflow@filebuf@@UAEHH@Z # +@ stub ?overflow@stdiobuf@@UAEHH@Z # +@ stub ?overflow@strstreambuf@@UAEHH@Z # +@ stub ?pbackfail@stdiobuf@@UAEHH@Z # +@ stub ?pbackfail@streambuf@@UAEHH@Z # +@ stub ?pbase@streambuf@@IBEPADXZ # +@ stub ?pbump@streambuf@@IAEXH@Z # +@ stub ?pcount@ostrstream@@QBEHXZ # +@ stub ?pcount@strstream@@QBEHXZ # +@ stub ?peek@istream@@QAEHXZ # +@ stub ?pptr@streambuf@@IBEPADXZ # +@ stub ?precision@ios@@QAEHH@Z # +@ stub ?precision@ios@@QBEHXZ # +@ stub ?put@ostream@@QAEAAV1@C@Z # +@ stub ?put@ostream@@QAEAAV1@D@Z # +@ stub ?put@ostream@@QAEAAV1@E@Z # +@ stub ?putback@istream@@QAEAAV1@D@Z # +@ stub ?pword@ios@@QBEAAPAXH@Z # +@ stub ?rdbuf@fstream@@QBEPAVfilebuf@@XZ # +@ stub ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ # +@ stub ?rdbuf@ios@@QBEPAVstreambuf@@XZ # +@ stub ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ # +@ stub ?rdbuf@ofstream@@QBEPAVfilebuf@@XZ # +@ stub ?rdbuf@ostrstream@@QBEPAVstrstreambuf@@XZ # +@ stub ?rdbuf@stdiostream@@QBEPAVstdiobuf@@XZ # +@ stub ?rdbuf@strstream@@QBEPAVstrstreambuf@@XZ # +@ stub ?rdstate@ios@@QBEHXZ # +@ stub ?read@istream@@QAEAAV1@PACH@Z # +@ stub ?read@istream@@QAEAAV1@PADH@Z # +@ stub ?read@istream@@QAEAAV1@PAEH@Z # +@ stub ?sbumpc@streambuf@@QAEHXZ # +@ stub ?seekg@istream@@QAEAAV1@J@Z # +@ stub ?seekg@istream@@QAEAAV1@JW4seek_dir@ios@@@Z # +@ stub ?seekoff@filebuf@@UAEJJW4seek_dir@ios@@H@Z # +@ stub ?seekoff@stdiobuf@@UAEJJW4seek_dir@ios@@H@Z # +@ stub ?seekoff@streambuf@@UAEJJW4seek_dir@ios@@H@Z # +@ stub ?seekoff@strstreambuf@@UAEJJW4seek_dir@ios@@H@Z # +@ stub ?seekp@ostream@@QAEAAV1@J@Z # +@ stub ?seekp@ostream@@QAEAAV1@JW4seek_dir@ios@@@Z # +@ stub ?seekpos@streambuf@@UAEJJH@Z # +@ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ@Z +@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ@Z +@ stub ?setb@streambuf@@IAEXPAD0H@Z # +@ stub ?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z # +@ stub ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z # +@ stub ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z # +@ stub ?setbuf@ofstream@@QAEPAVstreambuf@@PADH@Z # +@ stub ?setbuf@streambuf@@UAEPAV1@PADH@Z # +@ stub ?setbuf@strstreambuf@@UAEPAVstreambuf@@PADH@Z # +@ stub ?setf@ios@@QAEJJ@Z # +@ stub ?setf@ios@@QAEJJJ@Z # +@ stub ?setg@streambuf@@IAEXPAD00@Z # +@ stub ?setlock@ios@@QAAXXZ # +@ stub ?setlock@streambuf@@QAEXXZ # +@ stub ?setmode@filebuf@@QAEHH@Z # +@ stub ?setmode@fstream@@QAEHH@Z # +@ stub ?setmode@ifstream@@QAEHH@Z # +@ stub ?setmode@ofstream@@QAEHH@Z # +@ stub ?setp@streambuf@@IAEXPAD0@Z # +@ stub ?setrwbuf@stdiobuf@@QAEHHH@Z # +@ stub ?sgetc@streambuf@@QAEHXZ # +@ stub ?sgetn@streambuf@@QAEHPADH@Z # +@ stub ?sh_none@filebuf@@2HB # +@ stub ?sh_read@filebuf@@2HB # +@ stub ?sh_write@filebuf@@2HB # +@ stub ?snextc@streambuf@@QAEHXZ # +@ stub ?sputbackc@streambuf@@QAEHD@Z # +@ stub ?sputc@streambuf@@QAEHH@Z # +@ stub ?sputn@streambuf@@QAEHPBDH@Z # +@ stub ?stdiofile@stdiobuf@@QAEPAU_iobuf@@XZ # +@ stub ?stossc@streambuf@@QAEXXZ # +@ stub ?str@istrstream@@QAEPADXZ # +@ stub ?str@ostrstream@@QAEPADXZ # +@ stub ?str@strstream@@QAEPADXZ # +@ stub ?str@strstreambuf@@QAEPADXZ # +@ stub ?sunk_with_stdio@ios@@0HA # +@ stub ?sync@filebuf@@UAEHXZ # +@ stub ?sync@istream@@QAEHXZ # +@ stub ?sync@stdiobuf@@UAEHXZ # +@ stub ?sync@streambuf@@UAEHXZ # +@ stub ?sync@strstreambuf@@UAEHXZ # +@ stub ?sync_with_stdio@ios@@SAXXZ # +@ stub ?tellg@istream@@QAEJXZ # +@ stub ?tellp@ostream@@QAEJXZ # +@ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ +@ stub ?text@filebuf@@2HB # +@ stub ?tie@ios@@QAEPAVostream@@PAV2@@Z # +@ stub ?tie@ios@@QBEPAVostream@@XZ # +@ stub ?unbuffered@streambuf@@IAEXH@Z # +@ stub ?unbuffered@streambuf@@IBEHXZ # +@ stub ?underflow@filebuf@@UAEHXZ # +@ stub ?underflow@stdiobuf@@UAEHXZ # +@ stub ?underflow@strstreambuf@@UAEHXZ # +@ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ +@ stub ?unlock@ios@@QAAXXZ # +@ stub ?unlock@streambuf@@QAEXXZ # +@ stub ?unlockbuf@ios@@QAAXXZ # +@ stub ?unlockc@ios@@KAXXZ # +@ stub ?unsetf@ios@@QAEJJ@Z # +@ stub ?width@ios@@QAEHH@Z # +@ stub ?width@ios@@QBEHXZ # +@ stub ?write@ostream@@QAEAAV1@PBCH@Z # +@ stub ?write@ostream@@QAEAAV1@PBDH@Z # +@ stub ?write@ostream@@QAEAAV1@PBEH@Z # +@ stub ?writepad@ostream@@AAEAAV1@PBD0@Z # +@ stub ?ws@@YAAAVistream@@AAV1@@Z # +@ stub ?x_curindex@ios@@0HA # +@ stub ?x_lockc@ios@@0U_RTL_CRITICAL_SECTION@@A # +@ stub ?x_maxbit@ios@@0JA # +@ stub ?x_statebuf@ios@@0QAJA # +@ stub ?xalloc@ios@@SAHXZ # +@ stub ?xsgetn@streambuf@@UAEHPADH@Z # +@ stub ?xsputn@streambuf@@UAEHPBDH@Z # +@ stub $I10_OUTPUT # +@ cdecl _CIacos() msvcrt._CIacos +@ cdecl _CIasin() msvcrt._CIasin +@ cdecl _CIatan() msvcrt._CIatan +@ cdecl _CIatan2() msvcrt._CIatan2 +@ cdecl _CIcos() msvcrt._CIcos +@ cdecl _CIcosh() msvcrt._CIcosh +@ cdecl _CIexp() msvcrt._CIexp +@ cdecl _CIfmod() msvcrt._CIfmod +@ cdecl _CIlog() msvcrt._CIlog +@ cdecl _CIlog10() msvcrt._CIlog10 +@ cdecl _CIpow() msvcrt._CIpow +@ cdecl _CIsin() msvcrt._CIsin +@ cdecl _CIsinh() msvcrt._CIsinh +@ cdecl _CIsqrt() msvcrt._CIsqrt +@ cdecl _CItan() msvcrt._CItan +@ cdecl _CItanh() msvcrt._CItanh +@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ extern _HUGE msvcrt._HUGE +@ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter +@ cdecl -i386 __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler +@ stdcall __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind +@ cdecl __STRINGTOLD(ptr ptr str long) msvcrt.__STRINGTOLD +@ extern __argc msvcrt.__argc +@ extern __argv msvcrt.__argv +@ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit +@ cdecl __doserrno() msvcrt.__doserrno +@ cdecl __fpecode() msvcrt.__fpecode +@ cdecl __getmainargs(ptr ptr ptr long long) MSVCRT20__getmainargs +@ extern __initenv msvcrt.__initenv +@ cdecl __isascii(long) msvcrt.__isascii +@ cdecl __iscsym(long) msvcrt.__iscsym +@ cdecl __iscsymf(long) msvcrt.__iscsymf +@ cdecl __lconv_init() msvcrt.__lconv_init +@ extern __mb_cur_max msvcrt.__mb_cur_max +@ cdecl __p___argc() msvcrt.__p___argc +@ cdecl __p___argv() msvcrt.__p___argv +@ cdecl __p___initenv() msvcrt.__p___initenv +@ cdecl __p___mb_cur_max() msvcrt.__p___mb_cur_max +@ cdecl __p___wargv() msvcrt.__p___wargv +@ cdecl __p___winitenv() msvcrt.__p___winitenv +@ cdecl __p__acmdln() msvcrt.__p__acmdln +@ cdecl __p__amblksiz() msvcrt.__p__amblksiz +@ cdecl __p__commode() msvcrt.__p__commode +@ cdecl __p__daylight() msvcrt.__p__daylight +@ cdecl __p__environ() msvcrt.__p__environ +@ cdecl __p__fmode() msvcrt.__p__fmode +@ cdecl __p__iob() msvcrt.__p__iob +@ cdecl __p__mbctype() msvcrt.__p__mbctype +@ cdecl __p__osver() msvcrt.__p__osver +@ cdecl __p__pctype() msvcrt.__p__pctype +@ cdecl __p__pgmptr() msvcrt.__p__pgmptr +@ cdecl __p__pwctype() msvcrt.__p__pwctype +@ cdecl __p__timezone() msvcrt.__p__timezone +@ cdecl __p__tzname() msvcrt.__p__tzname +@ cdecl __p__wcmdln() msvcrt.__p__wcmdln +@ cdecl __p__wenviron() msvcrt.__p__wenviron +@ cdecl __p__winmajor() msvcrt.__p__winmajor +@ cdecl __p__winminor() msvcrt.__p__winminor +@ cdecl __p__winver() msvcrt.__p__winver +@ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr +@ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs +@ cdecl __threadhandle() msvcrt.__threadhandle +@ cdecl __threadid() msvcrt.__threadid +@ cdecl __toascii(long) msvcrt.__toascii +@ extern __wargv msvcrt.__wargv +@ cdecl __wgetmainargs(ptr ptr ptr long long) MSVCRT20__wgetmainargs +@ extern __winitenv msvcrt.__winitenv +@ cdecl _abnormal_termination() msvcrt._abnormal_termination +@ cdecl _access(str long) msvcrt._access +@ extern _acmdln msvcrt._acmdln +@ stdcall _adj_fdiv_m16i(long) msvcrt._adj_fdiv_m16i +@ stdcall _adj_fdiv_m32(long) msvcrt._adj_fdiv_m32 +@ stdcall _adj_fdiv_m32i(long) msvcrt._adj_fdiv_m32i +@ stdcall _adj_fdiv_m64(long long) msvcrt._adj_fdiv_m64 +@ cdecl _adj_fdiv_r() msvcrt._adj_fdiv_r +@ stdcall _adj_fdivr_m16i(long) msvcrt._adj_fdivr_m16i +@ stdcall _adj_fdivr_m32(long) msvcrt._adj_fdivr_m32 +@ stdcall _adj_fdivr_m32i(long) msvcrt._adj_fdivr_m32i +@ stdcall _adj_fdivr_m64(long long) msvcrt._adj_fdivr_m64 +@ cdecl _adj_fpatan() msvcrt._adj_fpatan +@ cdecl _adj_fprem() msvcrt._adj_fprem +@ cdecl _adj_fprem1() msvcrt._adj_fprem1 +@ cdecl _adj_fptan() msvcrt._adj_fptan +@ cdecl _adjust_fdiv() msvcrt._adjust_fdiv +@ extern _aexit_rtn msvcrt._aexit_rtn +@ cdecl _amsg_exit(long) msvcrt._amsg_exit +@ cdecl _assert(str str long) msvcrt._assert +@ cdecl _atodbl(ptr str) msvcrt._atodbl +@ cdecl _atoldbl(ptr str) msvcrt._atoldbl +@ cdecl _beep(long long) msvcrt._beep +@ cdecl _beginthread(ptr long ptr) msvcrt._beginthread +@ cdecl _beginthreadex(ptr long ptr ptr long ptr) msvcrt._beginthreadex +@ cdecl _c_exit() msvcrt._c_exit +@ cdecl _cabs(long) msvcrt._cabs +@ cdecl _cexit() msvcrt._cexit +@ cdecl _cgets(str) msvcrt._cgets +@ cdecl _chdir(str) msvcrt._chdir +@ cdecl _chdrive(long) msvcrt._chdrive +@ cdecl _chgsign( double ) msvcrt._chgsign +@ cdecl _chmod(str long) msvcrt._chmod +@ cdecl _chsize(long long) msvcrt._chsize +@ cdecl _clearfp() msvcrt._clearfp +@ cdecl _close(long) msvcrt._close +@ cdecl _commit(long) msvcrt._commit +@ extern _commode msvcrt._commode +@ cdecl _control87(long long) msvcrt._control87 +@ cdecl _controlfp(long long) msvcrt._controlfp +@ cdecl _copysign( double double ) msvcrt._copysign +@ varargs _cprintf(str) msvcrt._cprintf +@ cdecl _cputs(str) msvcrt._cputs +@ cdecl _creat(str long) msvcrt._creat +@ varargs _cscanf(str) msvcrt._cscanf +@ extern _ctype msvcrt._ctype +@ cdecl _cwait(ptr long long) msvcrt._cwait +@ extern _daylight msvcrt._daylight +@ cdecl _dup(long) msvcrt._dup +@ cdecl _dup2(long long) msvcrt._dup2 +@ cdecl _ecvt( double long ptr ptr) msvcrt._ecvt +@ cdecl _endthread() msvcrt._endthread +@ cdecl _endthreadex(long) msvcrt._endthreadex +@ extern _environ msvcrt._environ +@ cdecl _eof(long) msvcrt._eof +@ cdecl _errno() msvcrt._errno +@ cdecl _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2 +@ cdecl _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3 +@ varargs _execl(str str) msvcrt._execl +@ varargs _execle(str str) msvcrt._execle +@ varargs _execlp(str str) msvcrt._execlp +@ varargs _execlpe(str str) msvcrt._execlpe +@ cdecl _execv(str str) msvcrt._execv +@ cdecl _execve(str str str) msvcrt._execve +@ cdecl _execvp(str str) msvcrt._execvp +@ cdecl _execvpe(str str str) msvcrt._execvpe +@ cdecl _exit(long) msvcrt._exit +@ cdecl _expand(ptr long) msvcrt._expand +@ cdecl _fcloseall() msvcrt._fcloseall +@ cdecl _fcvt( double long ptr ptr) msvcrt._fcvt +@ cdecl _fdopen(long str) msvcrt._fdopen +@ cdecl _fgetchar() msvcrt._fgetchar +@ cdecl _fgetwchar() msvcrt._fgetwchar +@ cdecl _filbuf(ptr) msvcrt._filbuf +@ extern _fileinfo msvcrt._fileinfo +@ cdecl _filelength(long) msvcrt._filelength +@ cdecl _fileno(ptr) msvcrt._fileno +@ cdecl _findclose(long) msvcrt._findclose +@ cdecl _findfirst(str ptr) msvcrt._findfirst +@ cdecl _findnext(long ptr) msvcrt._findnext +@ cdecl _finite( double ) msvcrt._finite +@ cdecl _flsbuf(long ptr) msvcrt._flsbuf +@ cdecl _flushall() msvcrt._flushall +@ extern _fmode msvcrt._fmode +@ cdecl _fpclass(double) msvcrt._fpclass +@ cdecl _fpieee_flt(long ptr ptr) msvcrt._fpieee_flt +@ cdecl _fpreset() msvcrt._fpreset +@ cdecl _fputchar(long) msvcrt._fputchar +@ cdecl _fputwchar(long) msvcrt._fputwchar +@ cdecl _fsopen(str str long) msvcrt._fsopen +@ cdecl _fstat(long ptr) msvcrt._fstat +@ cdecl _ftime(ptr) msvcrt._ftime +@ cdecl _ftol() msvcrt._ftol +@ cdecl _fullpath(ptr str long) msvcrt._fullpath +@ cdecl _futime(long ptr) msvcrt._futime +@ cdecl _gcvt( double long str) msvcrt._gcvt +@ cdecl _get_osfhandle(long) msvcrt._get_osfhandle +@ cdecl _getch() msvcrt._getch +@ cdecl _getche() msvcrt._getche +@ cdecl _getcwd(str long) msvcrt._getcwd +@ cdecl _getdcwd(long str long) msvcrt._getdcwd +@ cdecl _getdiskfree(long ptr) msvcrt._getdiskfree +@ cdecl _getdllprocaddr(long str long) msvcrt._getdllprocaddr +@ cdecl _getdrive() msvcrt._getdrive +@ cdecl _getdrives() msvcrt._getdrives +@ cdecl _getmbcp() msvcrt._getmbcp +@ cdecl _getpid() msvcrt._getpid +@ cdecl _getsystime(ptr) msvcrt._getsystime +@ cdecl _getw(ptr) msvcrt._getw +@ cdecl _getws(ptr) msvcrt._getws +@ cdecl _global_unwind2(ptr) msvcrt._global_unwind2 +@ cdecl _heapadd(ptr long) msvcrt._heapadd +@ cdecl _heapchk() msvcrt._heapchk +@ cdecl _heapmin() msvcrt._heapmin +@ cdecl _heapset(long) msvcrt._heapset +@ cdecl _heapused(ptr ptr) msvcrt._heapused +@ cdecl _heapwalk(ptr) msvcrt._heapwalk +@ cdecl _hypot(double double) msvcrt._hypot +@ cdecl _initterm(ptr ptr) msvcrt._initterm +@ extern _iob msvcrt._iob +@ cdecl _isatty(long) msvcrt._isatty +@ cdecl _isctype(long long) msvcrt._isctype +@ cdecl _ismbbalnum(long) msvcrt._ismbbalnum +@ cdecl _ismbbalpha(long) msvcrt._ismbbalpha +@ cdecl _ismbbgraph(long) msvcrt._ismbbgraph +@ cdecl _ismbbkalnum(long) msvcrt._ismbbkalnum +@ cdecl _ismbbkana(long) msvcrt._ismbbkana +@ cdecl _ismbbkprint(long) msvcrt._ismbbkprint +@ cdecl _ismbbkpunct(long) msvcrt._ismbbkpunct +@ cdecl _ismbblead(long) msvcrt._ismbblead +@ cdecl _ismbbprint(long) msvcrt._ismbbprint +@ cdecl _ismbbpunct(long) msvcrt._ismbbpunct +@ cdecl _ismbbtrail(long) msvcrt._ismbbtrail +@ cdecl _ismbcalnum(long) msvcrt._ismbcalnum +@ cdecl _ismbcalpha(long) msvcrt._ismbcalpha +@ cdecl _ismbcdigit(long) msvcrt._ismbcdigit +@ cdecl _ismbcgraph(long) msvcrt._ismbcgraph +@ cdecl _ismbchira(long) msvcrt._ismbchira +@ cdecl _ismbckata(long) msvcrt._ismbckata +@ cdecl _ismbcl0(long) msvcrt._ismbcl0 +@ cdecl _ismbcl1(long) msvcrt._ismbcl1 +@ cdecl _ismbcl2(long) msvcrt._ismbcl2 +@ cdecl _ismbclegal(long) msvcrt._ismbclegal +@ cdecl _ismbclower(long) msvcrt._ismbclower +@ cdecl _ismbcprint(long) msvcrt._ismbcprint +@ cdecl _ismbcpunct(long) msvcrt._ismbcpunct +@ cdecl _ismbcspace(long) msvcrt._ismbcspace +@ cdecl _ismbcsymbol(long) msvcrt._ismbcsymbol +@ cdecl _ismbcupper(long) msvcrt._ismbcupper +@ cdecl _ismbslead(ptr ptr) msvcrt._ismbslead +@ cdecl _ismbstrail(ptr ptr) msvcrt._ismbstrail +@ cdecl _isnan( double ) msvcrt._isnan +@ cdecl _itoa(long ptr long) msvcrt._itoa +@ cdecl _itow(long ptr long) msvcrt._itow +@ cdecl _j0(double) msvcrt._j0 +@ cdecl _j1(double) msvcrt._j1 +@ cdecl _jn(long double) msvcrt._jn +@ cdecl _kbhit() msvcrt._kbhit +@ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind +@ cdecl _loaddll(str) msvcrt._loaddll +@ cdecl _local_unwind2(ptr long) msvcrt._local_unwind2 +@ cdecl _locking(long long long) msvcrt._locking +@ cdecl _logb(double) msvcrt._logb +@ cdecl _longjmpex(ptr long) msvcrt._longjmpex +@ cdecl _lrotl(long long) msvcrt._lrotl +@ cdecl _lrotr(long long) msvcrt._lrotr +@ cdecl _lsearch(ptr ptr long long ptr) msvcrt._lsearch +@ cdecl _lseek(long long long) msvcrt._lseek +@ cdecl _ltoa(long ptr long) msvcrt._ltoa +@ cdecl _ltow(long ptr long) msvcrt._ltow +@ cdecl _makepath(str str str str str) msvcrt._makepath +@ cdecl _matherr(ptr) msvcrt._matherr +@ cdecl _mbbtombc(long) msvcrt._mbbtombc +@ cdecl _mbbtype(long long) msvcrt._mbbtype +@ cdecl _mbccpy(str str) msvcrt._mbccpy +@ cdecl _mbcjistojms(long) msvcrt._mbcjistojms +@ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis +@ cdecl _mbclen(ptr) msvcrt._mbclen +@ cdecl _mbctohira(long) msvcrt._mbctohira +@ cdecl _mbctokata(long) msvcrt._mbctokata +@ cdecl _mbctolower(long) msvcrt._mbctolower +@ cdecl _mbctombb(long) msvcrt._mbctombb +@ cdecl _mbctoupper(long) msvcrt._mbctoupper +@ extern _mbctype msvcrt._mbctype +@ cdecl _mbsbtype(str long) msvcrt._mbsbtype +@ cdecl _mbscat(str str) msvcrt._mbscat +@ cdecl _mbschr(str long) msvcrt._mbschr +@ cdecl _mbscmp(str str) msvcrt._mbscmp +@ cdecl _mbscoll(str str) msvcrt._mbscoll +@ cdecl _mbscpy(ptr str) msvcrt._mbscpy +@ cdecl _mbscspn(str str) msvcrt._mbscspn +@ cdecl _mbsdec(ptr ptr) msvcrt._mbsdec +@ cdecl _mbsdup(str) msvcrt._mbsdup +@ cdecl _mbsicmp(str str) msvcrt._mbsicmp +@ cdecl _mbsicoll(str str) msvcrt._mbsicoll +@ cdecl _mbsinc(str) msvcrt._mbsinc +@ cdecl _mbslen(str) msvcrt._mbslen +@ cdecl _mbslwr(str) msvcrt._mbslwr +@ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat +@ cdecl _mbsnbcmp(str str long) msvcrt._mbsnbcmp +@ cdecl _mbsnbcnt(ptr long) msvcrt._mbsnbcnt +@ cdecl _mbsnbcoll(str str long) msvcrt._mbsnbcoll +@ cdecl _mbsnbcpy(ptr str long) msvcrt._mbsnbcpy +@ cdecl _mbsnbicmp(str str long) msvcrt._mbsnbicmp +@ cdecl _mbsnbicoll(str str long) msvcrt._mbsnbicoll +@ cdecl _mbsnbset(str long long) msvcrt._mbsnbset +@ cdecl _mbsncat(str str long) msvcrt._mbsncat +@ cdecl _mbsnccnt(str long) msvcrt._mbsnccnt +@ cdecl _mbsncmp(str str long) msvcrt._mbsncmp +@ cdecl _mbsncoll(str str long) msvcrt._mbsncoll +@ cdecl _mbsncpy(str str long) msvcrt._mbsncpy +@ cdecl _mbsnextc(str) msvcrt._mbsnextc +@ cdecl _mbsnicmp(str str long) msvcrt._mbsnicmp +@ cdecl _mbsnicoll(str str long) msvcrt._mbsnicoll +@ cdecl _mbsninc(str long) msvcrt._mbsninc +@ cdecl _mbsnset(str long long) msvcrt._mbsnset +@ cdecl _mbspbrk(str str) msvcrt._mbspbrk +@ cdecl _mbsrchr(str long) msvcrt._mbsrchr +@ cdecl _mbsrev(str) msvcrt._mbsrev +@ cdecl _mbsset(str long) msvcrt._mbsset +@ cdecl _mbsspn(str str) msvcrt._mbsspn +@ cdecl _mbsspnp(str str) msvcrt._mbsspnp +@ cdecl _mbsstr(str str) msvcrt._mbsstr +@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstrlen(str) msvcrt._mbstrlen +@ cdecl _mbsupr(str) msvcrt._mbsupr +@ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy +@ cdecl _memicmp(str str long) msvcrt._memicmp +@ cdecl _mkdir(str) msvcrt._mkdir +@ cdecl _mktemp(str) msvcrt._mktemp +@ cdecl _msize(ptr) msvcrt._msize +@ stub _mtlock +@ stub _mtunlock +@ cdecl _nextafter(double double) msvcrt._nextafter +@ cdecl _onexit(ptr) msvcrt._onexit +@ varargs _open(str long) msvcrt._open +@ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle +@ extern _osver msvcrt._osver +@ cdecl _pclose(ptr) msvcrt._pclose +@ extern _pctype msvcrt._pctype +@ extern _pgmptr msvcrt._pgmptr +@ cdecl _pipe(ptr long long) msvcrt._pipe +@ cdecl _popen(str str) msvcrt._popen +@ cdecl _purecall() msvcrt._purecall +@ cdecl _putch(long) msvcrt._putch +@ cdecl _putenv(str) msvcrt._putenv +@ cdecl _putw(long ptr) msvcrt._putw +@ cdecl _putws(wstr) msvcrt._putws +@ extern _pwctype msvcrt._pwctype +@ cdecl _read(long ptr long) msvcrt._read +@ cdecl _rmdir(str) msvcrt._rmdir +@ cdecl _rmtmp() msvcrt._rmtmp +@ cdecl _rotl(long long) msvcrt._rotl +@ cdecl _rotr(long long) msvcrt._rotr +@ cdecl _safe_fdiv() msvcrt._safe_fdiv +@ cdecl _safe_fdivr() msvcrt._safe_fdivr +@ cdecl _safe_fprem() msvcrt._safe_fprem +@ cdecl _safe_fprem1() msvcrt._safe_fprem1 +@ cdecl _scalb( double long) msvcrt._scalb +@ cdecl _searchenv(str str ptr) msvcrt._searchenv +@ stdcall -i386 __seh_longjmp_unwind@4(ptr) msvcrt._seh_longjmp_unwind +@ cdecl _seterrormode(long) msvcrt._seterrormode +@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp +@ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3 +@ cdecl _setmbcp(long) msvcrt._setmbcp +@ cdecl _setmode(long long) msvcrt._setmode +@ cdecl _setsystime(ptr long) msvcrt._setsystime +@ cdecl _sleep(long) msvcrt._sleep +@ varargs _snprintf(str long str) msvcrt._snprintf +@ varargs _snwprintf(wstr long wstr) msvcrt._snwprintf +@ varargs _sopen(str long long) msvcrt._sopen +@ varargs _spawnl(long str str) msvcrt._spawnl +@ varargs _spawnle(long str str) msvcrt._spawnle +@ varargs _spawnlp(long str str) msvcrt._spawnlp +@ varargs _spawnlpe(long str str) msvcrt._spawnlpe +@ cdecl _spawnv(long str ptr) msvcrt._spawnv +@ cdecl _spawnve(long str ptr ptr) msvcrt._spawnve +@ cdecl _spawnvp(long str ptr) msvcrt._spawnvp +@ cdecl _spawnvpe(long str ptr ptr) msvcrt._spawnvpe +@ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath +@ cdecl _stat(str ptr) msvcrt._stat +@ cdecl _statusfp() msvcrt._statusfp +@ cdecl _strcmpi(str str) msvcrt._strcmpi +@ cdecl _strdate(ptr) msvcrt._strdate +@ cdecl _strdup(str) msvcrt._strdup +@ cdecl _strerror(long) msvcrt._strerror +@ cdecl _stricmp(str str) msvcrt._stricmp +@ cdecl _stricoll(str str) msvcrt._stricoll +@ cdecl _strlwr(str) msvcrt._strlwr +@ cdecl _strncoll(str str long) msvcrt._strncoll +@ cdecl _strnicmp(str str long) msvcrt._strnicmp +@ cdecl _strnicoll(str str long) msvcrt._strnicoll +@ cdecl _strnset(str long long) msvcrt._strnset +@ cdecl _strrev(str) msvcrt._strrev +@ cdecl _strset(str long) msvcrt._strset +@ cdecl _strtime(ptr) msvcrt._strtime +@ cdecl _strupr(str) msvcrt._strupr +@ cdecl _swab(str str long) msvcrt._swab +@ extern _sys_errlist msvcrt._sys_errlist +@ extern _sys_nerr msvcrt._sys_nerr +@ cdecl _tccpy(str str) msvcrt._mbccpy +@ cdecl _tclen(ptr) msvcrt._mbclen +@ cdecl _tcschr(str long) msvcrt._mbschr +@ cdecl _tcsclen(str) msvcrt._mbslen +@ cdecl _tcscmp(str str) msvcrt._mbscmp +@ cdecl _tcscspn(str str) msvcrt._mbscspn +@ cdecl _tcsdec(ptr ptr) msvcrt._mbsdec +@ cdecl _tcsicmp(str str) msvcrt._mbsicmp +@ cdecl _tcsinc(str) msvcrt._mbsinc +@ cdecl _tcslwr(str) msvcrt._mbslwr +@ cdecl _tcsnbcnt(ptr long) msvcrt._mbsnbcnt +@ cdecl _tcsncat(str str long) msvcrt._mbsnbcat +@ cdecl _tcsnccat(str str long) msvcrt._mbsncat +@ cdecl _tcsnccmp(str str long) msvcrt._mbsncmp +@ cdecl _tcsnccnt(str long) msvcrt._mbsnccnt +@ cdecl _tcsnccpy(str str long) msvcrt._mbsncpy +@ cdecl _tcsncicmp(str str long) msvcrt._mbsnicmp +@ cdecl _tcsncmp(str str long) msvcrt._mbsnbcmp +@ cdecl _tcsncpy(ptr str long) msvcrt._mbsnbcpy +@ cdecl _tcsncset(str long long) msvcrt._mbsnset +@ cdecl _tcsnextc(str) msvcrt._mbsnextc +@ cdecl _tcsnicmp(str str long) msvcrt._mbsnbicmp +@ cdecl _tcsninc(str long) msvcrt._mbsninc +@ cdecl _tcsnset(str long long) msvcrt._mbsnbset +@ cdecl _tcspbrk(str str) msvcrt._mbspbrk +@ cdecl _tcsrchr(str long) msvcrt._mbsrchr +@ cdecl _tcsrev(str) msvcrt._mbsrev +@ cdecl _tcsset(str long) msvcrt._mbsset +@ cdecl _tcsspn(str str) msvcrt._mbsspn +@ cdecl _tcsspnp(str str) msvcrt._mbsspnp +@ cdecl _tcsstr(str str) msvcrt._mbsstr +@ cdecl _tcstok(str str) msvcrt._mbstok +@ cdecl _tcsupr(str) msvcrt._mbsupr +@ cdecl _tell(long) msvcrt._tell +@ cdecl _tempnam(str str) msvcrt._tempnam +@ extern _timezone msvcrt._timezone +@ cdecl _tolower(long) msvcrt._tolower +@ cdecl _toupper(long) msvcrt._toupper +@ extern _tzname msvcrt._tzname +@ cdecl _tzset() msvcrt._tzset +@ cdecl _ultoa(long ptr long) msvcrt._ultoa +@ cdecl _ultow(long ptr long) msvcrt._ultow +@ cdecl _umask(long) msvcrt._umask +@ cdecl _ungetch(long) msvcrt._ungetch +@ cdecl _unlink(str) msvcrt._unlink +@ cdecl _unloaddll(long) msvcrt._unloaddll +@ cdecl _utime(str ptr) msvcrt._utime +@ cdecl _vsnprintf(ptr long ptr ptr) msvcrt._vsnprintf +@ cdecl _vsnwprintf(ptr long wstr long) msvcrt._vsnwprintf +@ cdecl _waccess(wstr long) msvcrt._waccess +@ cdecl _wasctime(ptr) msvcrt._wasctime +@ cdecl _wchdir(wstr) msvcrt._wchdir +@ cdecl _wchmod(wstr long) msvcrt._wchmod +@ extern _wcmdln msvcrt._wcmdln +@ cdecl _wcreat(wstr long) msvcrt._wcreat +@ cdecl _wcsdup(wstr) msvcrt._wcsdup +@ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp +@ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll +@ cdecl _wcslwr(wstr) msvcrt._wcslwr +@ cdecl _wcsncoll(wstr wstr long) msvcrt._wcsncoll +@ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp +@ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll +@ cdecl _wcsnset(wstr long long) msvcrt._wcsnset +@ cdecl _wcsrev(wstr) msvcrt._wcsrev +@ cdecl _wcsset(wstr long) msvcrt._wcsset +@ cdecl _wcsupr(wstr) msvcrt._wcsupr +@ cdecl _wctime(ptr) msvcrt._wctime +@ extern _wenviron msvcrt._wenviron +@ varargs _wexecl(wstr wstr) msvcrt._wexecl +@ varargs _wexecle(wstr wstr) msvcrt._wexecle +@ varargs _wexeclp(wstr wstr) msvcrt._wexeclp +@ varargs _wexeclpe(wstr wstr) msvcrt._wexeclpe +@ varargs _wexecv(wstr ptr) msvcrt._wexecv +@ varargs _wexecve(wstr ptr ptr) msvcrt._wexecve +@ varargs _wexecvp(wstr ptr) msvcrt._wexecvp +@ varargs _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe +@ cdecl _wfdopen(long wstr) msvcrt._wfdopen +@ cdecl _wfindfirst(wstr ptr) msvcrt._wfindfirst +@ cdecl _wfindnext(long ptr) msvcrt._wfindnext +@ cdecl _wfopen(wstr wstr) msvcrt._wfopen +@ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen +@ cdecl _wfsopen(wstr wstr long) msvcrt._wfsopen +@ cdecl _wfullpath(ptr wstr long) msvcrt._wfullpath +@ cdecl _wgetcwd(wstr long) msvcrt._wgetcwd +@ cdecl _wgetdcwd(long wstr long) msvcrt._wgetdcwd +@ cdecl _wgetenv(wstr) msvcrt._wgetenv +@ extern _winmajor msvcrt._winmajor +@ extern _winminor msvcrt._winminor +@ extern _winver msvcrt._winver +@ cdecl _wmakepath(wstr wstr wstr wstr wstr) msvcrt._wmakepath +@ cdecl _wmkdir(wstr) msvcrt._wmkdir +@ cdecl _wmktemp(wstr) msvcrt._wmktemp +@ varargs _wopen(wstr long) msvcrt._wopen +@ cdecl _wperror(wstr) msvcrt._wperror +@ extern _wpgmptr msvcrt._wpgmptr +@ cdecl _wpopen(wstr wstr) msvcrt._wpopen +@ cdecl _wputenv(wstr) msvcrt._wputenv +@ cdecl _wremove(wstr) msvcrt._wremove +@ cdecl _wrename(wstr wstr) msvcrt._wrename +@ cdecl _write(long ptr long) msvcrt._write +@ cdecl _wrmdir(wstr) msvcrt._wrmdir +@ cdecl _wsearchenv(wstr wstr ptr) msvcrt._wsearchenv +@ cdecl _wsetlocale(long wstr) msvcrt._wsetlocale +@ varargs _wsopen(wstr long long) msvcrt._wsopen +@ varargs _wspawnl(long wstr wstr) msvcrt._wspawnl +@ varargs _wspawnle(long wstr wstr) msvcrt._wspawnle +@ varargs _wspawnlp(long wstr wstr) msvcrt._wspawnlp +@ varargs _wspawnlpe(long wstr wstr) msvcrt._wspawnlpe +@ cdecl _wspawnv(long wstr ptr) msvcrt._wspawnv +@ cdecl _wspawnve(long wstr ptr ptr) msvcrt._wspawnve +@ cdecl _wspawnvp(long wstr ptr) msvcrt._wspawnvp +@ cdecl _wspawnvpe(long wstr ptr ptr) msvcrt._wspawnvpe +@ cdecl _wsplitpath(wstr wstr wstr wstr wstr) msvcrt._wsplitpath +@ cdecl _wstat(wstr ptr) msvcrt._wstat +@ cdecl _wstrdate(ptr) msvcrt._wstrdate +@ cdecl _wstrtime(ptr) msvcrt._wstrtime +@ cdecl _wsystem(wstr) msvcrt._wsystem +@ cdecl _wtempnam(wstr wstr) msvcrt._wtempnam +@ cdecl _wtmpnam(ptr) msvcrt._wtmpnam +@ cdecl _wtoi(wstr) msvcrt._wtoi +@ cdecl _wtol(wstr) msvcrt._wtol +@ cdecl _wunlink(wstr) msvcrt._wunlink +@ cdecl _wutime(wstr ptr) msvcrt._wutime +@ cdecl _y0(double) msvcrt._y0 +@ cdecl _y1(double) msvcrt._y1 +@ cdecl _yn(long double ) msvcrt._yn +@ cdecl abort() msvcrt.abort +@ cdecl abs(long) msvcrt.abs +@ cdecl acos(double) msvcrt.acos +@ cdecl asctime(ptr) msvcrt.asctime +@ cdecl asin(double) msvcrt.asin +@ cdecl atan(double) msvcrt.atan +@ cdecl atan2(double double) msvcrt.atan2 +@ cdecl atexit(ptr) msvcrt.atexit +@ cdecl atof(str) msvcrt.atof +@ cdecl atoi(str) msvcrt.atoi +@ cdecl atol(str) msvcrt.atol +@ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch +@ cdecl calloc(long long) msvcrt.calloc +@ cdecl ceil(double) msvcrt.ceil +@ cdecl clearerr(ptr) msvcrt.clearerr +@ cdecl clock() msvcrt.clock +@ cdecl cos(double) msvcrt.cos +@ cdecl cosh(double) msvcrt.cosh +@ cdecl ctime(ptr) msvcrt.ctime +@ cdecl difftime(long long) msvcrt.difftime +@ cdecl div(long long) msvcrt.div +@ cdecl exit(long) msvcrt.exit +@ cdecl exp(double) msvcrt.exp +@ cdecl fabs(double) msvcrt.fabs +@ cdecl fclose(ptr) msvcrt.fclose +@ cdecl feof(ptr) msvcrt.feof +@ cdecl ferror(ptr) msvcrt.ferror +@ cdecl fflush(ptr) msvcrt.fflush +@ cdecl fgetc(ptr) msvcrt.fgetc +@ cdecl fgetpos(ptr ptr) msvcrt.fgetpos +@ cdecl fgets(ptr long ptr) msvcrt.fgets +@ cdecl fgetwc(ptr) msvcrt.fgetwc +@ cdecl fgetws(ptr long ptr) msvcrt.fgetws +@ cdecl floor(double) msvcrt.floor +@ cdecl fmod(double double) msvcrt.fmod +@ cdecl fopen(str str) msvcrt.fopen +@ varargs fprintf(ptr str) msvcrt.fprintf +@ cdecl fputc(long ptr) msvcrt.fputc +@ cdecl fputs(str ptr) msvcrt.fputs +@ cdecl fputwc(long ptr) msvcrt.fputwc +@ cdecl fputws(wstr ptr) msvcrt.fputws +@ cdecl fread(ptr long long ptr) msvcrt.fread +@ cdecl free(ptr) msvcrt.free +@ cdecl freopen(str str ptr) msvcrt.freopen +@ cdecl frexp(double ptr) msvcrt.frexp +@ varargs fscanf(ptr str) msvcrt.fscanf +@ cdecl fseek(ptr long long) msvcrt.fseek +@ cdecl fsetpos(ptr ptr) msvcrt.fsetpos +@ cdecl ftell(ptr) msvcrt.ftell +@ varargs fwprintf(ptr wstr) msvcrt.fwprintf +@ cdecl fwrite(ptr long long ptr) msvcrt.fwrite +@ varargs fwscanf(ptr wstr) msvcrt.fwscanf +@ cdecl getc(ptr) msvcrt.getc +@ cdecl getchar() msvcrt.getchar +@ cdecl getenv(str) msvcrt.getenv +@ cdecl gets(str) msvcrt.gets +@ cdecl getwc(ptr) msvcrt.getwc +@ cdecl getwchar() msvcrt.getwchar +@ cdecl gmtime(ptr) msvcrt.gmtime +@ cdecl is_wctype(long long) msvcrt.is_wctype +@ cdecl isalnum(long) msvcrt.isalnum +@ cdecl isalpha(long) msvcrt.isalpha +@ cdecl iscntrl(long) msvcrt.iscntrl +@ cdecl isdigit(long) msvcrt.isdigit +@ cdecl isgraph(long) msvcrt.isgraph +@ cdecl isleadbyte(long) msvcrt.isleadbyte +@ cdecl islower(long) msvcrt.islower +@ cdecl isprint(long) msvcrt.isprint +@ cdecl ispunct(long) msvcrt.ispunct +@ cdecl isspace(long) msvcrt.isspace +@ cdecl isupper(long) msvcrt.isupper +@ cdecl iswalnum(long) msvcrt.iswalnum +@ cdecl iswalpha(long) msvcrt.iswalpha +@ cdecl iswascii(long) msvcrt.iswascii +@ cdecl iswcntrl(long) msvcrt.iswcntrl +@ cdecl iswctype(long long) msvcrt.iswctype +@ cdecl iswdigit(long) msvcrt.iswdigit +@ cdecl iswgraph(long) msvcrt.iswgraph +@ cdecl iswlower(long) msvcrt.iswlower +@ cdecl iswprint(long) msvcrt.iswprint +@ cdecl iswpunct(long) msvcrt.iswpunct +@ cdecl iswspace(long) msvcrt.iswspace +@ cdecl iswupper(long) msvcrt.iswupper +@ cdecl iswxdigit(long) msvcrt.iswxdigit +@ cdecl isxdigit(long) msvcrt.isxdigit +@ cdecl labs(long) msvcrt.labs +@ cdecl ldexp( double long) msvcrt.ldexp +@ cdecl ldiv(long long) msvcrt.ldiv +@ cdecl localeconv() msvcrt.localeconv +@ cdecl localtime(ptr) msvcrt.localtime +@ cdecl log(double) msvcrt.log +@ cdecl log10(double) msvcrt.log10 +@ cdecl -i386 longjmp(ptr long) msvcrt.longjmp +@ cdecl malloc(long) msvcrt.malloc +@ cdecl mblen(ptr long) msvcrt.mblen +@ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs +@ cdecl mbtowc(wstr str long) msvcrt.mbtowc +@ cdecl memchr(ptr long long) msvcrt.memchr +@ cdecl memcmp(ptr ptr long) msvcrt.memcmp +@ cdecl memcpy(ptr ptr long) msvcrt.memcpy +@ cdecl memmove(ptr ptr long) msvcrt.memmove +@ cdecl memset(ptr long long) msvcrt.memset +@ cdecl mktime(ptr) msvcrt.mktime +@ cdecl modf(double ptr) msvcrt.modf +@ cdecl perror(str) msvcrt.perror +@ cdecl pow(double double) msvcrt.pow +@ varargs printf(str) msvcrt.printf +@ cdecl putc(long ptr) msvcrt.putc +@ cdecl putchar(long) msvcrt.putchar +@ cdecl puts(str) msvcrt.puts +@ cdecl putwc(long ptr) msvcrt.putwc +@ cdecl putwchar(long) msvcrt.putwchar +@ cdecl qsort(ptr long long ptr) msvcrt.qsort +@ cdecl raise(long) msvcrt.raise +@ cdecl rand() msvcrt.rand +@ cdecl realloc(ptr long) msvcrt.realloc +@ cdecl remove(str) msvcrt.remove +@ cdecl rename(str str) msvcrt.rename +@ cdecl rewind(ptr) msvcrt.rewind +@ varargs scanf(str) msvcrt.scanf +@ cdecl setbuf(ptr ptr) msvcrt.setbuf +@ cdecl setlocale(long str) msvcrt.setlocale +@ cdecl setvbuf(ptr str long long) msvcrt.setvbuf +@ cdecl signal(long long) msvcrt.signal +@ cdecl sin(double) msvcrt.sin +@ cdecl sinh(double) msvcrt.sinh +@ varargs sprintf(ptr str) msvcrt.sprintf +@ cdecl sqrt(double) msvcrt.sqrt +@ cdecl srand(long) msvcrt.srand +@ varargs sscanf(str str) msvcrt.sscanf +@ cdecl strcat(str str) msvcrt.strcat +@ cdecl strchr(str long) msvcrt.strchr +@ cdecl strcmp(str str) msvcrt.strcmp +@ cdecl strcoll(str str) msvcrt.strcoll +@ cdecl strcpy(ptr str) msvcrt.strcpy +@ cdecl strcspn(str str) msvcrt.strcspn +@ cdecl strerror(long) msvcrt.strerror +@ cdecl strftime(str long str ptr) msvcrt.strftime +@ cdecl strlen(str) msvcrt.strlen +@ cdecl strncat(str str long) msvcrt.strncat +@ cdecl strncmp(str str long) msvcrt.strncmp +@ cdecl strncpy(ptr str long) msvcrt.strncpy +@ cdecl strpbrk(str str) msvcrt.strpbrk +@ cdecl strrchr(str long) msvcrt.strrchr +@ cdecl strspn(str str) msvcrt.strspn +@ cdecl strstr(str str) msvcrt.strstr +@ cdecl strtod(str ptr) msvcrt.strtod +@ cdecl strtok(str str) msvcrt.strtok +@ cdecl strtol(str ptr long) msvcrt.strtol +@ cdecl strtoul(str ptr long) msvcrt.strtoul +@ cdecl strxfrm(ptr str long) msvcrt.strxfrm +@ varargs swprintf(wstr wstr) msvcrt.swprintf +@ varargs swscanf(wstr wstr) msvcrt.swscanf +@ cdecl system(str) msvcrt.system +@ cdecl tan(double) msvcrt.tan +@ cdecl tanh(double) msvcrt.tanh +@ cdecl time(ptr) msvcrt.time +@ cdecl tmpfile() msvcrt.tmpfile +@ cdecl tmpnam(ptr) msvcrt.tmpnam +@ cdecl tolower(long) msvcrt.tolower +@ cdecl toupper(long) msvcrt.toupper +@ cdecl towlower(long) msvcrt.towlower +@ cdecl towupper(long) msvcrt.towupper +@ cdecl ungetc(long ptr) msvcrt.ungetc +@ cdecl ungetwc(long ptr) msvcrt.ungetwc +@ cdecl vfprintf(ptr str long) msvcrt.vfprintf +@ cdecl vfwprintf(ptr wstr long) msvcrt.vfwprintf +@ cdecl vprintf(str long) msvcrt.vprintf +@ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf +@ cdecl vswprintf(ptr wstr long) msvcrt.vswprintf +@ cdecl vwprintf(wstr long) msvcrt.vwprintf +@ cdecl wcscat(wstr wstr) msvcrt.wcscat +@ cdecl wcschr(wstr long) msvcrt.wcschr +@ cdecl wcscmp(wstr wstr) msvcrt.wcscmp +@ cdecl wcscoll(wstr wstr) msvcrt.wcscoll +@ cdecl wcscpy(ptr wstr) msvcrt.wcscpy +@ cdecl wcscspn(wstr wstr) msvcrt.wcscspn +@ cdecl wcsftime(ptr long wstr ptr) msvcrt.wcsftime +@ cdecl wcslen(wstr) msvcrt.wcslen +@ cdecl wcsncat(wstr wstr long) msvcrt.wcsncat +@ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp +@ cdecl wcsncpy(ptr wstr long) msvcrt.wcsncpy +@ cdecl wcspbrk(wstr wstr) msvcrt.wcspbrk +@ cdecl wcsrchr(wstr long) msvcrt.wcsrchr +@ cdecl wcsspn(wstr wstr) msvcrt.wcsspn +@ cdecl wcsstr(wstr wstr) msvcrt.wcsstr +@ cdecl wcstod(wstr ptr) msvcrt.wcstod +@ cdecl wcstok(wstr wstr) msvcrt.wcstok +@ cdecl wcstol(wstr ptr long) msvcrt.wcstol +@ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs +@ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul +@ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm +@ cdecl wctomb(ptr long) msvcrt.wctomb +@ varargs wprintf(wstr) msvcrt.wprintf +@ varargs wscanf(wstr) msvcrt.wscanf Propchange: trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 8 months

← Newer
1
...
26
27
28
29
30
31
32
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008