February 2013 - Wine-commits

Alexandre Julliard : winemac: Don' t move off-screen windows to a random position.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: e1b6dc57ac1ac3b67e5844e7e635363d84dd352f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b6dc57ac1ac3b67e5844e7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 5 13:09:43 2013 +0100 winemac: Don't move off-screen windows to a random position. --- dlls/winemac.drv/window.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index cb9ed9a..9d63912 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1398,7 +1398,11 @@ void macdrv_window_frame_changed(HWND hwnd, CGRect frame) if (!hwnd) return; if (!(data = get_win_data(hwnd))) return; - if (!data->on_screen) goto done; + if (!data->on_screen) + { + release_win_data(data); + return; + } /* Get geometry */ @@ -1427,7 +1431,6 @@ void macdrv_window_frame_changed(HWND hwnd, CGRect frame) TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left, data->window_rect.bottom - data->window_rect.top, width, height); -done: release_win_data(data); if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE))

1 0

Michael Stefaniuc : ddraw/tests: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 7d0ab835aeb0403f5f5dbc8cf923711eee7847e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0ab835aeb0403f5f5dbc8cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 5 13:18:04 2013 +0100 ddraw/tests: Use assignment instead of memcpy to copy structs. --- dlls/ddraw/tests/dsurface.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index c8f90c9..4e08224 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3872,13 +3872,13 @@ static void CreateSurfaceBadCapsSizeTest(void) ddsd_ok.dwWidth = 64; ddsd_ok.dwHeight = 64; ddsd_ok.ddsCaps.dwCaps = caps; - memcpy(&ddsd_bad1, &ddsd_ok, sizeof(ddsd_bad1)); + ddsd_bad1 = ddsd_ok; ddsd_bad1.dwSize--; - memcpy(&ddsd_bad2, &ddsd_ok, sizeof(ddsd_bad2)); + ddsd_bad2 = ddsd_ok; ddsd_bad2.dwSize++; - memcpy(&ddsd_bad3, &ddsd_ok, sizeof(ddsd_bad3)); + ddsd_bad3 = ddsd_ok; ddsd_bad3.dwSize = 0; - memcpy(&ddsd_bad4, &ddsd_ok, sizeof(ddsd_bad4)); + ddsd_bad4 = ddsd_ok; ddsd_bad4.dwSize = sizeof(DDSURFACEDESC2); memset(&ddsd2_ok, 0, sizeof(ddsd2_ok)); @@ -3887,13 +3887,13 @@ static void CreateSurfaceBadCapsSizeTest(void) ddsd2_ok.dwWidth = 64; ddsd2_ok.dwHeight = 64; ddsd2_ok.ddsCaps.dwCaps = caps; - memcpy(&ddsd2_bad1, &ddsd2_ok, sizeof(ddsd2_bad1)); + ddsd2_bad1 = ddsd2_ok; ddsd2_bad1.dwSize--; - memcpy(&ddsd2_bad2, &ddsd2_ok, sizeof(ddsd2_bad2)); + ddsd2_bad2 = ddsd2_ok; ddsd2_bad2.dwSize++; - memcpy(&ddsd2_bad3, &ddsd2_ok, sizeof(ddsd2_bad3)); + ddsd2_bad3 = ddsd2_ok; ddsd2_bad3.dwSize = 0; - memcpy(&ddsd2_bad4, &ddsd2_ok, sizeof(ddsd2_bad4)); + ddsd2_bad4 = ddsd2_ok; ddsd2_bad4.dwSize = sizeof(DDSURFACEDESC); hr = IDirectDraw_CreateSurface(lpDD, &ddsd_ok, &surf, NULL);

1 0

Michael Stefaniuc : crypt32: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 6af92365ea7ae08b33fcf08e6f7b6deeebd0cb79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af92365ea7ae08b33fcf08e6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 5 13:22:27 2013 +0100 crypt32: Use assignment instead of memcpy to copy structs. --- dlls/crypt32/cert.c | 15 +++++---------- dlls/crypt32/message.c | 3 +-- dlls/crypt32/serialize.c | 6 +++--- dlls/crypt32/tests/main.c | 4 ++-- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 478fff3..c137746 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -842,7 +842,7 @@ static BOOL container_matches_cert(PCCERT_CONTEXT pCert, LPCSTR container, * keyProvInfo->pwszContainerName to be NULL or a heap-allocated container * name. */ - memcpy(&copy, keyProvInfo, sizeof(copy)); + copy = *keyProvInfo; copy.pwszContainerName = containerW; matches = key_prov_info_matches_cert(pCert, &copy); if (matches) @@ -2216,9 +2216,7 @@ BOOL WINAPI CryptSignAndEncodeCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCrypt info.ToBeSigned.cbData = encodedSize; info.ToBeSigned.pbData = encoded; - memcpy(&info.SignatureAlgorithm, - pSignatureAlgorithm, - sizeof(info.SignatureAlgorithm)); + info.SignatureAlgorithm = *pSignatureAlgorithm; info.Signature.cbData = hashSize; info.Signature.pbData = hash; info.Signature.cUnusedBits = 0; @@ -2986,8 +2984,7 @@ static PCCERT_CONTEXT CRYPT_CreateSignedCert(const CRYPT_DER_BLOB *blob, signedInfo.ToBeSigned.cbData = blob->cbData; signedInfo.ToBeSigned.pbData = blob->pbData; - memcpy(&signedInfo.SignatureAlgorithm, sigAlgo, - sizeof(signedInfo.SignatureAlgorithm)); + signedInfo.SignatureAlgorithm = *sigAlgo; signedInfo.Signature.cbData = sigSize; signedInfo.Signature.pbData = sig; signedInfo.Signature.cUnusedBits = 0; @@ -3038,8 +3035,7 @@ static void CRYPT_MakeCertInfo(PCERT_INFO info, const CRYPT_DATA_BLOB *pSerialNu info->SerialNumber.cbData = pSerialNumber->cbData; info->SerialNumber.pbData = pSerialNumber->pbData; if (pSignatureAlgorithm) - memcpy(&info->SignatureAlgorithm, pSignatureAlgorithm, - sizeof(info->SignatureAlgorithm)); + info->SignatureAlgorithm = *pSignatureAlgorithm; else { info->SignatureAlgorithm.pszObjId = oid; @@ -3066,8 +3062,7 @@ static void CRYPT_MakeCertInfo(PCERT_INFO info, const CRYPT_DATA_BLOB *pSerialNu } info->Subject.cbData = pSubjectIssuerBlob->cbData; info->Subject.pbData = pSubjectIssuerBlob->pbData; - memcpy(&info->SubjectPublicKeyInfo, pubKey, - sizeof(info->SubjectPublicKeyInfo)); + info->SubjectPublicKeyInfo = *pubKey; if (pExtensions) { info->cExtension = pExtensions->cExtension; diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 7e163de..5b77c87 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -285,8 +285,7 @@ BOOL WINAPI CryptHashMessage(PCRYPT_HASH_MESSAGE_PARA pHashPara, memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); info.hCryptProv = pHashPara->hCryptProv; - memcpy(&info.HashAlgorithm, &pHashPara->HashAlgorithm, - sizeof(info.HashAlgorithm)); + info.HashAlgorithm = pHashPara->HashAlgorithm; info.pvHashAuxInfo = pHashPara->pvHashAuxInfo; msg = CryptMsgOpenToEncode(pHashPara->dwMsgEncodingType, flags, CMSG_HASHED, &info, NULL, NULL); diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 5b6b794..7ca881c 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -652,21 +652,21 @@ static BOOL CRYPT_WriteSerializedStoreToStream(HCERTSTORE store, ret = output(handle, fileHeader, sizeof(fileHeader)); if (ret) { - memcpy(&interface, pCertInterface, sizeof(interface)); + interface = *pCertInterface; interface.serialize = (SerializeElementFunc)CRYPT_SerializeCertNoHash; ret = CRYPT_SerializeContextsToStream(output, handle, &interface, store); } if (ret) { - memcpy(&interface, pCRLInterface, sizeof(interface)); + interface = *pCRLInterface; interface.serialize = (SerializeElementFunc)CRYPT_SerializeCRLNoHash; ret = CRYPT_SerializeContextsToStream(output, handle, &interface, store); } if (ret) { - memcpy(&interface, pCTLInterface, sizeof(interface)); + interface = *pCTLInterface; interface.serialize = (SerializeElementFunc)CRYPT_SerializeCTLNoHash; ret = CRYPT_SerializeContextsToStream(output, handle, &interface, store); diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 8ceec7b..a0019b5 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -181,12 +181,12 @@ static void test_verifyTimeValidity(void) /* Check with 0 NotBefore and NotAfter */ ret = CertVerifyTimeValidity(&fileTime, &info); ok(ret == 1, "Expected 1, got %d\n", ret); - memcpy(&info.NotAfter, &fileTime, sizeof(info.NotAfter)); + info.NotAfter = fileTime; /* Check with NotAfter equal to comparison time */ ret = CertVerifyTimeValidity(&fileTime, &info); ok(ret == 0, "Expected 0, got %d\n", ret); /* Check with NotBefore after comparison time */ - memcpy(&info.NotBefore, &fileTime, sizeof(info.NotBefore)); + info.NotBefore = fileTime; info.NotBefore.dwLowDateTime += 5000; ret = CertVerifyTimeValidity(&fileTime, &info); ok(ret == -1, "Expected -1, got %d\n", ret);

1 0

Huw Davies : riched20: Pass a character ptr and length to SplitParagraph.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 872a2ad0312c14fd5b1d40609f36f374204b6158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872a2ad0312c14fd5b1d40609… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 5 13:19:39 2013 +0000 riched20: Pass a character ptr and length to SplitParagraph. --- dlls/riched20/caret.c | 13 ++++++------- dlls/riched20/editor.h | 2 +- dlls/riched20/para.c | 10 ++++++---- dlls/riched20/table.c | 13 +++++-------- dlls/riched20/undo.c | 4 +--- 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4c7ee8a..1457778 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -558,13 +558,12 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, WCHAR space = ' '; ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, style, 0); } else { - ME_String *eol_str; + const WCHAR cr = '\r', *eol_str = str; - if (!editor->bEmulateVersion10) { - WCHAR cr = '\r'; - eol_str = ME_MakeStringN(&cr, 1); - } else { - eol_str = ME_MakeStringN(str, eol_len); + if (!editor->bEmulateVersion10) + { + eol_str = &cr; + eol_len = 1; } p = &editor->pCursors[nCursor]; @@ -572,7 +571,7 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_SplitRunSimple(editor, p); tmp_style = ME_GetInsertStyle(editor, nCursor); /* ME_SplitParagraph increases style refcount */ - tp = ME_SplitParagraph(editor, p->pRun, p->pRun->member.run.style, eol_str, 0); + tp = ME_SplitParagraph(editor, p->pRun, p->pRun->member.run.style, eol_str, eol_len, 0); p->pRun = ME_FindItemFwd(tp, diRun); p->pPara = tp; end_run = ME_FindItemBack(tp, diRun); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index de1a7bc..2dbd7e0 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -202,7 +202,7 @@ void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run) DECLSPEC_HIDDEN; void ME_GetSelectionParas(ME_TextEditor *editor, ME_DisplayItem **para, ME_DisplayItem **para_end) DECLSPEC_HIDDEN; void ME_MakeFirstParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *rp, ME_Style *style, ME_String *eol_str, int paraFlags) DECLSPEC_HIDDEN; +ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *rp, ME_Style *style, const WCHAR *eol_str, int eol_len, int paraFlags) DECLSPEC_HIDDEN; ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, BOOL keepFirstParaFormat) DECLSPEC_HIDDEN; void ME_DumpParaStyle(ME_Paragraph *s) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 7960972..ccb025a 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -192,7 +192,7 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const /* split paragraph at the beginning of the run */ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, - ME_Style *style, ME_String *eol_str, + ME_Style *style, const WCHAR *eol_str, int eol_len, int paraFlags) { ME_DisplayItem *next_para = NULL; @@ -202,6 +202,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, int ofs, i; ME_DisplayItem *pp; int run_flags = MERF_ENDPARA; + ME_String *str; if (!editor->bEmulateVersion10) { /* v4.1 */ /* At most 1 of MEPF_CELL, MEPF_ROWSTART, or MEPF_ROWEND should be set. */ @@ -218,7 +219,8 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, run_para = ME_GetParagraph(run); assert(run_para->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); - end_run = ME_MakeRun(style, eol_str, run_flags); + str = ME_MakeStringN( eol_str, eol_len ); + end_run = ME_MakeRun(style, str, run_flags); ofs = end_run->member.run.nCharOfs = run->member.run.nCharOfs; end_run->member.run.para = run->member.run.para; @@ -244,7 +246,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, pp = ME_FindItemFwd(pp, diRunOrParagraphOrEnd); } new_para->member.para.nCharOfs = run_para->member.para.nCharOfs + ofs; - new_para->member.para.nCharOfs += eol_str->nLen; + new_para->member.para.nCharOfs += eol_len; new_para->member.para.nFlags = MEPF_REWRAP; /* FIXME initialize format style and call ME_SetParaFormat blah blah */ @@ -311,7 +313,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, new_para->member.para.prev_para->member.para.nFlags |= MEPF_REWRAP; /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ - ME_PropagateCharOffset(next_para, eol_str->nLen); + ME_PropagateCharOffset(next_para, eol_len); editor->nParagraphs++; return new_para; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 06287fb..d5fbfcb 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists); static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, int nCursor, - ME_String *eol_str, + const WCHAR *eol_str, int eol_len, int paraFlags) { ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); @@ -67,7 +67,7 @@ static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, if (cursor->nOffset) ME_SplitRunSimple(editor, cursor); - tp = ME_SplitParagraph(editor, cursor->pRun, pStyle, eol_str, paraFlags); + tp = ME_SplitParagraph(editor, cursor->pRun, pStyle, eol_str, eol_len, paraFlags); ME_ReleaseStyle(pStyle); cursor->pPara = tp; cursor->pRun = ME_FindItemFwd(tp, diRun); @@ -78,8 +78,7 @@ ME_DisplayItem* ME_InsertTableRowStartFromCursor(ME_TextEditor *editor) { ME_DisplayItem *para; WCHAR cr_lf[] = {'\r', '\n', 0}; - ME_String *eol_str = ME_MakeStringN(cr_lf, 2); - para = ME_InsertEndParaFromCursor(editor, 0, eol_str, MEPF_ROWSTART); + para = ME_InsertEndParaFromCursor(editor, 0, cr_lf, 2, MEPF_ROWSTART); return para->member.para.prev_para; } @@ -122,8 +121,7 @@ ME_DisplayItem* ME_InsertTableCellFromCursor(ME_TextEditor *editor) { ME_DisplayItem *para; WCHAR tab = '\t'; - ME_String *eol_str = ME_MakeStringN(&tab, 1); - para = ME_InsertEndParaFromCursor(editor, 0, eol_str, MEPF_CELL); + para = ME_InsertEndParaFromCursor(editor, 0, &tab, 1, MEPF_CELL); return para; } @@ -131,8 +129,7 @@ ME_DisplayItem* ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) { ME_DisplayItem *para; WCHAR cr_lf[] = {'\r', '\n', 0}; - ME_String *eol_str = ME_MakeStringN(cr_lf, 2); - para = ME_InsertEndParaFromCursor(editor, 0, eol_str, MEPF_ROWEND); + para = ME_InsertEndParaFromCursor(editor, 0, cr_lf, 2, MEPF_ROWEND); return para->member.para.prev_para; } diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index bfac1ed..07926ed 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -394,9 +394,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) this_para->member.para.nFlags &= ~MEPF_ROWSTART; } new_para = ME_SplitParagraph(editor, tmp.pRun, tmp.pRun->member.run.style, - undo->u.split_para.eol_str, paraFlags); - /* ME_SplitParagraph owns eol_str */ - undo->u.split_para.eol_str = NULL; + undo->u.split_para.eol_str->szData, undo->u.split_para.eol_str->nLen, paraFlags); if (bFixRowStart) new_para->member.para.nFlags |= MEPF_ROWSTART; *new_para->member.para.pFmt = undo->u.split_para.fmt;

1 0

Huw Davies : riched20: Pass character ptrs to the whitespace finding functions.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: b730efc9b422f0ef8c61c4d13924acbed1263404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b730efc9b422f0ef8c61c4d13… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 5 13:19:40 2013 +0000 riched20: Pass character ptrs to the whitespace finding functions. --- dlls/riched20/string.c | 27 -------------------------- dlls/riched20/wrap.c | 49 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 35 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 8db1a3b..0e13394 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -121,33 +121,6 @@ void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) s->nLen -= nChars; } -int ME_FindNonWhitespaceV(const ME_String *s, int nVChar) { - int i; - for (i = nVChar; i<s->nLen && ME_IsWSpace(s->szData[i]); i++) - ; - - return i; -} - -/* note: returns offset of the first trailing whitespace */ -int ME_ReverseFindNonWhitespaceV(const ME_String *s, int nVChar) { - int i; - for (i = nVChar; i>0 && ME_IsWSpace(s->szData[i-1]); i--) - ; - - return i; -} - -/* note: returns offset of the first trailing nonwhitespace */ -int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar) { - int i; - for (i = nVChar; i>0 && !ME_IsWSpace(s->szData[i-1]); i--) - ; - - return i; -} - - static int ME_WordBreakProc(LPWSTR s, INT start, INT len, INT code) { diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 9c72285..b63697b 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -206,13 +206,46 @@ static void ME_WrapSizeRun(ME_WrapContext *wc, ME_DisplayItem *p) wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, &p->member.run); } + +static int find_non_whitespace(const WCHAR *s, int len, int start) +{ + int i; + for (i = start; i < len && ME_IsWSpace( s[i] ); i++) + ; + + return i; +} + +/* note: these two really return the first matching offset (starting from EOS)+1 + * in other words, an offset of the first trailing white/black */ + +/* note: returns offset of the first trailing whitespace */ +static int reverse_find_non_whitespace(const WCHAR *s, int start) +{ + int i; + for (i = start; i > 0 && ME_IsWSpace( s[i - 1] ); i--) + ; + + return i; +} + +/* note: returns offset of the first trailing nonwhitespace */ +static int reverse_find_whitespace(const WCHAR *s, int start) +{ + int i; + for (i = start; i > 0 && !ME_IsWSpace( s[i - 1] ); i--) + ; + + return i; +} + static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, int i) { ME_DisplayItem *pp, *piter = p; int j; if (!i) return NULL; - j = ME_ReverseFindNonWhitespaceV(p->member.run.strText, i); + j = reverse_find_non_whitespace( get_text( &p->member.run, 0 ), i); if (j>0) { pp = ME_SplitRun(wc, piter, j); wc->pt.x += piter->member.run.nWidth; @@ -232,8 +265,8 @@ static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, i } if (piter->member.run.nFlags & MERF_ENDWHITE) { - i = ME_ReverseFindNonWhitespaceV(piter->member.run.strText, - piter->member.run.len); + i = reverse_find_non_whitespace( get_text( &piter->member.run, 0 ), + piter->member.run.len ); pp = ME_SplitRun(wc, piter, i); wc->pt = pp->member.run.pt; return pp; @@ -261,7 +294,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem assert(i<len); if (i) { /* don't split words */ - i = ME_ReverseFindWhitespaceV(run->strText, i); + i = reverse_find_whitespace( get_text( run, 0 ), i ); pp = ME_MaximizeSplit(wc, p, i); if (pp) return pp; @@ -285,9 +318,9 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem run = &piter->member.run; len = run->len; /* don't split words */ - i = ME_ReverseFindWhitespaceV(run->strText, len); + i = reverse_find_whitespace( get_text( run, 0 ), len ); if (i == len) - i = ME_ReverseFindNonWhitespaceV(run->strText, len); + i = reverse_find_non_whitespace( get_text( run, 0 ), len ); if (i) { ME_DisplayItem *piter2 = ME_SplitRun(wc, piter, i); wc->pt = piter2->member.run.pt; @@ -357,7 +390,7 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) if (run->nFlags & MERF_STARTWHITE) { /* try to split the run at the first non-white char */ int black; - black = ME_FindNonWhitespaceV(run->strText, 0); + black = find_non_whitespace( get_text( run, 0 ), run->len, 0 ); if (black) { wc->bOverflown = FALSE; pp = ME_SplitRun(wc, p, black); @@ -410,7 +443,7 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) if (run->nFlags & MERF_ENDWHITE) { /* we aren't sure if it's *really* necessary, it's a good start however */ - int black = ME_ReverseFindNonWhitespaceV(run->strText, len); + int black = reverse_find_non_whitespace( get_text( run, 0 ), len ); ME_SplitRun(wc, p, black); /* handle both parts again */ return p;

1 0

Huw Davies : riched20: Move the text to the paragraph level.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 5168d66be7367473c1819c010bf7037e01a45f09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5168d66be7367473c1819c010… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 5 13:19:41 2013 +0000 riched20: Move the text to the paragraph level. --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 12 +++++++----- dlls/riched20/editstr.h | 2 +- dlls/riched20/list.c | 4 +++- dlls/riched20/para.c | 23 +++++++++++++++-------- dlls/riched20/run.c | 14 +++++++------- dlls/riched20/string.c | 39 +++++++++++++++++++++------------------ dlls/riched20/undo.c | 6 +++--- 8 files changed, 58 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5168d66be7367473c1819…

1 0

Aric Stewart : usp10: Fix typo with Script_Khmer_Numeric.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 8077975e70843f43b788c58412e58534b0d269a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8077975e70843f43b788c5841… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 5 08:56:47 2013 -0600 usp10: Fix typo with Script_Khmer_Numeric. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e2e72fc..fb09808 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -513,7 +513,7 @@ const scriptData scriptInformation[] = { {0x53, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 1, 0, 0, 0, 0}, MS_MAKE_TAG('k','h','m','r'), {'D','a','u','n','P','e','n','h'}}, - {{Script_Khmer, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {{Script_Khmer_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x53, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('k','h','m','r'), {'D','a','u','n','P','e','n','h'}},

1 0

Dmitry Timoshkov : wbemprox: Free name in create_signature (Coverity).
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 1eee6e3159c616ef6e57fd9d851e801804a859dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eee6e3159c616ef6e57fd9d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 4 23:56:11 2013 +0800 wbemprox: Free name in create_signature (Coverity). --- dlls/wbemprox/class.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index a398c95..62cf332 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -834,12 +834,11 @@ HRESULT create_signature( const WCHAR *class, const WCHAR *method, enum param_di } hr = create_signature_table( iter, name ); IEnumWbemClassObject_Release( iter ); - if (hr != S_OK) - { - heap_free( name ); - return hr; - } - return get_object( name, sig ); + if (hr == S_OK) + hr = get_object( name, sig ); + + heap_free( name ); + return hr; } static HRESULT WINAPI class_object_GetMethod(

1 0

Huw Davies : riched20: Actually pass the ANSI string to the break proc.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: bf6bb4fc70bfa924d1f19b93de013a4b1f96e890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6bb4fc70bfa924d1f19b93d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 4 09:53:37 2013 +0000 riched20: Actually pass the ANSI string to the break proc. --- dlls/riched20/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 87dcb67..1c0da24 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -195,7 +195,7 @@ ME_CallWordBreakProc(ME_TextEditor *editor, ME_String *str, INT start, INT code) char *buffer = heap_alloc(buffer_size); WideCharToMultiByte(CP_ACP, 0, str->szData, str->nLen, buffer, buffer_size, NULL, NULL); - result = editor->pfnWordBreak(str->szData, start, str->nLen, code); + result = editor->pfnWordBreak((WCHAR*)buffer, start, buffer_size, code); heap_free(buffer); return result; }

1 0

Huw Davies : riched20: Pass the character ptr and string length directly to the break proc helper .
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 48b9ab37ac8029c4bb6625db976c166cacabc27d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b9ab37ac8029c4bb6625db9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 4 09:53:38 2013 +0000 riched20: Pass the character ptr and string length directly to the break proc helper. --- dlls/riched20/caret.c | 22 ++++++++++++---------- dlls/riched20/editor.h | 2 +- dlls/riched20/string.c | 10 +++++----- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b5b618b..4c7ee8a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -680,19 +680,21 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) /* Backward movement */ while (TRUE) { - nOffset = ME_CallWordBreakProc(editor, pRun->member.run.strText, - nOffset, WB_MOVEWORDLEFT); + nOffset = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), + pRun->member.run.len, nOffset, WB_MOVEWORDLEFT); if (nOffset) break; pOtherRun = ME_FindItemBack(pRun, diRunOrParagraph); if (pOtherRun->type == diRun) { - if (ME_CallWordBreakProc(editor, pOtherRun->member.run.strText, + if (ME_CallWordBreakProc(editor, get_text( &pOtherRun->member.run, 0 ), + pOtherRun->member.run.len, pOtherRun->member.run.len - 1, WB_ISDELIMITER) && !(pRun->member.run.nFlags & MERF_ENDPARA) && !(cursor->pRun == pRun && cursor->nOffset == 0) - && !ME_CallWordBreakProc(editor, pRun->member.run.strText, 0, + && !ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), + pRun->member.run.len, 0, WB_ISDELIMITER)) break; pRun = pOtherRun; @@ -724,18 +726,18 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) while (TRUE) { - if (last_delim && !ME_CallWordBreakProc(editor, pRun->member.run.strText, - nOffset, WB_ISDELIMITER)) + if (last_delim && !ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), + pRun->member.run.len, nOffset, WB_ISDELIMITER)) break; - nOffset = ME_CallWordBreakProc(editor, pRun->member.run.strText, - nOffset, WB_MOVEWORDRIGHT); + nOffset = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), + pRun->member.run.len, nOffset, WB_MOVEWORDRIGHT); if (nOffset < pRun->member.run.len) break; pOtherRun = ME_FindItemFwd(pRun, diRunOrParagraphOrEnd); if (pOtherRun->type == diRun) { - last_delim = ME_CallWordBreakProc(editor, pRun->member.run.strText, - nOffset - 1, WB_ISDELIMITER); + last_delim = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), + pRun->member.run.len, nOffset - 1, WB_ISDELIMITER); pRun = pOtherRun; nOffset = 0; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f01494c..de1a7bc 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -105,7 +105,7 @@ void ME_DestroyString(ME_String *s) DECLSPEC_HIDDEN; void ME_AppendString(ME_String *s1, const ME_String *s2) 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, ME_String *str, INT start, INT code) 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; /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 1c0da24..8db1a3b 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -180,20 +180,20 @@ ME_WordBreakProc(LPWSTR s, INT start, INT len, INT code) int -ME_CallWordBreakProc(ME_TextEditor *editor, ME_String *str, INT start, INT code) +ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT code) { if (!editor->pfnWordBreak) { - return ME_WordBreakProc(str->szData, start, str->nLen*sizeof(WCHAR), code); + return ME_WordBreakProc(str, start, len * sizeof(WCHAR), code); } else if (!editor->bEmulateVersion10) { /* MSDN lied about the third parameter for EditWordBreakProc being the number * of characters, it is actually the number of bytes of the string. */ - return editor->pfnWordBreak(str->szData, start, str->nLen*sizeof(WCHAR), code); + return editor->pfnWordBreak(str, start, len * sizeof(WCHAR), code); } else { int result; - int buffer_size = WideCharToMultiByte(CP_ACP, 0, str->szData, str->nLen, + int buffer_size = WideCharToMultiByte(CP_ACP, 0, str, len, NULL, 0, NULL, NULL); char *buffer = heap_alloc(buffer_size); - WideCharToMultiByte(CP_ACP, 0, str->szData, str->nLen, + WideCharToMultiByte(CP_ACP, 0, str, len, buffer, buffer_size, NULL, NULL); result = editor->pfnWordBreak((WCHAR*)buffer, start, buffer_size, code); heap_free(buffer);

1 0