From c04ab166498b5841ecde620a9bd0b74969b01596 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 5 Jul 2023 18:12:27 +1000 Subject: [PATCH] riched20: Remove DECLSPEC_HIDDEN usage. --- dlls/riched20/editor.h | 436 ++++++++++++++++++++++++------------------------ dlls/riched20/rtf.h | 52 +++--- dlls/riched20/txthost.c | 102 +++++------ dlls/riched20/txtsrv.c | 36 ++-- 4 files changed, 313 insertions(+), 313 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index d3e4f49da7b..da7d3bd35fd 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -22,7 +22,7 @@ struct _RTF_Info; -extern HINSTANCE dll_instance DECLSPEC_HIDDEN; +extern HINSTANCE dll_instance; #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN) @@ -47,51 +47,51 @@ static inline const char *debugstr_run( const ME_Run *run ) } /* style.c */ -ME_Style *style_get_insert_style( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; -ME_Style *ME_MakeStyle(CHARFORMAT2W *style) DECLSPEC_HIDDEN; -void ME_AddRefStyle(ME_Style *item) DECLSPEC_HIDDEN; -void ME_DestroyStyle(ME_Style *item) DECLSPEC_HIDDEN; -void ME_ReleaseStyle(ME_Style *item) DECLSPEC_HIDDEN; -ME_Style *ME_ApplyStyle(ME_TextEditor *ed, ME_Style *sSrc, CHARFORMAT2W *style) DECLSPEC_HIDDEN; -void select_style(ME_Context *c, ME_Style *s) DECLSPEC_HIDDEN; -void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; -void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style) DECLSPEC_HIDDEN; -void ME_ClearTempStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]) DECLSPEC_HIDDEN; -void ME_DumpStyle(ME_Style *s) DECLSPEC_HIDDEN; -BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from) DECLSPEC_HIDDEN; -BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) DECLSPEC_HIDDEN; -void ME_CopyCharFormat(CHARFORMAT2W *pDest, const CHARFORMAT2W *pSrc) DECLSPEC_HIDDEN; /* only works with 2W structs */ -void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt) DECLSPEC_HIDDEN; /* ditto */ +ME_Style *style_get_insert_style( ME_TextEditor *editor, ME_Cursor *cursor ); +ME_Style *ME_MakeStyle(CHARFORMAT2W *style); +void ME_AddRefStyle(ME_Style *item); +void ME_DestroyStyle(ME_Style *item); +void ME_ReleaseStyle(ME_Style *item); +ME_Style *ME_ApplyStyle(ME_TextEditor *ed, ME_Style *sSrc, CHARFORMAT2W *style); +void select_style(ME_Context *c, ME_Style *s); +void ME_InitCharFormat2W(CHARFORMAT2W *pFmt); +void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style); +void ME_ClearTempStyle(ME_TextEditor *editor); +void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]); +void ME_DumpStyle(ME_Style *s); +BOOL cfany_to_cf2w(CHARFORMAT2W *to, const CHARFORMAT2W *from); +BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from); +void ME_CopyCharFormat(CHARFORMAT2W *pDest, const CHARFORMAT2W *pSrc); /* only works with 2W structs */ +void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt); /* ditto */ /* list.c */ -void ME_InsertBefore(ME_DisplayItem *diWhere, ME_DisplayItem *diWhat) DECLSPEC_HIDDEN; -void ME_Remove(ME_DisplayItem *diWhere) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_FindItemBack(ME_DisplayItem *di, ME_DIType nTypeOrClass) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_FindItemFwd(ME_DisplayItem *di, ME_DIType nTypeOrClass) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; -void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; -void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; +void ME_InsertBefore(ME_DisplayItem *diWhere, ME_DisplayItem *diWhat); +void ME_Remove(ME_DisplayItem *diWhere); +ME_DisplayItem *ME_FindItemBack(ME_DisplayItem *di, ME_DIType nTypeOrClass); +ME_DisplayItem *ME_FindItemFwd(ME_DisplayItem *di, ME_DIType nTypeOrClass); +ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass); +ME_DisplayItem *ME_MakeDI(ME_DIType type); +void ME_DestroyDisplayItem(ME_DisplayItem *item); +void ME_DumpDocument(ME_TextBuffer *buffer); /* string.c */ -ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; -ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) DECLSPEC_HIDDEN; -ME_String *ME_MakeStringConst(const WCHAR *str, int len) DECLSPEC_HIDDEN; -ME_String *ME_MakeStringEmpty(int len) DECLSPEC_HIDDEN; -void ME_DestroyString(ME_String *s) DECLSPEC_HIDDEN; -BOOL ME_AppendString(ME_String *s, const WCHAR *append, int len) DECLSPEC_HIDDEN; -ME_String *ME_VSplitString(ME_String *orig, int nVPos) DECLSPEC_HIDDEN; -int ME_FindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; -int ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT code) DECLSPEC_HIDDEN; -void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) DECLSPEC_HIDDEN; -BOOL ME_InsertString(ME_String *s, int ofs, const WCHAR *insert, int len) DECLSPEC_HIDDEN; +ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars); +ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars); +ME_String *ME_MakeStringConst(const WCHAR *str, int len); +ME_String *ME_MakeStringEmpty(int len); +void ME_DestroyString(ME_String *s); +BOOL ME_AppendString(ME_String *s, const WCHAR *append, int len); +ME_String *ME_VSplitString(ME_String *orig, int nVPos); +int ME_FindNonWhitespaceV(const ME_String *s, int nVChar); +int ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT code); +void ME_StrDeleteV(ME_String *s, int nVChar, int nChars); +BOOL ME_InsertString(ME_String *s, int ofs, const WCHAR *insert, int len); #define CP_UNICODE 1200 /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ -LPWSTR ME_ToUnicode(LONG codepage, LPVOID psz, INT *len) DECLSPEC_HIDDEN; -void ME_EndToUnicode(LONG codepage, LPVOID psz) DECLSPEC_HIDDEN; +LPWSTR ME_ToUnicode(LONG codepage, LPVOID psz, INT *len); +void ME_EndToUnicode(LONG codepage, LPVOID psz); static inline int ME_IsWSpace(WCHAR ch) { @@ -105,131 +105,131 @@ static inline int ME_CharCompare(WCHAR a, WCHAR b, int caseSensitive) /* note: those two really return the first matching offset (starting from EOS)+1 * in other words, an offset of the first trailing white/black */ -int ME_ReverseFindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; -int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; +int ME_ReverseFindNonWhitespaceV(const ME_String *s, int nVChar); +int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar); /* row.c */ -void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) DECLSPEC_HIDDEN; -void row_first_cursor( ME_Row *row, ME_Cursor *cursor ) DECLSPEC_HIDDEN; -ME_Run *row_first_run( ME_Row *row ) DECLSPEC_HIDDEN; -ME_Row *row_from_cursor( ME_Cursor *cursor ) DECLSPEC_HIDDEN; -ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) DECLSPEC_HIDDEN; -ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; -ME_Row *row_next_all_paras( ME_Row *row ) DECLSPEC_HIDDEN; -ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; -int row_number_from_char_ofs( ME_TextEditor *editor, int ofs ) DECLSPEC_HIDDEN; -ME_Paragraph *row_para( ME_Row *row ) DECLSPEC_HIDDEN; -ME_Row *row_prev_all_paras( ME_Row *row ) DECLSPEC_HIDDEN; +void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ); +void row_first_cursor( ME_Row *row, ME_Cursor *cursor ); +ME_Run *row_first_run( ME_Row *row ); +ME_Row *row_from_cursor( ME_Cursor *cursor ); +ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ); +ME_Row *row_next( ME_Row *row ); +ME_Row *row_next_all_paras( ME_Row *row ); +ME_Run *row_next_run( ME_Row *row, ME_Run *run ); +int row_number_from_char_ofs( ME_TextEditor *editor, int ofs ); +ME_Paragraph *row_para( ME_Row *row ); +ME_Row *row_prev_all_paras( ME_Row *row ); static inline ME_DisplayItem *row_get_di( ME_Row *row ) { return (ME_DisplayItem *)((ptrdiff_t)row - offsetof(ME_DisplayItem, member)); } /* run.c */ -void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; -BOOL cursor_next_run( ME_Cursor *cursor, BOOL all_para ) DECLSPEC_HIDDEN; -BOOL cursor_prev_run( ME_Cursor *cursor, BOOL all_para ) DECLSPEC_HIDDEN; -void editor_propagate_char_ofs( ME_TextEditor *editor, ME_Paragraph *para, ME_Run *run, int shift ) DECLSPEC_HIDDEN; -int run_char_ofs( ME_Run *run, int ofs ) DECLSPEC_HIDDEN; -ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; +void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ); +BOOL cursor_next_run( ME_Cursor *cursor, BOOL all_para ); +BOOL cursor_prev_run( ME_Cursor *cursor, BOOL all_para ); +void editor_propagate_char_ofs( ME_TextEditor *editor, ME_Paragraph *para, ME_Run *run, int shift ); +int run_char_ofs( ME_Run *run, int ofs ); +ME_Run *run_create( ME_Style *s, int nFlags ); ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, - ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; -void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; + ME_Style *style, const WCHAR *str, int len, int flags ); +void ME_CheckCharOffsets(ME_TextEditor *editor); /* this one accounts for 1/2 char tolerance */ -int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BOOL visual_order) DECLSPEC_HIDDEN; -int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, BOOL visual_order) DECLSPEC_HIDDEN; -int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; -int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; -BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; -void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; -ME_Run *run_next( ME_Run *run ) DECLSPEC_HIDDEN; -ME_Run *run_next_all_paras( ME_Run *run ) DECLSPEC_HIDDEN; -ME_Run *run_prev( ME_Run *run ) DECLSPEC_HIDDEN; -ME_Run *run_prev_all_paras( ME_Run *run ) DECLSPEC_HIDDEN; -ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; -void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; +int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BOOL visual_order); +int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, BOOL visual_order); +int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visual_order); +int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order); +BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2); +void run_join( ME_TextEditor *editor, ME_Run *run ); +ME_Run *run_next( ME_Run *run ); +ME_Run *run_next_all_paras( ME_Run *run ); +ME_Run *run_prev( ME_Run *run ); +ME_Run *run_prev_all_paras( ME_Run *run ); +ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ); +void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run); SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, - int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; -void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; -void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; + int startx, int *pAscent, int *pDescent); +void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt); +void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt); void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, - const ME_Cursor *to, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; -void ME_GetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; -void ME_GetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; -void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) DECLSPEC_HIDDEN; + const ME_Cursor *to, CHARFORMAT2W *pFmt); +void ME_GetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt); +void ME_GetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt); +void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod); static inline ME_DisplayItem *run_get_di( ME_Run *run ) { return (ME_DisplayItem *)((ptrdiff_t)run - offsetof(ME_DisplayItem, member)); } /* caret.c */ -void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, int *x, int *y, int *height ) DECLSPEC_HIDDEN; -BOOL cursor_from_coords( ME_TextEditor *editor, int x, int y, ME_Cursor *cursor ) DECLSPEC_HIDDEN; -void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; -int set_selection_cursors(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; -BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; -void hide_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; -void show_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; -void update_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; -void create_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; -void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) DECLSPEC_HIDDEN; -void ME_MouseMove(ME_TextEditor *editor, int x, int y) DECLSPEC_HIDDEN; -BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) DECLSPEC_HIDDEN; +void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, int *x, int *y, int *height ); +BOOL cursor_from_coords( ME_TextEditor *editor, int x, int y, ME_Cursor *cursor ); +void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor); +int set_selection_cursors(ME_TextEditor *editor, int from, int to); +BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs); +void hide_caret(ME_TextEditor *ed); +void show_caret(ME_TextEditor *ed); +void update_caret(ME_TextEditor *ed); +void create_caret(ME_TextEditor *ed); +void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum); +void ME_MouseMove(ME_TextEditor *editor, int x, int y); +BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars); void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, - const WCHAR *str, int len, ME_Style *style) DECLSPEC_HIDDEN; -void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) DECLSPEC_HIDDEN; -int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BOOL final_eop) DECLSPEC_HIDDEN; -BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl) DECLSPEC_HIDDEN; - -int ME_GetCursorOfs(const ME_Cursor *cursor) DECLSPEC_HIDDEN; -int ME_GetSelectionOfs(ME_TextEditor *editor, LONG *from, LONG *to) DECLSPEC_HIDDEN; -int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) DECLSPEC_HIDDEN; -BOOL ME_IsSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_DeleteSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_SendSelChange(ME_TextEditor *editor) DECLSPEC_HIDDEN; -HRESULT editor_insert_oleobj( ME_TextEditor *editor, const REOBJECT *reo ) DECLSPEC_HIDDEN; -BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, BOOL bForce) DECLSPEC_HIDDEN; -int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; -int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; -ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; + const WCHAR *str, int len, ME_Style *style); +void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor); +int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BOOL final_eop); +BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl); + +int ME_GetCursorOfs(const ME_Cursor *cursor); +int ME_GetSelectionOfs(ME_TextEditor *editor, LONG *from, LONG *to); +int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to); +BOOL ME_IsSelection(ME_TextEditor *editor); +void ME_DeleteSelection(ME_TextEditor *editor); +void ME_SendSelChange(ME_TextEditor *editor); +HRESULT editor_insert_oleobj( ME_TextEditor *editor, const REOBJECT *reo ); +BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, BOOL bForce); +int ME_GetTextLength(ME_TextEditor *editor); +int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how); +ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor); /* context.c */ -void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) DECLSPEC_HIDDEN; -void ME_DestroyContext(ME_Context *c) DECLSPEC_HIDDEN; +void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC); +void ME_DestroyContext(ME_Context *c); /* wrap.c */ -BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void para_range_invalidate( ME_TextEditor *editor, ME_Paragraph *start_para, ME_Paragraph *last_para ) DECLSPEC_HIDDEN; -void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; -BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc, BOOL invalidate ) DECLSPEC_HIDDEN; +BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor); +void para_range_invalidate( ME_TextEditor *editor, ME_Paragraph *start_para, ME_Paragraph *last_para ); +void ME_SendRequestResize(ME_TextEditor *editor, BOOL force); +BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc, BOOL invalidate ); /* para.c */ -void editor_get_selection_paras(ME_TextEditor *editor, ME_Paragraph **para, ME_Paragraph **para_end ) DECLSPEC_HIDDEN; -void editor_get_selection_para_fmt( ME_TextEditor *editor, PARAFORMAT2 *fmt ) DECLSPEC_HIDDEN; -void editor_mark_rewrap_all( ME_TextEditor *editor ) DECLSPEC_HIDDEN; -void editor_set_default_para_fmt(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; -BOOL editor_set_selection_para_fmt( ME_TextEditor *editor, const PARAFORMAT2 *fmt ) DECLSPEC_HIDDEN; -void ME_MakeFirstParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_DumpParaStyle(ME_Paragraph *s) DECLSPEC_HIDDEN; -void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) DECLSPEC_HIDDEN; -int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; -ME_Cell *para_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; -void para_destroy( ME_TextEditor *editor, ME_Paragraph *item ) DECLSPEC_HIDDEN; -ME_Row *para_end_row( ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Row *para_first_row( ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; -BOOL para_in_table( ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) DECLSPEC_HIDDEN; -void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; -void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; -void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Paragraph *para_next( ME_Paragraph *para ) DECLSPEC_HIDDEN; -void para_num_clear( struct para_num *pn ) DECLSPEC_HIDDEN; -void para_num_init( ME_Context *c, ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Paragraph *para_prev( ME_Paragraph *para ) DECLSPEC_HIDDEN; +void editor_get_selection_paras(ME_TextEditor *editor, ME_Paragraph **para, ME_Paragraph **para_end ); +void editor_get_selection_para_fmt( ME_TextEditor *editor, PARAFORMAT2 *fmt ); +void editor_mark_rewrap_all( ME_TextEditor *editor ); +void editor_set_default_para_fmt(ME_TextEditor *editor, PARAFORMAT2 *pFmt); +BOOL editor_set_selection_para_fmt( ME_TextEditor *editor, const PARAFORMAT2 *fmt ); +void ME_MakeFirstParagraph(ME_TextEditor *editor); +void ME_DumpParaStyle(ME_Paragraph *s); +void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]); +int get_total_width(ME_TextEditor *editor); +ME_Cell *para_cell( ME_Paragraph *para ); +void para_destroy( ME_TextEditor *editor, ME_Paragraph *item ); +ME_Row *para_end_row( ME_Paragraph *para ); +ME_Run *para_end_run( ME_Paragraph *para ); +ME_Row *para_first_row( ME_Paragraph *para ); +ME_Run *para_first_run( ME_Paragraph *para ); +BOOL para_in_table( ME_Paragraph *para ); +ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ); +void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ); +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ); +void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ); +ME_Paragraph *para_next( ME_Paragraph *para ); +void para_num_clear( struct para_num *pn ); +void para_num_init( ME_Context *c, ME_Paragraph *para ); +ME_Paragraph *para_prev( ME_Paragraph *para ); ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, - const WCHAR *eol_str, int eol_len, int paraFlags ) DECLSPEC_HIDDEN; + const WCHAR *eol_str, int eol_len, int paraFlags ); static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) { @@ -237,82 +237,82 @@ static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) } /* paint.c */ -void editor_draw( ME_TextEditor *editor, HDC hDC, const RECT *update ) DECLSPEC_HIDDEN; -void ME_Repaint(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_RewrapRepaint(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) DECLSPEC_HIDDEN; -void editor_ensure_visible( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; -void ME_InvalidateSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; -BOOL ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator) DECLSPEC_HIDDEN; -int ME_twips2pointsX(const ME_Context *c, int x) DECLSPEC_HIDDEN; -int ME_twips2pointsY(const ME_Context *c, int y) DECLSPEC_HIDDEN; +void editor_draw( ME_TextEditor *editor, HDC hDC, const RECT *update ); +void ME_Repaint(ME_TextEditor *editor); +void ME_RewrapRepaint(ME_TextEditor *editor); +void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now); +void editor_ensure_visible( ME_TextEditor *editor, ME_Cursor *cursor ); +void ME_InvalidateSelection(ME_TextEditor *editor); +BOOL ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator); +int ME_twips2pointsX(const ME_Context *c, int x); +int ME_twips2pointsY(const ME_Context *c, int y); /* scroll functions in paint.c */ -void scroll_abs( ME_TextEditor *editor, int x, int y, BOOL notify ) DECLSPEC_HIDDEN; -void scroll_h_abs( ME_TextEditor *editor, int x, BOOL notify ) DECLSPEC_HIDDEN; -void scroll_v_abs( ME_TextEditor *editor, int y, BOOL notify ) DECLSPEC_HIDDEN; -void ME_ScrollUp(ME_TextEditor *editor, int cy) DECLSPEC_HIDDEN; -void ME_ScrollDown(ME_TextEditor *editor, int cy) DECLSPEC_HIDDEN; -void ME_ScrollLeft(ME_TextEditor *editor, int cx) DECLSPEC_HIDDEN; -void ME_ScrollRight(ME_TextEditor *editor, int cx) DECLSPEC_HIDDEN; -void ME_UpdateScrollBar(ME_TextEditor *editor) DECLSPEC_HIDDEN; +void scroll_abs( ME_TextEditor *editor, int x, int y, BOOL notify ); +void scroll_h_abs( ME_TextEditor *editor, int x, BOOL notify ); +void scroll_v_abs( ME_TextEditor *editor, int y, BOOL notify ); +void ME_ScrollUp(ME_TextEditor *editor, int cy); +void ME_ScrollDown(ME_TextEditor *editor, int cy); +void ME_ScrollLeft(ME_TextEditor *editor, int cx); +void ME_ScrollRight(ME_TextEditor *editor, int cx); +void ME_UpdateScrollBar(ME_TextEditor *editor); /* other functions in paint.c */ -int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; +int ME_GetParaBorderWidth(const ME_Context *c, int flags); /* richole.c */ -void draw_ole( ME_Context *c, int x, int y, ME_Run* run, BOOL selected ) DECLSPEC_HIDDEN; -void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; -void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) DECLSPEC_HIDDEN; -void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; -void richole_release_children( struct text_services *services ) DECLSPEC_HIDDEN; -extern const IRichEditOleVtbl re_ole_vtbl DECLSPEC_HIDDEN; -extern const ITextDocument2OldVtbl text_doc2old_vtbl DECLSPEC_HIDDEN; +void draw_ole( ME_Context *c, int x, int y, ME_Run* run, BOOL selected ); +void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize); +void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags); +void ME_DeleteReObject(struct re_object *re_object); +void richole_release_children( struct text_services *services ); +extern const IRichEditOleVtbl re_ole_vtbl; +extern const ITextDocument2OldVtbl text_doc2old_vtbl; /* editor.c */ -ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; -void ME_DestroyEditor(ME_TextEditor *editor) DECLSPEC_HIDDEN; +ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10); +void ME_DestroyEditor(ME_TextEditor *editor); LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, - LPARAM lParam, HRESULT* phresult ) DECLSPEC_HIDDEN; + LPARAM lParam, HRESULT* phresult ); int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, - const ME_Cursor *start, int srcChars, BOOL bCRLF, BOOL bEOP) DECLSPEC_HIDDEN; -void ME_RTFCharAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; -void ME_RTFParAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; -void ME_RTFTblAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; -void ME_RTFSpecialCharHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; -void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; -extern BOOL me_debug DECLSPEC_HIDDEN; -void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) DECLSPEC_HIDDEN; -int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; + const ME_Cursor *start, int srcChars, BOOL bCRLF, BOOL bEOP); +void ME_RTFCharAttrHook(struct _RTF_Info *info); +void ME_RTFParAttrHook(struct _RTF_Info *info); +void ME_RTFTblAttrHook(struct _RTF_Info *info); +void ME_RTFSpecialCharHook(struct _RTF_Info *info); +void ME_StreamInFill(ME_InStream *stream); +extern BOOL me_debug; +void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len); +int set_selection( ME_TextEditor *editor, int to, int from ); HRESULT editor_copy_or_cut( ME_TextEditor *editor, BOOL cut, ME_Cursor *start, int count, - IDataObject **data_out ) DECLSPEC_HIDDEN; -ME_Paragraph *editor_end_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; -ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; -void editor_set_cursor( ME_TextEditor *editor, int x, int y ) DECLSPEC_HIDDEN; -void link_notify( ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; + IDataObject **data_out ); +ME_Paragraph *editor_end_para( ME_TextEditor *editor ); +ME_Paragraph *editor_first_para( ME_TextEditor *editor ); +void editor_set_cursor( ME_TextEditor *editor, int x, int y ); +void link_notify( ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam ); /* table.c */ -ME_Cell *cell_create( void ) DECLSPEC_HIDDEN; -ME_Paragraph *cell_end_para( ME_Cell *cell ) DECLSPEC_HIDDEN; -ME_Paragraph *cell_first_para( ME_Cell *cell ) DECLSPEC_HIDDEN; -ME_Cell *cell_next( ME_Cell *cell ) DECLSPEC_HIDDEN; -ME_Cell *cell_prev( ME_Cell *cell ) DECLSPEC_HIDDEN; -ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) DECLSPEC_HIDDEN; -void table_handle_tab( ME_TextEditor *editor, BOOL selected_row ) DECLSPEC_HIDDEN; -ME_Paragraph *table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; -ME_Paragraph *table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; -ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; -ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; -void table_move_from_row_start( ME_TextEditor *editor ) DECLSPEC_HIDDEN; -ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; -void table_protect_partial_deletion( ME_TextEditor *editor, ME_Cursor *c, int *num_chars ) DECLSPEC_HIDDEN; -ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Cell *table_row_end_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; -struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef) DECLSPEC_HIDDEN; +ME_Cell *cell_create( void ); +ME_Paragraph *cell_end_para( ME_Cell *cell ); +ME_Paragraph *cell_first_para( ME_Cell *cell ); +ME_Cell *cell_next( ME_Cell *cell ); +ME_Cell *cell_prev( ME_Cell *cell ); +ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ); +void table_handle_tab( ME_TextEditor *editor, BOOL selected_row ); +ME_Paragraph *table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ); +ME_Paragraph *table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ); +ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ); +ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ); +void table_move_from_row_start( ME_TextEditor *editor ); +ME_Paragraph *table_outer_para( ME_Paragraph *para ); +void table_protect_partial_deletion( ME_TextEditor *editor, ME_Cursor *c, int *num_chars ); +ME_Paragraph *table_row_end( ME_Paragraph *para ); +ME_Cell *table_row_end_cell( ME_Paragraph *para ); +ME_Cell *table_row_first_cell( ME_Paragraph *para ); +ME_Paragraph *table_row_start( ME_Paragraph *para ); +struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor); +void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef); static inline ME_DisplayItem *cell_get_di(ME_Cell *cell) { return (ME_DisplayItem *)((ptrdiff_t)cell - offsetof(ME_DisplayItem, member)); @@ -321,7 +321,7 @@ static inline ME_DisplayItem *cell_get_di(ME_Cell *cell) /* txthost.c */ #ifdef __ASM_USE_THISCALL_WRAPPER -extern const struct ITextHost2Vtbl text_host2_stdcall_vtbl DECLSPEC_HIDDEN; +extern const struct ITextHost2Vtbl text_host2_stdcall_vtbl; #define TXTHOST_VTABLE(This) (&text_host2_stdcall_vtbl) #else #define TXTHOST_VTABLE(This) (This)->lpVtbl @@ -381,18 +381,18 @@ extern const struct ITextHost2Vtbl text_host2_stdcall_vtbl DECLSPEC_HIDDEN; #define ITextHost2_TxGetHorzExtent(This,a) TXTHOST_VTABLE(This)->TxGetHorzExtent(This,a) /* undo.c */ -BOOL add_undo_insert_run( ME_TextEditor *, int pos, const WCHAR *str, int len, int flags, ME_Style *style ) DECLSPEC_HIDDEN; -BOOL add_undo_delete_run( ME_TextEditor *, int pos, int len ) DECLSPEC_HIDDEN; -BOOL add_undo_set_para_fmt( ME_TextEditor *, const ME_Paragraph *para ) DECLSPEC_HIDDEN; -BOOL add_undo_set_char_fmt( ME_TextEditor *, int pos, int len, const CHARFORMAT2W *fmt ) DECLSPEC_HIDDEN; -BOOL add_undo_join_paras( ME_TextEditor *, int pos ) DECLSPEC_HIDDEN; -BOOL add_undo_split_para( ME_TextEditor *, const ME_Paragraph *para, ME_String *eol_str, const ME_Cell *cell) DECLSPEC_HIDDEN; -void ME_CommitUndo(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_ContinueCoalescingTransaction(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_CommitCoalescingUndo(ME_TextEditor *editor) DECLSPEC_HIDDEN; -BOOL ME_Undo(ME_TextEditor *editor) DECLSPEC_HIDDEN; -BOOL ME_Redo(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_EmptyUndoStack(ME_TextEditor *editor) DECLSPEC_HIDDEN; +BOOL add_undo_insert_run( ME_TextEditor *, int pos, const WCHAR *str, int len, int flags, ME_Style *style ); +BOOL add_undo_delete_run( ME_TextEditor *, int pos, int len ); +BOOL add_undo_set_para_fmt( ME_TextEditor *, const ME_Paragraph *para ); +BOOL add_undo_set_char_fmt( ME_TextEditor *, int pos, int len, const CHARFORMAT2W *fmt ); +BOOL add_undo_join_paras( ME_TextEditor *, int pos ); +BOOL add_undo_split_para( ME_TextEditor *, const ME_Paragraph *para, ME_String *eol_str, const ME_Cell *cell); +void ME_CommitUndo(ME_TextEditor *editor); +void ME_ContinueCoalescingTransaction(ME_TextEditor *editor); +void ME_CommitCoalescingUndo(ME_TextEditor *editor); +BOOL ME_Undo(ME_TextEditor *editor); +BOOL ME_Redo(ME_TextEditor *editor); +void ME_EmptyUndoStack(ME_TextEditor *editor); void editor_disable_undo(ME_TextEditor *editor); void editor_enable_undo(ME_TextEditor *editor); @@ -402,9 +402,9 @@ static inline BOOL editor_undo_ignored(ME_TextEditor *editor) } /* txtsrv.c */ -HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10 ) DECLSPEC_HIDDEN; +HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10 ); #ifdef __ASM_USE_THISCALL_WRAPPER -extern const struct ITextServicesVtbl text_services_stdcall_vtbl DECLSPEC_HIDDEN; +extern const struct ITextServicesVtbl text_services_stdcall_vtbl; #define TXTSERV_VTABLE(This) (&text_services_stdcall_vtbl) #else #define TXTSERV_VTABLE(This) (This)->lpVtbl @@ -429,10 +429,10 @@ extern const struct ITextServicesVtbl text_services_stdcall_vtbl DECLSPEC_HIDDEN #define ITextServices_TxGetCachedSize(This,a,b) TXTSERV_VTABLE(This)->TxGetCachedSize(This,a,b) /* writer.c */ -LRESULT ME_StreamOutRange(ME_TextEditor *editor, DWORD dwFormat, const ME_Cursor *start, int nChars, EDITSTREAM *stream) DECLSPEC_HIDDEN; -LRESULT ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream) DECLSPEC_HIDDEN; +LRESULT ME_StreamOutRange(ME_TextEditor *editor, DWORD dwFormat, const ME_Cursor *start, int nChars, EDITSTREAM *stream); +LRESULT ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream); /* clipboard.c */ -HRESULT ME_GetDataObject(ME_TextEditor *editor, const ME_Cursor *start, int nChars, LPDATAOBJECT *lplpdataobj) DECLSPEC_HIDDEN; +HRESULT ME_GetDataObject(ME_TextEditor *editor, const ME_Cursor *start, int nChars, LPDATAOBJECT *lplpdataobj); -void release_typelib(void) DECLSPEC_HIDDEN; +void release_typelib(void); diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 9f15d5ba8e1..f2d446ac5d3 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1182,31 +1182,31 @@ struct _RTF_Info { * Public RTF reader routines */ -void RTFInit (RTF_Info *) DECLSPEC_HIDDEN; -void RTFDestroy(RTF_Info *info) DECLSPEC_HIDDEN; -void RTFSetDestinationCallback (RTF_Info *, int, RTFFuncPtr) DECLSPEC_HIDDEN; -void RTFRead (RTF_Info *) DECLSPEC_HIDDEN; -int RTFGetToken (RTF_Info *) DECLSPEC_HIDDEN; /* writer should rarely need this */ -void RTFSetReadHook (RTF_Info *, RTFFuncPtr) DECLSPEC_HIDDEN; -void RTFRouteToken (RTF_Info *) DECLSPEC_HIDDEN; -void RTFSkipGroup (RTF_Info *) DECLSPEC_HIDDEN; -void RTFReadGroup (RTF_Info *) DECLSPEC_HIDDEN; -int RTFCheckCM (const RTF_Info *, int, int) DECLSPEC_HIDDEN; -int RTFCheckCMM (const RTF_Info *, int, int, int) DECLSPEC_HIDDEN; -int RTFCheckMM (const RTF_Info *, int, int) DECLSPEC_HIDDEN; -RTFFont *RTFGetFont (const RTF_Info *, int) DECLSPEC_HIDDEN; -RTFColor *RTFGetColor (const RTF_Info *, int) DECLSPEC_HIDDEN; -int RTFCharToHex ( char) DECLSPEC_HIDDEN; - -void RTFFlushOutputBuffer( RTF_Info *info ) DECLSPEC_HIDDEN; -void RTFSetEditStream(RTF_Info *info, ME_InStream *stream) DECLSPEC_HIDDEN; - -void WriterInit (RTF_Info *) DECLSPEC_HIDDEN; -int BeginFile (RTF_Info *) DECLSPEC_HIDDEN; - -int RTFCharSetToCodePage(RTF_Info *info, int charset) DECLSPEC_HIDDEN; - -void LookupInit (void) DECLSPEC_HIDDEN; -void LookupCleanup (void) DECLSPEC_HIDDEN; +void RTFInit (RTF_Info *); +void RTFDestroy(RTF_Info *info); +void RTFSetDestinationCallback (RTF_Info *, int, RTFFuncPtr); +void RTFRead (RTF_Info *); +int RTFGetToken (RTF_Info *); /* writer should rarely need this */ +void RTFSetReadHook (RTF_Info *, RTFFuncPtr); +void RTFRouteToken (RTF_Info *); +void RTFSkipGroup (RTF_Info *); +void RTFReadGroup (RTF_Info *); +int RTFCheckCM (const RTF_Info *, int, int); +int RTFCheckCMM (const RTF_Info *, int, int, int); +int RTFCheckMM (const RTF_Info *, int, int); +RTFFont *RTFGetFont (const RTF_Info *, int); +RTFColor *RTFGetColor (const RTF_Info *, int); +int RTFCharToHex ( char); + +void RTFFlushOutputBuffer( RTF_Info *info ); +void RTFSetEditStream(RTF_Info *info, ME_InStream *stream); + +void WriterInit (RTF_Info *); +int BeginFile (RTF_Info *); + +int RTFCharSetToCodePage(RTF_Info *info, int charset); + +void LookupInit (void); +void LookupCleanup (void); #endif diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 412733edaeb..8387b24f828 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -168,35 +168,35 @@ static ULONG WINAPI ITextHostImpl_Release( ITextHost2 *iface ) } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetDC,4) -DECLSPEC_HIDDEN HDC __thiscall ITextHostImpl_TxGetDC( ITextHost2 *iface ) +HDC __thiscall ITextHostImpl_TxGetDC( ITextHost2 *iface ) { struct host *host = impl_from_ITextHost( iface ); return GetDC( host->window ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxReleaseDC,8) -DECLSPEC_HIDDEN INT __thiscall ITextHostImpl_TxReleaseDC( ITextHost2 *iface, HDC hdc ) +INT __thiscall ITextHostImpl_TxReleaseDC( ITextHost2 *iface, HDC hdc ) { struct host *host = impl_from_ITextHost( iface ); return ReleaseDC( host->window, hdc ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowScrollBar,12) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxShowScrollBar( ITextHost2 *iface, INT bar, BOOL show ) +BOOL __thiscall ITextHostImpl_TxShowScrollBar( ITextHost2 *iface, INT bar, BOOL show ) { struct host *host = impl_from_ITextHost( iface ); return ShowScrollBar( host->window, bar, show ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxEnableScrollBar,12) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxEnableScrollBar( ITextHost2 *iface, INT bar, INT arrows ) +BOOL __thiscall ITextHostImpl_TxEnableScrollBar( ITextHost2 *iface, INT bar, INT arrows ) { struct host *host = impl_from_ITextHost( iface ); return EnableScrollBar( host->window, bar, arrows ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollRange,20) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollRange( ITextHost2 *iface, INT bar, LONG min_pos, INT max_pos, BOOL redraw ) +BOOL __thiscall ITextHostImpl_TxSetScrollRange( ITextHost2 *iface, INT bar, LONG min_pos, INT max_pos, BOOL redraw ) { struct host *host = impl_from_ITextHost( iface ); SCROLLINFO info = { .cbSize = sizeof(info), .fMask = SIF_PAGE | SIF_RANGE }; @@ -221,7 +221,7 @@ DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollRange( ITextHost2 *ifac } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollPos,16) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollPos( ITextHost2 *iface, INT bar, INT pos, BOOL redraw ) +BOOL __thiscall ITextHostImpl_TxSetScrollPos( ITextHost2 *iface, INT bar, INT pos, BOOL redraw ) { struct host *host = impl_from_ITextHost( iface ); DWORD style = GetWindowLongW( host->window, GWL_STYLE ); @@ -246,28 +246,28 @@ DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollPos( ITextHost2 *iface, } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxInvalidateRect,12) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxInvalidateRect( ITextHost2 *iface, const RECT *rect, BOOL mode ) +void __thiscall ITextHostImpl_TxInvalidateRect( ITextHost2 *iface, const RECT *rect, BOOL mode ) { struct host *host = impl_from_ITextHost( iface ); InvalidateRect( host->window, rect, mode ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxViewChange,8) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxViewChange( ITextHost2 *iface, BOOL update ) +void __thiscall ITextHostImpl_TxViewChange( ITextHost2 *iface, BOOL update ) { struct host *host = impl_from_ITextHost( iface ); if (update) UpdateWindow( host->window ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxCreateCaret,16) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxCreateCaret( ITextHost2 *iface, HBITMAP bitmap, INT width, INT height ) +BOOL __thiscall ITextHostImpl_TxCreateCaret( ITextHost2 *iface, HBITMAP bitmap, INT width, INT height ) { struct host *host = impl_from_ITextHost( iface ); return CreateCaret( host->window, bitmap, width, height ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowCaret,8) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxShowCaret( ITextHost2 *iface, BOOL show ) +BOOL __thiscall ITextHostImpl_TxShowCaret( ITextHost2 *iface, BOOL show ) { struct host *host = impl_from_ITextHost( iface ); if (show) return ShowCaret( host->window ); @@ -275,27 +275,27 @@ DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxShowCaret( ITextHost2 *iface, BO } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCaretPos,12) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetCaretPos( ITextHost2 *iface, INT x, INT y ) +BOOL __thiscall ITextHostImpl_TxSetCaretPos( ITextHost2 *iface, INT x, INT y ) { return SetCaretPos(x, y); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetTimer,12) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetTimer( ITextHost2 *iface, UINT id, UINT timeout ) +BOOL __thiscall ITextHostImpl_TxSetTimer( ITextHost2 *iface, UINT id, UINT timeout ) { struct host *host = impl_from_ITextHost( iface ); return SetTimer( host->window, id, timeout, NULL ) != 0; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxKillTimer,8) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxKillTimer( ITextHost2 *iface, UINT id ) +void __thiscall ITextHostImpl_TxKillTimer( ITextHost2 *iface, UINT id ) { struct host *host = impl_from_ITextHost( iface ); KillTimer( host->window, id ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScrollWindowEx,32) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxScrollWindowEx( ITextHost2 *iface, INT dx, INT dy, const RECT *scroll, +void __thiscall ITextHostImpl_TxScrollWindowEx( ITextHost2 *iface, INT dx, INT dy, const RECT *scroll, const RECT *clip, HRGN update_rgn, RECT *update_rect, UINT flags ) { @@ -304,7 +304,7 @@ DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxScrollWindowEx( ITextHost2 *ifac } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCapture,8) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetCapture( ITextHost2 *iface, BOOL capture ) +void __thiscall ITextHostImpl_TxSetCapture( ITextHost2 *iface, BOOL capture ) { struct host *host = impl_from_ITextHost( iface ); if (capture) SetCapture( host->window ); @@ -312,34 +312,34 @@ DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetCapture( ITextHost2 *iface, B } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetFocus,4) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetFocus( ITextHost2 *iface ) +void __thiscall ITextHostImpl_TxSetFocus( ITextHost2 *iface ) { struct host *host = impl_from_ITextHost( iface ); SetFocus( host->window ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCursor,12) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetCursor( ITextHost2 *iface, HCURSOR cursor, BOOL text ) +void __thiscall ITextHostImpl_TxSetCursor( ITextHost2 *iface, HCURSOR cursor, BOOL text ) { SetCursor( cursor ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScreenToClient,8) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxScreenToClient( ITextHost2 *iface, POINT *pt ) +BOOL __thiscall ITextHostImpl_TxScreenToClient( ITextHost2 *iface, POINT *pt ) { struct host *host = impl_from_ITextHost( iface ); return ScreenToClient( host->window, pt ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxClientToScreen,8) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxClientToScreen( ITextHost2 *iface, POINT *pt ) +BOOL __thiscall ITextHostImpl_TxClientToScreen( ITextHost2 *iface, POINT *pt ) { struct host *host = impl_from_ITextHost( iface ); return ClientToScreen( host->window, pt ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxActivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxActivate( ITextHost2 *iface, LONG *old_state ) +HRESULT __thiscall ITextHostImpl_TxActivate( ITextHost2 *iface, LONG *old_state ) { struct host *host = impl_from_ITextHost( iface ); *old_state = HandleToLong( SetActiveWindow( host->window ) ); @@ -347,14 +347,14 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxActivate( ITextHost2 *iface, } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxDeactivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxDeactivate( ITextHost2 *iface, LONG new_state ) +HRESULT __thiscall ITextHostImpl_TxDeactivate( ITextHost2 *iface, LONG new_state ) { HWND ret = SetActiveWindow( LongToHandle( new_state ) ); return ret ? S_OK : E_FAIL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetClientRect,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetClientRect( ITextHost2 *iface, RECT *rect ) +HRESULT __thiscall ITextHostImpl_TxGetClientRect( ITextHost2 *iface, RECT *rect ) { struct host *host = impl_from_ITextHost( iface ); @@ -370,20 +370,20 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetClientRect( ITextHost2 *if } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetViewInset,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetViewInset( ITextHost2 *iface, RECT *rect ) +HRESULT __thiscall ITextHostImpl_TxGetViewInset( ITextHost2 *iface, RECT *rect ) { SetRectEmpty( rect ); return S_OK; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetCharFormat,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetCharFormat( ITextHost2 *iface, const CHARFORMATW **ppCF ) +HRESULT __thiscall ITextHostImpl_TxGetCharFormat( ITextHost2 *iface, const CHARFORMATW **ppCF ) { return E_NOTIMPL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetParaFormat,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetParaFormat( ITextHost2 *iface, const PARAFORMAT **fmt ) +HRESULT __thiscall ITextHostImpl_TxGetParaFormat( ITextHost2 *iface, const PARAFORMAT **fmt ) { struct host *host = impl_from_ITextHost( iface ); *fmt = (const PARAFORMAT *)&host->para_fmt; @@ -391,7 +391,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetParaFormat( ITextHost2 *if } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSysColor,8) -DECLSPEC_HIDDEN COLORREF __thiscall ITextHostImpl_TxGetSysColor( ITextHost2 *iface, int index ) +COLORREF __thiscall ITextHostImpl_TxGetSysColor( ITextHost2 *iface, int index ) { struct host *host = impl_from_ITextHost( iface ); @@ -400,21 +400,21 @@ DECLSPEC_HIDDEN COLORREF __thiscall ITextHostImpl_TxGetSysColor( ITextHost2 *ifa } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetBackStyle,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetBackStyle( ITextHost2 *iface, TXTBACKSTYLE *style ) +HRESULT __thiscall ITextHostImpl_TxGetBackStyle( ITextHost2 *iface, TXTBACKSTYLE *style ) { *style = TXTBACK_OPAQUE; return S_OK; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetMaxLength,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetMaxLength( ITextHost2 *iface, DWORD *length ) +HRESULT __thiscall ITextHostImpl_TxGetMaxLength( ITextHost2 *iface, DWORD *length ) { *length = INFINITE; return S_OK; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetScrollBars,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost2 *iface, DWORD *scrollbars ) +HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost2 *iface, DWORD *scrollbars ) { struct host *host = impl_from_ITextHost( iface ); @@ -423,7 +423,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost2 *if } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPasswordChar,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPasswordChar( ITextHost2 *iface, WCHAR *c ) +HRESULT __thiscall ITextHostImpl_TxGetPasswordChar( ITextHost2 *iface, WCHAR *c ) { struct host *host = impl_from_ITextHost( iface ); @@ -432,32 +432,32 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPasswordChar( ITextHost2 * } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetAcceleratorPos,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetAcceleratorPos( ITextHost2 *iface, LONG *pos ) +HRESULT __thiscall ITextHostImpl_TxGetAcceleratorPos( ITextHost2 *iface, LONG *pos ) { *pos = -1; return S_OK; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetExtent,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetExtent( ITextHost2 *iface, SIZEL *extent ) +HRESULT __thiscall ITextHostImpl_TxGetExtent( ITextHost2 *iface, SIZEL *extent ) { return E_NOTIMPL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxCharFormatChange,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_OnTxCharFormatChange( ITextHost2 *iface, const CHARFORMATW *pcf ) +HRESULT __thiscall ITextHostImpl_OnTxCharFormatChange( ITextHost2 *iface, const CHARFORMATW *pcf ) { return S_OK; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxParaFormatChange,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_OnTxParaFormatChange( ITextHost2 *iface, const PARAFORMAT *ppf ) +HRESULT __thiscall ITextHostImpl_OnTxParaFormatChange( ITextHost2 *iface, const PARAFORMAT *ppf ) { return S_OK; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost2 *iface, DWORD mask, DWORD *bits ) +HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost2 *iface, DWORD mask, DWORD *bits ) { struct host *host = impl_from_ITextHost( iface ); @@ -466,7 +466,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost2 * } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify,12) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DWORD iNotify, void *pv ) +HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DWORD iNotify, void *pv ) { struct host *host = impl_from_ITextHost( iface ); UINT id; @@ -523,21 +523,21 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DW } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmGetContext,4) -DECLSPEC_HIDDEN HIMC __thiscall ITextHostImpl_TxImmGetContext( ITextHost2 *iface ) +HIMC __thiscall ITextHostImpl_TxImmGetContext( ITextHost2 *iface ) { struct host *host = impl_from_ITextHost( iface ); return ImmGetContext( host->window ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmReleaseContext,8) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxImmReleaseContext( ITextHost2 *iface, HIMC context ) +void __thiscall ITextHostImpl_TxImmReleaseContext( ITextHost2 *iface, HIMC context ) { struct host *host = impl_from_ITextHost( iface ); ImmReleaseContext( host->window, context ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHost2 *iface, LONG *width ) +HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHost2 *iface, LONG *width ) { struct host *host = impl_from_ITextHost( iface ); @@ -546,13 +546,13 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHo } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxIsDoubleClickPending,4) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxIsDoubleClickPending( ITextHost2 *iface ) +BOOL __thiscall ITextHostImpl_TxIsDoubleClickPending( ITextHost2 *iface ) { return FALSE; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetWindow,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetWindow( ITextHost2 *iface, HWND *hwnd ) +HRESULT __thiscall ITextHostImpl_TxGetWindow( ITextHost2 *iface, HWND *hwnd ) { struct host *host = impl_from_ITextHost( iface ); *hwnd = host->window; @@ -560,61 +560,61 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetWindow( ITextHost2 *iface, } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetForegroundWindow,4) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxSetForegroundWindow( ITextHost2 *iface ) +HRESULT __thiscall ITextHostImpl_TxSetForegroundWindow( ITextHost2 *iface ) { return E_NOTIMPL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPalette,4) -DECLSPEC_HIDDEN HPALETTE __thiscall ITextHostImpl_TxGetPalette( ITextHost2 *iface ) +HPALETTE __thiscall ITextHostImpl_TxGetPalette( ITextHost2 *iface ) { return NULL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetEastAsianFlags,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetEastAsianFlags( ITextHost2 *iface, LONG *flags ) +HRESULT __thiscall ITextHostImpl_TxGetEastAsianFlags( ITextHost2 *iface, LONG *flags ) { return E_NOTIMPL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCursor2,12) -DECLSPEC_HIDDEN HCURSOR __thiscall ITextHostImpl_TxSetCursor2( ITextHost2 *iface, HCURSOR cursor, BOOL text ) +HCURSOR __thiscall ITextHostImpl_TxSetCursor2( ITextHost2 *iface, HCURSOR cursor, BOOL text ) { return NULL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxFreeTextServicesNotification,4) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxFreeTextServicesNotification( ITextHost2 *iface ) +void __thiscall ITextHostImpl_TxFreeTextServicesNotification( ITextHost2 *iface ) { return; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetEditStyle,12) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetEditStyle( ITextHost2 *iface, DWORD item, DWORD *data ) +HRESULT __thiscall ITextHostImpl_TxGetEditStyle( ITextHost2 *iface, DWORD item, DWORD *data ) { return E_NOTIMPL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetWindowStyles,12) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetWindowStyles( ITextHost2 *iface, DWORD *style, DWORD *ex_style ) +HRESULT __thiscall ITextHostImpl_TxGetWindowStyles( ITextHost2 *iface, DWORD *style, DWORD *ex_style ) { return E_NOTIMPL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowDropCaret,16) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxShowDropCaret( ITextHost2 *iface, BOOL show, HDC hdc, const RECT *rect ) +HRESULT __thiscall ITextHostImpl_TxShowDropCaret( ITextHost2 *iface, BOOL show, HDC hdc, const RECT *rect ) { return E_NOTIMPL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxDestroyCaret,4) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxDestroyCaret( ITextHost2 *iface ) +HRESULT __thiscall ITextHostImpl_TxDestroyCaret( ITextHost2 *iface ) { return E_NOTIMPL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetHorzExtent,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetHorzExtent( ITextHost2 *iface, LONG *horz_extent ) +HRESULT __thiscall ITextHostImpl_TxGetHorzExtent( ITextHost2 *iface, LONG *horz_extent ) { return E_NOTIMPL; } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 55e0c7e64bb..c6e3b93d58b 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -117,7 +117,7 @@ static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSendMessage,20) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSendMessage( ITextServices *iface, UINT msg, WPARAM wparam, +HRESULT __thiscall fnTextSrv_TxSendMessage( ITextServices *iface, UINT msg, WPARAM wparam, LPARAM lparam, LRESULT *result ) { struct text_services *services = impl_from_ITextServices( iface ); @@ -150,7 +150,7 @@ static HRESULT update_client_rect( struct text_services *services, const RECT *c } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxDraw,52) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD aspect, LONG index, void *aspect_info, +HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD aspect, LONG index, void *aspect_info, DVTARGETDEVICE *td, HDC draw, HDC target, const RECTL *bounds, const RECTL *mf_bounds, RECT *update, BOOL (CALLBACK *continue_fn)(DWORD), DWORD continue_param, @@ -194,7 +194,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetHScroll,24) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetHScroll( ITextServices *iface, LONG *min_pos, LONG *max_pos, LONG *pos, +HRESULT __thiscall fnTextSrv_TxGetHScroll( ITextServices *iface, LONG *min_pos, LONG *max_pos, LONG *pos, LONG *page, BOOL *enabled ) { struct text_services *services = impl_from_ITextServices( iface ); @@ -208,7 +208,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetHScroll( ITextServices *iface, } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetVScroll,24) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetVScroll( ITextServices *iface, LONG *min_pos, LONG *max_pos, LONG *pos, +HRESULT __thiscall fnTextSrv_TxGetVScroll( ITextServices *iface, LONG *min_pos, LONG *max_pos, LONG *pos, LONG *page, BOOL *enabled ) { struct text_services *services = impl_from_ITextServices( iface ); @@ -222,7 +222,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetVScroll( ITextServices *iface, } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxSetCursor,40) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxSetCursor( ITextServices *iface, DWORD aspect, LONG index, +HRESULT __thiscall fnTextSrv_OnTxSetCursor( ITextServices *iface, DWORD aspect, LONG index, void *aspect_info, DVTARGETDEVICE *td, HDC draw, HDC target, const RECT *client, INT x, INT y ) { @@ -240,7 +240,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxSetCursor( ITextServices *iface } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxQueryHitPoint,44) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxQueryHitPoint(ITextServices *iface, DWORD dwDrawAspect, LONG lindex, +HRESULT __thiscall fnTextSrv_TxQueryHitPoint(ITextServices *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hdcDraw, HDC hicTargetDev, LPCRECT lprcClient, INT x, INT y, DWORD *pHitResult) @@ -252,7 +252,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxQueryHitPoint(ITextServices *ifac } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceActivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate( ITextServices *iface, const RECT *client ) +HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate( ITextServices *iface, const RECT *client ) { struct text_services *services = impl_from_ITextServices( iface ); HRESULT hr; @@ -272,7 +272,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate( ITextServices } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceDeactivate,4) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceDeactivate(ITextServices *iface) +HRESULT __thiscall fnTextSrv_OnTxInPlaceDeactivate(ITextServices *iface) { struct text_services *services = impl_from_ITextServices( iface ); @@ -282,7 +282,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceDeactivate(ITextServices } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIActivate,4) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxUIActivate(ITextServices *iface) +HRESULT __thiscall fnTextSrv_OnTxUIActivate(ITextServices *iface) { struct text_services *services = impl_from_ITextServices( iface ); @@ -291,7 +291,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxUIActivate(ITextServices *iface } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIDeactivate,4) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxUIDeactivate(ITextServices *iface) +HRESULT __thiscall fnTextSrv_OnTxUIDeactivate(ITextServices *iface) { struct text_services *services = impl_from_ITextServices( iface ); @@ -300,7 +300,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxUIDeactivate(ITextServices *ifa } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetText,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetText( ITextServices *iface, BSTR *text ) +HRESULT __thiscall fnTextSrv_TxGetText( ITextServices *iface, BSTR *text ) { struct text_services *services = impl_from_ITextServices( iface ); int length; @@ -323,7 +323,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetText( ITextServices *iface, BS } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSetText,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSetText( ITextServices *iface, const WCHAR *text ) +HRESULT __thiscall fnTextSrv_TxSetText( ITextServices *iface, const WCHAR *text ) { struct text_services *services = impl_from_ITextServices( iface ); ME_Cursor cursor; @@ -341,7 +341,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSetText( ITextServices *iface, co } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCurTargetX,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetCurTargetX(ITextServices *iface, LONG *x) +HRESULT __thiscall fnTextSrv_TxGetCurTargetX(ITextServices *iface, LONG *x) { struct text_services *services = impl_from_ITextServices( iface ); @@ -350,7 +350,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetCurTargetX(ITextServices *ifac } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetBaseLinePos,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetBaseLinePos(ITextServices *iface, LONG *x) +HRESULT __thiscall fnTextSrv_TxGetBaseLinePos(ITextServices *iface, LONG *x) { struct text_services *services = impl_from_ITextServices( iface ); @@ -359,7 +359,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetBaseLinePos(ITextServices *ifa } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize,36) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize( ITextServices *iface, DWORD aspect, HDC draw, +HRESULT __thiscall fnTextSrv_TxGetNaturalSize( ITextServices *iface, DWORD aspect, HDC draw, HDC target, DVTARGETDEVICE *td, DWORD mode, const SIZEL *extent, LONG *width, LONG *height ) { @@ -399,7 +399,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize( ITextServices *if } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetDropTarget(ITextServices *iface, IDropTarget **ppDropTarget) +HRESULT __thiscall fnTextSrv_TxGetDropTarget(ITextServices *iface, IDropTarget **ppDropTarget) { struct text_services *services = impl_from_ITextServices( iface ); @@ -408,7 +408,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetDropTarget(ITextServices *ifac } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange,12) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServices *iface, DWORD mask, DWORD bits ) +HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServices *iface, DWORD mask, DWORD bits ) { struct text_services *services = impl_from_ITextServices( iface ); DWORD scrollbars; @@ -472,7 +472,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize,12) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetCachedSize(ITextServices *iface, DWORD *pdwWidth, DWORD *pdwHeight) +HRESULT __thiscall fnTextSrv_TxGetCachedSize(ITextServices *iface, DWORD *pdwWidth, DWORD *pdwHeight) { struct text_services *services = impl_from_ITextServices( iface ); -- 2.11.4.GIT