February 2009 - Wine-commits

Alexandre Julliard : Fix position of CDECL qualifier for functions that return pointers.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: fb04bcf638b0466529f96a267117421a61727dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb04bcf638b0466529f96a267… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 13:56:09 2009 +0100 Fix position of CDECL qualifier for functions that return pointers. --- dlls/kernel32/path.c | 4 ++-- dlls/msi/media.c | 2 +- dlls/wldap32/winldap_private.h | 38 +++++++++++++++++++------------------- include/winbase.h | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 6ac919a..2633d90 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1603,7 +1603,7 @@ BOOL WINAPI NeedCurrentDirectoryForExePathA( LPCSTR name ) * Return the full Unix file name for a given path. * Returned buffer must be freed by caller. */ -char CDECL *wine_get_unix_file_name( LPCWSTR dosW ) +char * CDECL wine_get_unix_file_name( LPCWSTR dosW ) { UNICODE_STRING nt_name; ANSI_STRING unix_name; @@ -1627,7 +1627,7 @@ char CDECL *wine_get_unix_file_name( LPCWSTR dosW ) * Return the full DOS file name for a given Unix path. * Returned buffer must be freed by caller. */ -WCHAR CDECL *wine_get_dos_file_name( LPCSTR str ) +WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) { UNICODE_STRING nt_name; ANSI_STRING unix_name; diff --git a/dlls/msi/media.c b/dlls/msi/media.c index d5f1a1d..2de3252 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -145,7 +145,7 @@ end: return rc; } -static void CDECL *cabinet_alloc(ULONG cb) +static void * CDECL cabinet_alloc(ULONG cb) { return msi_alloc(cb); } diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index ac1c739..a19ceb1 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -276,8 +276,8 @@ typedef struct ldap_apifeature_infoW int ldapaif_version; } LDAPAPIFeatureInfoW; -WLDAP32_LDAP CDECL *cldap_openA(PCHAR,ULONG); -WLDAP32_LDAP CDECL *cldap_openW(PWCHAR,ULONG); +WLDAP32_LDAP * CDECL cldap_openA(PCHAR,ULONG); +WLDAP32_LDAP * CDECL cldap_openW(PWCHAR,ULONG); ULONG CDECL WLDAP32_ldap_abandon(WLDAP32_LDAP*,ULONG); ULONG CDECL ldap_addA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]); ULONG CDECL ldap_addW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]); @@ -304,7 +304,7 @@ ULONG CDECL ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP3 ULONG CDECL ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR); ULONG CDECL ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR); ULONG CDECL ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*); -WLDAP32_LDAP CDECL *ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +WLDAP32_LDAP * CDECL ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); ULONG CDECL ldap_control_freeA(LDAPControlA*); ULONG CDECL ldap_control_freeW(LDAPControlW*); ULONG CDECL ldap_controls_freeA(LDAPControlA**); @@ -336,8 +336,8 @@ PCHAR CDECL ldap_err2stringA(ULONG); PWCHAR CDECL ldap_err2stringW(ULONG); ULONG CDECL ldap_escape_filter_elementA(PCHAR,ULONG,PCHAR,ULONG); ULONG CDECL ldap_escape_filter_elementW(PCHAR,ULONG,PWCHAR,ULONG); -PCHAR CDECL *ldap_explode_dnA(PCHAR,ULONG); -PWCHAR CDECL *ldap_explode_dnW(PWCHAR,ULONG); +PCHAR * CDECL ldap_explode_dnA(PCHAR,ULONG); +PWCHAR * CDECL ldap_explode_dnW(PWCHAR,ULONG); ULONG CDECL ldap_extended_operationA(WLDAP32_LDAP*,PCHAR,struct WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*,ULONG*); ULONG CDECL ldap_extended_operationW(WLDAP32_LDAP*,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*,ULONG*); ULONG CDECL ldap_extended_operation_sA(WLDAP32_LDAP*,PCHAR,struct WLDAP32_berval*,PLDAPControlA*, PLDAPControlA*, @@ -346,8 +346,8 @@ ULONG CDECL ldap_extended_operation_sW(WLDAP32_LDAP*,PWCHAR,struct WLDAP32_berva PWCHAR*,struct WLDAP32_berval**); PCHAR CDECL ldap_first_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**); PWCHAR CDECL ldap_first_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**); -WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_first_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); -WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_first_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); ULONG CDECL ldap_free_controlsA(LDAPControlA**); ULONG CDECL ldap_free_controlsW(LDAPControlW**); PCHAR CDECL ldap_get_dnA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); @@ -357,12 +357,12 @@ ULONG CDECL ldap_get_next_page_s(WLDAP32_LDAP*,PLDAPSearch,struct l_timeval*,ULO ULONG CDECL ldap_get_optionA(WLDAP32_LDAP*,int,void*); ULONG CDECL ldap_get_optionW(WLDAP32_LDAP*,int,void*); ULONG CDECL ldap_get_paged_count(WLDAP32_LDAP*,PLDAPSearch,ULONG*,WLDAP32_LDAPMessage*); -PCHAR CDECL *ldap_get_valuesA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR); -PWCHAR CDECL *ldap_get_valuesW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR); -PBERVAL CDECL *ldap_get_values_lenA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR); -PBERVAL CDECL *ldap_get_values_lenW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR); -WLDAP32_LDAP CDECL *ldap_initA(const PCHAR,ULONG); -WLDAP32_LDAP CDECL *ldap_initW(const PWCHAR,ULONG); +PCHAR * CDECL ldap_get_valuesA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR); +PWCHAR * CDECL ldap_get_valuesW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR); +PBERVAL * CDECL ldap_get_values_lenA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR); +PBERVAL * CDECL ldap_get_values_lenW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR); +WLDAP32_LDAP * CDECL ldap_initA(const PCHAR,ULONG); +WLDAP32_LDAP * CDECL ldap_initW(const PWCHAR,ULONG); void CDECL ldap_memfreeA(PCHAR); void CDECL ldap_memfreeW(PWCHAR); ULONG CDECL ldap_modifyA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]); @@ -384,10 +384,10 @@ ULONG CDECL ldap_modrdn_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR); ULONG CDECL WLDAP32_ldap_msgfree(WLDAP32_LDAPMessage*); PCHAR CDECL ldap_next_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*); PWCHAR CDECL ldap_next_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*); -WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_next_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); -WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_next_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); -WLDAP32_LDAP CDECL *ldap_openA(PCHAR,ULONG); -WLDAP32_LDAP CDECL *ldap_openW(PWCHAR,ULONG); +WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); +WLDAP32_LDAP * CDECL ldap_openA(PCHAR,ULONG); +WLDAP32_LDAP * CDECL ldap_openW(PWCHAR,ULONG); ULONG CDECL ldap_parse_extended_resultA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR*,struct WLDAP32_berval**,BOOLEAN); ULONG CDECL ldap_parse_extended_resultW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR*,struct WLDAP32_berval**,BOOLEAN); ULONG CDECL ldap_parse_page_controlA(WLDAP32_LDAP*,PLDAPControlA*,ULONG*,struct WLDAP32_berval**); @@ -438,8 +438,8 @@ ULONG CDECL ldap_simple_bindA(WLDAP32_LDAP*,PCHAR,PCHAR); ULONG CDECL ldap_simple_bindW(WLDAP32_LDAP*,PWCHAR,PWCHAR); ULONG CDECL ldap_simple_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR); ULONG CDECL ldap_simple_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR); -WLDAP32_LDAP CDECL *ldap_sslinitA(PCHAR,ULONG,int); -WLDAP32_LDAP CDECL *ldap_sslinitW(PWCHAR,ULONG,int); +WLDAP32_LDAP * CDECL ldap_sslinitA(PCHAR,ULONG,int); +WLDAP32_LDAP * CDECL ldap_sslinitW(PWCHAR,ULONG,int); ULONG CDECL ldap_start_tls_sA(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlA*,PLDAPControlA*); ULONG CDECL ldap_start_tls_sW(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlW*,PLDAPControlW*); ULONG CDECL ldap_startup(PLDAP_VERSION_INFO,HANDLE*); diff --git a/include/winbase.h b/include/winbase.h index f7a2854..3f0a24e 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2312,8 +2312,8 @@ WINBASEAPI VOID WINAPI _LeaveSysLevel(SYSLEVEL*); /* Wine internal functions */ -extern char CDECL *wine_get_unix_file_name( LPCWSTR dos ); -extern WCHAR CDECL *wine_get_dos_file_name( LPCSTR str ); +extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ); +extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); /* Interlocked functions */

1 0

David Adam : d3dx8: Move some functions into core. c to match the header file layout.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: edef19f8d60d6ce089f1562a958925668f9d4e32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edef19f8d60d6ce089f1562a9… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Feb 6 12:04:37 2009 +0100 d3dx8: Move some functions into core.c to match the header file layout. --- dlls/d3dx8/Makefile.in | 2 +- dlls/d3dx8/core.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx8/d3dx8_main.c | 75 ------------------------ dlls/d3dx8/d3dxbuffer.c | 93 ----------------------------- dlls/d3dx8/mesh.c | 15 +++++- 5 files changed, 163 insertions(+), 170 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edef19f8d60d6ce089f15…

1 0

Michael Stefaniuc : comctl32/tests: Remove superfluous pointer casts.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: fc46bb14798e095d89cf242db4646526239a31a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc46bb14798e095d89cf242db… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 6 10:38:02 2009 +0100 comctl32/tests: Remove superfluous pointer casts. --- dlls/comctl32/tests/dpa.c | 2 +- dlls/comctl32/tests/header.c | 4 ++-- dlls/comctl32/tests/tab.c | 2 +- dlls/comctl32/tests/trackbar.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index a0d1920..ed28119 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -373,7 +373,7 @@ static void test_dpa(void) if(pDPA_EnumCallback) { nEnum = 0; - pDPA_EnumCallback(dpa2, CB_EnumFirstThree, (PVOID)dpa2); + pDPA_EnumCallback(dpa2, CB_EnumFirstThree, dpa2); rc=CheckDPA(dpa2, 0x777456, &dw2); ok(rc, "dw=0x%x\n", dw2); ok(nEnum == 3, "nEnum=%d\n", nEnum); diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 5598e58..ec73803 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1159,10 +1159,10 @@ static void test_hdm_index_messages(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); iSize = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); - retVal = SendMessage(hChild, HDM_SETORDERARRAY, (WPARAM) iSize , (LPARAM) (LPINT) lpiarray ); + retVal = SendMessage(hChild, HDM_SETORDERARRAY, iSize, (LPARAM) lpiarray); ok(retVal == TRUE, "Setting header items order should return TRUE, got %d\n", retVal); - retVal = SendMessage(hChild, HDM_GETORDERARRAY, (WPARAM) iSize, (LPARAM) (LPINT) lpiarrayReceived ); + retVal = SendMessage(hChild, HDM_GETORDERARRAY, iSize, (LPARAM) lpiarrayReceived); ok(retVal == TRUE, "Getting header items order should return TRUE, got %d\n", retVal); ok_sequence(sequences, HEADER_SEQ_INDEX, orderArray_seq, "set_get_orderArray sequence testing", FALSE); diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index b39f52e..4b1c7f4 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -492,7 +492,7 @@ static HWND create_tooltip (HWND hTab, char toolTipText[]) ti.rect = rect; /* Add toolinfo structure to the tooltip control */ - SendMessage(hwndTT, TTM_ADDTOOL, 0, (LPARAM) (LPTOOLINFO) &ti); + SendMessage(hwndTT, TTM_ADDTOOL, 0, (LPARAM) &ti); return hwndTT; } diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 26cdeac..d57e28d 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -511,7 +511,7 @@ static void test_trackbar_buddy(HWND hWndTrackbar){ flush_sequences(sequences, NUM_MSG_SEQUENCE); - hWndLeftBuddy = (HWND) CreateWindowEx(0, STATUSCLASSNAME, NULL, 0, + hWndLeftBuddy = CreateWindowEx(0, STATUSCLASSNAME, NULL, 0, 0,0,300,20, NULL, NULL, NULL, NULL); ok(hWndLeftBuddy != NULL, "Expected non NULL value\n"); @@ -524,7 +524,7 @@ static void test_trackbar_buddy(HWND hWndTrackbar){ } else skip ("left buddy control not present?\n"); - hWndRightBuddy = (HWND) CreateWindowEx(0, STATUSCLASSNAME, NULL, 0, + hWndRightBuddy = CreateWindowEx(0, STATUSCLASSNAME, NULL, 0, 0,0,300,20,NULL,NULL, NULL, NULL); ok(hWndRightBuddy != NULL, "expected non NULL value\n");

1 0

Dylan Smith : richedit: Avoided searching for adjacent paragraphs through runs.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 5c91d5356ec2f1e3f87ba4d3665c8230dd8ee25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c91d5356ec2f1e3f87ba4d36… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Feb 6 01:10:06 2009 -0500 richedit: Avoided searching for adjacent paragraphs through runs. When finding an adjacent paragraph, the next_para and prev_para pointers should be used because they are direct pointers, a constant time operation. Instead I found some places in the code that searched through the general linked list to get to an adjacent paragraph, which is a linear time operation, depending on the number of rows and runs in between paragraphs. --- dlls/riched20/paint.c | 18 ++++++++---------- dlls/riched20/para.c | 21 +++++++++++---------- dlls/riched20/row.c | 22 ++++++++++++---------- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 03ece7b..28813d4 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1267,26 +1267,24 @@ ME_InvalidateSelection(ME_TextEditor *editor) assert(para1->type == diParagraph); assert(para2->type == diParagraph); /* last selection markers aren't always updated, which means - they can point past the end of the document */ + * they can point past the end of the document */ if (editor->nLastSelStart > len || editor->nLastSelEnd > len) { ME_MarkForPainting(editor, ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph), - ME_FindItemFwd(editor->pBuffer->pFirst, diTextEnd)); + editor->pBuffer->pLast); } 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)); + ME_MarkForPainting(editor, para1, editor->pLastSelStartPara->member.para.next_para); + } else if (nStart > editor->nLastSelStart) { + ME_MarkForPainting(editor, editor->pLastSelStartPara, para1->member.para.next_para); } /* 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_MarkForPainting(editor, para2, editor->pLastSelEndPara->member.para.next_para); + } else if (nEnd > editor->nLastSelEnd) { + ME_MarkForPainting(editor, editor->pLastSelEndPara, para2->member.para.next_para); } } diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index a4a9adb..0836390 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -515,9 +515,12 @@ void ME_GetSelectionParas(ME_TextEditor *editor, ME_DisplayItem **para, ME_DisplayItem **para_end) { ME_Cursor *pEndCursor = &editor->pCursors[1]; - + *para = ME_GetParagraph(editor->pCursors[0].pRun); *para_end = ME_GetParagraph(editor->pCursors[1].pRun); + if (*para == *para_end) + return; + if ((*para_end)->member.para.nCharOfs < (*para)->member.para.nCharOfs) { ME_DisplayItem *tmp = *para; @@ -525,22 +528,20 @@ ME_GetSelectionParas(ME_TextEditor *editor, ME_DisplayItem **para, ME_DisplayIte *para_end = tmp; pEndCursor = &editor->pCursors[0]; } - - /* selection consists of chars from nFrom up to nTo-1 */ - if ((*para_end)->member.para.nCharOfs > (*para)->member.para.nCharOfs) { - if (!pEndCursor->nOffset) { - *para_end = ME_GetParagraph(ME_FindItemBack(pEndCursor->pRun, diRun)); - } - } + + /* The paragraph at the end of a non-empty selection isn't included + * if the selection ends at the start of the paragraph. */ + if (!pEndCursor->pRun->member.run.nCharOfs && !pEndCursor->nOffset) + *para_end = (*para_end)->member.para.prev_para; } BOOL ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) { ME_DisplayItem *para, *para_end; - + ME_GetSelectionParas(editor, &para, &para_end); - + do { ME_SetParaFormat(editor, para, pFmt); if (para == para_end) diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index 3abff5f..d3ef3de 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -89,14 +89,15 @@ ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) { ME_DisplayItem *item = ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph); int nCount = 0; - - while (item && nCount + item->member.para.nRows <= nRow) + + while (item->type == diParagraph && + nCount + item->member.para.nRows <= nRow) { nCount += item->member.para.nRows; - item = ME_FindItemFwd(item, diParagraph); + item = item->member.para.next_para; } - if (!item) - return item; + if (item->type != diParagraph) + return NULL; for (item = ME_FindItemFwd(item, diStartRow); item && nCount < nRow; nCount++) item = ME_FindItemFwd(item, diStartRow); return item; @@ -106,18 +107,19 @@ ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) { - ME_DisplayItem *item = editor->pBuffer->pFirst->next; + ME_DisplayItem *item = ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph); int nRow = 0; - while (item && item->member.para.next_para->member.para.nCharOfs <= nOfs) + while (item->type == diParagraph && + item->member.para.next_para->member.para.nCharOfs <= nOfs) { nRow += item->member.para.nRows; - item = ME_FindItemFwd(item, diParagraph); + item = item->member.para.next_para; } - if (item) + if (item->type == diParagraph) { ME_DisplayItem *next_para = item->member.para.next_para; - + nOfs -= item->member.para.nCharOfs; item = ME_FindItemFwd(item, diRun); while ((item = ME_FindItemFwd(item, diStartRowOrParagraph)) != NULL)

1 0

Dylan Smith : richedit: Removed incorrect FIXME comment.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 5a84e193c2558a9ac6ab1a24d984f6da275b4e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a84e193c2558a9ac6ab1a24d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Feb 6 01:10:00 2009 -0500 richedit: Removed incorrect FIXME comment. The fixme comment is suggesting wrapping a paragraph within a function that is for moving the selection cursor up or down a line when the up or down keys are pressed. The contents fo paragraph aren't being changed, so there is no need to wrap the paragraph. --- dlls/riched20/caret.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0e42f10..46e16d4 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1266,8 +1266,6 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) pItem = ME_FindItemFwd(pRun, diStartRow); if (!pItem) return; /* row not found - ignore */ - /* FIXME If diParagraph is before diStartRow, wrap the next paragraph? - */ pNewPara = ME_GetParagraph(pItem); if (pOldPara->member.para.nFlags & MEPF_ROWSTART || (pOldPara->member.para.pCell &&

1 0

Dylan Smith : richedit: Accept paragraph as parameter for ME_CharOfsFromRunOfs.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: d20e057d8e3f2aa72d31baa935bb90786ffc0a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20e057d8e3f2aa72d31baa93… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Feb 6 01:09:51 2009 -0500 richedit: Accept paragraph as parameter for ME_CharOfsFromRunOfs. Rather than get the paragraph from the run, the function allows the caller to provide the paragraph, since it is already available. This reduces unnecessary traversals of lists that take longer as more runs and rows are in the paragraph. --- dlls/riched20/caret.c | 4 +++- dlls/riched20/editor.c | 42 ++++++++++++++++-------------------------- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 22 ++++++++-------------- 4 files changed, 28 insertions(+), 42 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index e901095..0e42f10 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -42,7 +42,9 @@ void ME_GetSelection(ME_TextEditor *editor, int *from, int *to) int ME_GetTextLength(ME_TextEditor *editor) { - return ME_CharOfsFromRunOfs(editor, ME_FindItemBack(editor->pBuffer->pLast, diRun), 0); + ME_DisplayItem *pLast = editor->pBuffer->pLast; + return ME_CharOfsFromRunOfs(editor, pLast->member.para.prev_para, + ME_FindItemBack(pLast, diRun), 0); } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 285ec04..2721745 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2907,23 +2907,20 @@ get_msg_name(UINT msg) void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) { int x,y; - ME_Cursor tmpCursor; + ME_DisplayItem *para, *run; BOOL isExact; int nCharOfs; /* The start of the clicked text. Absolute character offset */ - ME_Run *tmpRun; - ENLINK info; x = (short)LOWORD(lParam); y = (short)HIWORD(lParam); nCharOfs = ME_CharFromPos(editor, x, y, &isExact); if (!isExact) return; - ME_CursorFromCharOfs(editor, nCharOfs, &tmpCursor); - tmpRun = &tmpCursor.pRun->member.run; + ME_RunOfsFromCharOfs(editor, nCharOfs, &para, &run, NULL); - if ((tmpRun->style->fmt.dwMask & CFM_LINK) - && (tmpRun->style->fmt.dwEffects & CFE_LINK)) + if ((run->member.run.style->fmt.dwMask & CFM_LINK) + && (run->member.run.style->fmt.dwEffects & CFE_LINK)) { /* The clicked run has CFE_LINK set */ info.nmhdr.hwndFrom = editor->hWnd; info.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); @@ -2931,8 +2928,8 @@ void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam info.msg = msg; info.wParam = wParam; info.lParam = lParam; - info.chrg.cpMin = ME_CharOfsFromRunOfs(editor,tmpCursor.pRun,0); - info.chrg.cpMax = info.chrg.cpMin + ME_StrVLen(tmpRun->strText); + info.chrg.cpMin = ME_CharOfsFromRunOfs(editor, para, run, 0); + info.chrg.cpMax = info.chrg.cpMin + run->member.run.strText->nLen; SendMessageW(GetParent(editor->hWnd), WM_NOTIFY,info.nmhdr.idFrom, (LPARAM)&info); } } @@ -3709,7 +3706,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { ME_DisplayItem *item, *item_end; int nChars = 0, nThisLineOfs = 0, nNextLineOfs = 0; - ME_Cursor cursor; + ME_DisplayItem *para, *run; if (wParam > ME_GetTextLength(editor)) return 0; @@ -3718,23 +3715,16 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, FIXME("EM_LINELENGTH: returning number of unselected characters on lines with selection unsupported.\n"); return 0; } - ME_CursorFromCharOfs(editor, wParam, &cursor); - item = ME_RowStart(cursor.pRun); - nThisLineOfs = ME_CharOfsFromRunOfs(editor, ME_FindItemFwd(item, diRun), 0); + ME_RunOfsFromCharOfs(editor, wParam, &para, &run, NULL); + item = ME_RowStart(run); + nThisLineOfs = ME_CharOfsFromRunOfs(editor, para, ME_FindItemFwd(item, diRun), 0); item_end = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); - if (item_end->type == diStartRow) - nNextLineOfs = ME_CharOfsFromRunOfs(editor, ME_FindItemFwd(item_end, diRun), 0); - else - { - ME_DisplayItem *endPara; - - nNextLineOfs = ME_FindItemFwd(item, diParagraphOrEnd)->member.para.nCharOfs; - endPara = ME_FindItemFwd(item, diParagraphOrEnd); - endPara = ME_FindItemBack(endPara, diRun); - assert(endPara); - assert(endPara->type == diRun); - assert(endPara->member.run.nFlags & MERF_ENDPARA); - nNextLineOfs -= endPara->member.run.strText->nLen; + if (item_end->type == diStartRow) { + nNextLineOfs = ME_CharOfsFromRunOfs(editor, para, ME_FindItemFwd(item_end, diRun), 0); + } else { + ME_DisplayItem *endRun = ME_FindItemBack(item_end, diRun); + assert(endRun && endRun->member.run.nFlags & MERF_ENDPARA); + nNextLineOfs = item_end->member.para.nCharOfs - endRun->member.run.strText->nLen; } nChars = nNextLineOfs - nThisLineOfs; TRACE("EM_LINELENGTH(%ld)==%d\n",wParam, nChars); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8af4975..1312363 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -163,7 +163,7 @@ void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Ru SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx); void ME_CursorFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_Cursor *pCursor); void ME_RunOfsFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem **ppPara, ME_DisplayItem **ppRun, int *pOfs); -int ME_CharOfsFromRunOfs(ME_TextEditor *editor, ME_DisplayItem *pRun, int nOfs); +int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, const ME_DisplayItem *pRun, int nOfs); void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift); void ME_SetCharFormat(ME_TextEditor *editor, int nFrom, int nLen, CHARFORMAT2W *pFmt); void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index f71e119..fae7603 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -141,23 +141,17 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) /****************************************************************************** * ME_CharOfsFromRunOfs - * + * * Converts a character position relative to the start of the run, to a * character position relative to the start of the document. - * Kind of a "local to global" offset conversion. - */ -int ME_CharOfsFromRunOfs(ME_TextEditor *editor, ME_DisplayItem *pRun, int nOfs) + * Kind of a "local to global" offset conversion. + */ +int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, + const ME_DisplayItem *pRun, int nOfs) { - ME_DisplayItem *pPara; - - assert(pRun->type == diRun); - assert(pRun->member.run.nCharOfs != -1); - - pPara = ME_FindItemBack(pRun, diParagraph); - assert(pPara); - assert(pPara->type==diParagraph); - return pPara->member.para.nCharOfs + pRun->member.run.nCharOfs - + ME_VPosToPos(pRun->member.run.strText, nOfs); + assert(pRun && pRun->type == diRun); + assert(pPara && pPara->type == diParagraph); + return pPara->member.para.nCharOfs + pRun->member.run.nCharOfs + nOfs; } /******************************************************************************

1 0

Dylan Smith : richedit: Add paragraph field to wrap context to avoid searching for it.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: e082dd3042444b0e1c0971340e1ddcd9dcbc7376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e082dd3042444b0e1c0971340… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Feb 6 01:09:56 2009 -0500 richedit: Add paragraph field to wrap context to avoid searching for it. More case of searching for the paragraph through the linked list when is was already previously available. Since each wrap context is used for wrapping each paragraph, I decided to add the reference to the paragarph in the structure. --- dlls/riched20/editstr.h | 1 + dlls/riched20/wrap.c | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 63ef7f9..ac36e0e 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -414,6 +414,7 @@ typedef struct tagME_WrapContext int nRow; POINT pt; BOOL bOverflown, bWordWrap; + ME_DisplayItem *pPara; ME_DisplayItem *pRowStart; ME_DisplayItem *pLastSplittableRun; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a2da5eb..952f208 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -42,10 +42,11 @@ static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) return item; } -static void ME_BeginRow(ME_WrapContext *wc, ME_DisplayItem *para) +static void ME_BeginRow(ME_WrapContext *wc) { PARAFORMAT2 *pFmt; - assert(para && para->type == diParagraph); + ME_DisplayItem *para = wc->pPara; + pFmt = para->member.para.pFmt; wc->pRowStart = NULL; wc->bOverflown = FALSE; @@ -94,7 +95,7 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) int ascent = 0, descent = 0, width=0, shift = 0, align = 0; PARAFORMAT2 *pFmt; /* wrap text */ - para = ME_GetParagraph(wc->pRowStart); + para = wc->pPara; pFmt = para->member.para.pFmt; for (p = pEnd->prev; p!=wc->pRowStart->prev; p = p->prev) @@ -162,12 +163,12 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) ME_InsertBefore(wc->pRowStart, row); wc->nRow++; wc->pt.y += row->member.row.nHeight; - ME_BeginRow(wc, para); + ME_BeginRow(wc); } static void ME_WrapEndParagraph(ME_WrapContext *wc, ME_DisplayItem *p) { - ME_DisplayItem *para = p->member.para.prev_para; + ME_DisplayItem *para = wc->pPara; PARAFORMAT2 *pFmt = para->member.para.pFmt; if (wc->pRowStart) ME_InsertRowStart(wc, p); @@ -180,7 +181,7 @@ static void ME_WrapEndParagraph(ME_WrapContext *wc, ME_DisplayItem *p) } /* - p = p->member.para.prev_para->next; + p = para->next; while(p) { if (p->type == diParagraph || p->type == diTextEnd) return; @@ -200,7 +201,7 @@ static void ME_WrapSizeRun(ME_WrapContext *wc, ME_DisplayItem *p) ME_UpdateRunFlags(wc->context->editor, &p->member.run); - ME_CalcRunExtent(wc->context, &ME_GetParagraph(p)->member.para, + ME_CalcRunExtent(wc->context, &wc->pPara->member.para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, &p->member.run); } @@ -473,6 +474,7 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { pFmt = tp->member.para.pFmt; wc.context = c; + wc.pPara = tp; /* wc.para_style = tp->member.para.style; */ wc.style = NULL; if (tp->member.para.nFlags & MEPF_ROWEND) { @@ -511,7 +513,7 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { linespace = ME_GetParaLineSpace(c, &tp->member.para); - ME_BeginRow(&wc, tp); + ME_BeginRow(&wc); for (p = tp->next; p!=tp->member.para.next_para; ) { assert(p->type != diStartRow); if (p->type == diRun) {

1 0

Dylan Smith : richedit: Removed unnecessary calls to ME_WrapMarkedParagraphs.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: ea9e062b6c460b17ddc3b820dee80960b74b9369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9e062b6c460b17ddc3b820d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Feb 6 01:09:36 2009 -0500 richedit: Removed unnecessary calls to ME_WrapMarkedParagraphs. These calls to ME_WrapMarkedParagraphs never do anything, and don't make sense to be called in these places. These places are for ME_MoveCaret, and ME_ArrowHome, which both don't involve any text being modified, and all (direct and indirect) calls to these functions are done after the text has already been wrapped. --- dlls/riched20/caret.c | 3 --- dlls/riched20/paint.c | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 7bdd0a7..e901095 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -237,8 +237,6 @@ ME_MoveCaret(ME_TextEditor *editor) { int x, y, height; - if (ME_WrapMarkedParagraphs(editor)) - ME_UpdateScrollBar(editor); ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); if(editor->bHaveFocus && !ME_IsSelection(editor)) { @@ -1420,7 +1418,6 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) static void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor) { ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diStartRow); - ME_WrapMarkedParagraphs(editor); if (pRow) { ME_DisplayItem *pRun; if (editor->bCaretAtEnd && !pCursor->nOffset) { diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 30548fe..03ece7b 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -44,7 +44,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT * editor->nSequence++; ME_InitContext(&c, editor, hDC); SetBkMode(hDC, TRANSPARENT); - ME_MoveCaret(editor); /* Calls ME_WrapMarkedParagraphs */ + ME_MoveCaret(editor); item = editor->pBuffer->pFirst->next; /* This context point is an offset for the paragraph positions stored * during wrapping. It shouldn't be modified during painting. */

1 0

Dylan Smith : richedit: Properly destroy context in two places.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: a5bfa1a2abfa20f85df0396b74822106a6795c89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5bfa1a2abfa20f85df0396b7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Feb 6 01:09:43 2009 -0500 richedit: Properly destroy context in two places. Whenever ME_InitContext is called, ME_DestroyContext should be used to clean it up. This way the context can be extended easily by modifying those two functions. Instead, these two places of code just released the DC, without using ME_DestroyContext, so the created brush for the margin was not deleted. --- dlls/riched20/run.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 1f8cc18..741a469 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -600,7 +600,7 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) { if (nOffset) ME_GetOLEObjectSize(&c, pRun, &size); - ITextHost_TxReleaseDC(editor->texthost, c.hDC); + ME_DestroyContext(&c); return nOffset != 0; } else if (pRun->nFlags & MERF_ENDPARA) { nOffset = 0; @@ -612,7 +612,7 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) strRunText = pRun->strText; ME_GetTextExtent(&c, strRunText->szData, nOffset, pRun->style, &size); - ITextHost_TxReleaseDC(editor->texthost, c.hDC); + ME_DestroyContext(&c); if (editor->cPasswordMask) ME_DestroyString(strRunText); return size.cx;

1 0

Dylan Smith : richedit: Get the paragraph with ME_RunOfsFromCharOfs.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 12ca50db7a8f60b980cef50d7addaeae010f79c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12ca50db7a8f60b980cef50d7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Feb 6 01:09:47 2009 -0500 richedit: Get the paragraph with ME_RunOfsFromCharOfs. The ME_RunOfsFromCharOfs function finds the paragraph before finding the run and offset within the run, so the function may as well be able to return this paragraph to the caller. Many callers to the function instead find the paragraph from the run, which ends up unnecessarily traversing a linked list of runs within the paragraph. --- dlls/riched20/editor.c | 55 +++++++++-------------------------------------- dlls/riched20/editor.h | 4 +- dlls/riched20/run.c | 28 +++++++++++++----------- dlls/riched20/writer.c | 14 +++++------- 4 files changed, 34 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12ca50db7a8f60b980cef…

1 0