May 2010 - Wine-commits - list.winehq.org

Juan Lang : crypt32: Validate add disposition before checking source certificate's properties.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 76fc5c8bc5e46b9e935b4078999e2ac711b28fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fc5c8bc5e46b9e935b40789… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 14 13:49:44 2010 -0700 crypt32: Validate add disposition before checking source certificate's properties. --- dlls/crypt32/store.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index a892394..da3de56 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -855,7 +855,16 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, dwAddDisposition, ppStoreContext); - if (dwAddDisposition != CERT_STORE_ADD_ALWAYS) + switch (dwAddDisposition) + { + case CERT_STORE_ADD_ALWAYS: + break; + case CERT_STORE_ADD_NEW: + case CERT_STORE_ADD_REPLACE_EXISTING: + case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: + case CERT_STORE_ADD_USE_EXISTING: + case CERT_STORE_ADD_NEWER: + case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: { BYTE hashToAdd[20]; DWORD size = sizeof(hashToAdd); @@ -870,6 +879,12 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, pCertContext->dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob, NULL); } + break; + } + default: + FIXME("Unimplemented add disposition %d\n", dwAddDisposition); + SetLastError(E_INVALIDARG); + ret = FALSE; } switch (dwAddDisposition) @@ -940,10 +955,6 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, else toAdd = CertDuplicateCertificateContext(pCertContext); break; - default: - FIXME("Unimplemented add disposition %d\n", dwAddDisposition); - SetLastError(E_INVALIDARG); - ret = FALSE; } if (toAdd)

1 0

Juan Lang : crypt32: Prohibit adding links to collection stores.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 99b9e1ae3633f6d20bbc093b503d915f8e62e97c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99b9e1ae3633f6d20bbc093b5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 14 15:44:17 2010 -0700 crypt32: Prohibit adding links to collection stores. --- dlls/crypt32/cert.c | 9 +++++++++ dlls/crypt32/tests/store.c | 1 - 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c25e612..3d4a34c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -113,8 +113,17 @@ BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, PCCERT_CONTEXT *ppCertContext) { + PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)hCertStore; + FIXME("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, dwAddDisposition, ppCertContext); + if (store->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + return FALSE; + if (store->type == StoreTypeCollection) + { + SetLastError(E_INVALIDARG); + return FALSE; + } return FALSE; } diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 72a2154..abc44e2 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2354,7 +2354,6 @@ static void testAddCertificateLink(void) SetLastError(0xdeadbeef); ret = CertAddCertificateLinkToStore(store1, source, CERT_STORE_ADD_ALWAYS, &linked); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); CertFreeCertificateContext(source);

1 0

Juan Lang : crypt32: Implement CertAddCertificateLinkToStore on top of CertAddCertificateContextToStore .
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: d728169d97a881f252fcac5e8d5de8e41cc2a71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d728169d97a881f252fcac5e8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 14 15:48:18 2010 -0700 crypt32: Implement CertAddCertificateLinkToStore on top of CertAddCertificateContextToStore. --- dlls/crypt32/cert.c | 9 ++++++--- dlls/crypt32/tests/store.c | 10 +--------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 3d4a34c..12c013e 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -113,10 +113,12 @@ BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, PCCERT_CONTEXT *ppCertContext) { + static int calls; PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)hCertStore; - FIXME("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, dwAddDisposition, - ppCertContext); + if (!(calls++)) + FIXME("(%p, %p, %08x, %p): semi-stub\n", hCertStore, pCertContext, + dwAddDisposition, ppCertContext); if (store->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) return FALSE; if (store->type == StoreTypeCollection) @@ -124,7 +126,8 @@ BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore, SetLastError(E_INVALIDARG); return FALSE; } - return FALSE; + return CertAddCertificateContextToStore(hCertStore, pCertContext, + dwAddDisposition, ppCertContext); } PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index abc44e2..cab74c6 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2078,7 +2078,6 @@ static void compareStore(HCERTSTORE store, LPCSTR name, const BYTE *pb, { ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE, CERT_STORE_SAVE_TO_MEMORY, &blob, 0); - ok(ret, "CertSaveStore failed: %08x\n", GetLastError()); ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name); HeapFree(GetProcessHeap(), 0, blob.pbData); } @@ -2151,19 +2150,16 @@ static void testAddCertificateLink(void) CERT_STORE_CREATE_NEW_FLAG, NULL); SetLastError(0xdeadbeef); ret = CertAddCertificateLinkToStore(store1, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); source = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); SetLastError(0xdeadbeef); ret = CertAddCertificateLinkToStore(store1, source, 0, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); ret = CertAddCertificateLinkToStore(store1, source, CERT_STORE_ADD_ALWAYS, NULL); - todo_wine ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (0) { @@ -2179,7 +2175,6 @@ static void testAddCertificateLink(void) CERT_STORE_CREATE_NEW_FLAG, NULL); ret = CertAddCertificateLinkToStore(store1, source, CERT_STORE_ADD_ALWAYS, &linked); - todo_wine ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { @@ -2252,7 +2247,6 @@ static void testAddCertificateLink(void) CERT_STORE_CREATE_NEW_FLAG, NULL); ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); - todo_wine ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { @@ -2313,7 +2307,6 @@ static void testAddCertificateLink(void) /* Test adding a link to a file store. */ ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); - todo_wine ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { @@ -2381,13 +2374,13 @@ static void testAddCertificateLink(void) ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); - todo_wine ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { ok(linked->hCertStore == store2, "unexpected store"); ret = pCertControlStore(store2, 0, CERT_STORE_CTRL_COMMIT, NULL); ok(ret, "CertControlStore failed: %d\n", ret); + todo_wine compareStore(store2, "file store -> system store", serializedStoreWithCertAndHash, sizeof(serializedStoreWithCertAndHash)); @@ -2405,7 +2398,6 @@ static void testAddCertificateLink(void) ok(store2 != NULL, "CertOpenStore failed: %08x\n", GetLastError()); ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); - todo_wine ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) {

1 0

Dylan Smith : richedit: Avoid notifying parent window in improper state.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 049cf5aca0a2daafe0ce078757ad60f1a1cadc9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=049cf5aca0a2daafe0ce07875… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri May 14 20:11:28 2010 -0400 richedit: Avoid notifying parent window in improper state. ME_CommitUndo and ME_CommitCoalescingUndo call ME_SendSelChange, which may notify the parent window that the selection has changed, therefore should generally be called after wrapping the text. Otherwise, the parent window may send a message to the editor and cause an assertion failure. --- dlls/riched20/editor.c | 50 +++++++++++++++++++++++++++++----------------- dlls/riched20/richole.c | 2 +- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 531fae1..591f9ff 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -317,8 +317,8 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea break; stream->dwSize = 0; } while(1); - ME_CommitUndo(editor); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); return 0; } @@ -2105,10 +2105,16 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) return TRUE; case VK_BACK: case VK_DELETE: + { + int saved_nEventMask; editor->nUDArrowX = -1; /* FIXME backspace and delete aren't the same, they act different wrt paragraph style of the merged paragraph */ if (editor->styleFlags & ES_READONLY) return FALSE; + /* Prevent calling ME_SendSelChange until after wrapping the + * text due to text deletion. */ + saved_nEventMask = editor->nEventMask; + editor->nEventMask = 0; if (ME_IsSelection(editor)) { ME_DeleteSelection(editor); @@ -2136,12 +2142,18 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_CommitCoalescingUndo(editor); } else + { + editor->nEventMask = saved_nEventMask; return TRUE; + } + editor->nEventMask = saved_nEventMask; ME_MoveCursorFromTableRowStartParagraph(editor); ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor); + ME_SendSelChange(editor); ME_SendRequestResize(editor, FALSE); return TRUE; + } case VK_RETURN: if (editor->bDialogMode) { @@ -2193,9 +2205,9 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_CommitUndo(editor); ME_CheckTablesForCorruption(editor); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); return TRUE; } else if (para == editor->pCursors[1].pPara && @@ -2218,9 +2230,9 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[1] = editor->pCursors[0]; para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; - ME_CommitCoalescingUndo(editor); ME_CheckTablesForCorruption(editor); ME_UpdateRepaint(editor); + ME_CommitCoalescingUndo(editor); return TRUE; } } else { /* v1.0 - 3.0 */ @@ -2236,8 +2248,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_CommitCoalescingUndo(editor); ME_UpdateRepaint(editor); + ME_CommitCoalescingUndo(editor); return TRUE; } } else { @@ -2263,8 +2275,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; } - ME_CommitCoalescingUndo(editor); ME_UpdateRepaint(editor); + ME_CommitCoalescingUndo(editor); return TRUE; } } @@ -2278,11 +2290,11 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) else ME_InsertTextFromCursor(editor, 0, &endl, 1, style); ME_ReleaseStyle(style); - ME_CommitCoalescingUndo(editor); SetCursor(NULL); ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor); + ME_CommitCoalescingUndo(editor); } return TRUE; } @@ -2320,8 +2332,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) if (result && nKey == 'X') { ME_InternalDeleteText(editor, selStart, nChars, FALSE); - ME_CommitUndo(editor); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); } return result; } @@ -2446,12 +2458,12 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, ME_ContinueCoalescingTransaction(editor); ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style); - ME_CommitCoalescingUndo(editor); ITextHost_TxSetCursor(editor->texthost, NULL, FALSE); } ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor); + ME_CommitCoalescingUndo(editor); } return 0; } @@ -3295,13 +3307,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetCursorToStart(editor, &cursor); ME_UpdateLinkAttribute(editor, &cursor, INT_MAX); } + ME_UpdateRepaint(editor); ME_CommitUndo(editor); if (!(pStruct->flags & ST_KEEPUNDO)) { editor->nModifyStep = oldModify; ME_EmptyUndoStack(editor); } - ME_UpdateRepaint(editor); return len; } case EM_SETBKGNDCOLOR: @@ -3382,13 +3394,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetSelectionCharFormat(editor, p); if (bRepaint) editor->nModifyStep = 1; } - ME_CommitUndo(editor); if (bRepaint) { ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); ME_Repaint(editor); } + ME_CommitUndo(editor); return 1; } case EM_GETCHARFORMAT: @@ -3461,8 +3473,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int from, to; int nStartCursor = ME_GetSelectionOfs(editor, &from, &to); ME_InternalDeleteText(editor, &editor->pCursors[nStartCursor], to-from, FALSE); - ME_CommitUndo(editor); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); return 0; } case EM_REPLACESEL: @@ -3486,11 +3498,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (len>0 && wszText[len-1] == '\n') ME_ClearTempStyle(editor); ME_EndToUnicode(unicode, wszText); - ME_CommitUndo(editor); ME_UpdateSelectionLinkAttribute(editor); + ME_UpdateRepaint(editor); + ME_CommitUndo(editor); if (!wParam) ME_EmptyUndoStack(editor); - ME_UpdateRepaint(editor); return len; } case EM_SCROLLCARET: @@ -3514,10 +3526,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetCharFormat(editor, &start, NULL, &fmt); ME_SetDefaultCharFormat(editor, &fmt); - ME_CommitUndo(editor); ME_MarkAllForWrapping(editor); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); + ME_CommitUndo(editor); if (bRepaint) ME_Repaint(editor); return 0; @@ -3564,9 +3576,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_UpdateLinkAttribute(editor, &cursor, INT_MAX); ME_SetSelection(editor, 0, 0); editor->nModifyStep = 0; + ME_UpdateRepaint(editor); ME_CommitUndo(editor); ME_EmptyUndoStack(editor); - ME_UpdateRepaint(editor); return 1; } case EM_CANPASTE: @@ -3591,8 +3603,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (ME_Copy(editor, selStart, nChars) && msg == WM_CUT) { ME_InternalDeleteText(editor, selStart, nChars, FALSE); - ME_CommitUndo(editor); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); } return 0; } @@ -3927,9 +3939,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } } - ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); ME_MoveCaret(editor); + ME_CommitUndo(editor); return 0; } case WM_DESTROY: @@ -4245,8 +4257,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); - ME_CommitUndo(editor); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); return 0; } case WM_IME_COMPOSITION: @@ -4256,7 +4268,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_Style *style = ME_GetInsertStyle(editor, 0); hIMC = ITextHost_TxImmGetContext(editor->texthost); ME_DeleteSelection(editor); - ME_CommitUndo(editor); ME_SaveTempStyle(editor); if (lParam & GCS_RESULTSTR) { @@ -4285,6 +4296,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } ME_ReleaseStyle(style); ME_UpdateRepaint(editor); + ME_CommitUndo(editor); return 0; } case WM_IME_ENDCOMPOSITION: diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5b6b2b6..e9712b6 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -390,8 +390,8 @@ IRichEditOle_fnInsertObject(IRichEditOle *me, REOBJECT *reo) if (reo->cbStruct < sizeof(*reo)) return STG_E_INVALIDPARAMETER; ME_InsertOLEFromCursor(This->editor, reo, 0); - ME_CommitUndo(This->editor); ME_UpdateRepaint(This->editor); + ME_CommitUndo(This->editor); return S_OK; }

1 0

Gerald Pfeifer : oleaut32: Remove variable rOk which is not really used from VarMod.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 5b8eccd3c6789c86df2a85e5c3a5480d5dac20ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8eccd3c6789c86df2a85e5c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 14 22:01:50 2010 +0200 oleaut32: Remove variable rOk which is not really used from VarMod. --- dlls/oleaut32/variant.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 450856f..3d8e528 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5420,7 +5420,6 @@ end: HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) { BOOL lOk = TRUE; - BOOL rOk = TRUE; HRESULT rc = E_FAIL; int resT = 0; VARIANT lv,rv; @@ -5491,7 +5490,6 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) } - rOk = TRUE; switch (V_VT(right) & VT_TYPEMASK) { case VT_BOOL : case VT_I1 :

1 0

Gerald Pfeifer : riched20: Remove variables yprev and ys which are not really used from ME_ArrowPageUp .
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: f772c799ae0f4a025a3a6d44a8565a9477bb2a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f772c799ae0f4a025a3a6d44a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 14 22:04:32 2010 +0200 riched20: Remove variables yprev and ys which are not really used from ME_ArrowPageUp. --- dlls/riched20/caret.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 930fb14..5750db9 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1354,7 +1354,7 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) } else { ME_DisplayItem *pRun = pCursor->pRun; ME_DisplayItem *pLast; - int x, y, ys, yd, yp, yprev; + int x, y, yd, yp; int yOldScrollPos = editor->vert_si.nPos; x = ME_GetXForArrow(editor, pCursor); @@ -1364,7 +1364,7 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) p = ME_FindItemBack(pRun, diStartRowOrParagraph); assert(p->type == diStartRow); yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; - yprev = ys = y = yp + p->member.row.pt.y; + y = yp + p->member.row.pt.y; ME_ScrollUp(editor, editor->sizeWindow.cy); /* Only move the cursor by the amount scrolled. */ @@ -1385,7 +1385,6 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) if (y < yd) break; pLast = p; - yprev = y; } while(1); pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset,

1 0

Alexandre Julliard : comctl32/imagelist: Pre-multiply the colors by the alpha channel when storing an image with alpha .
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: f2b993d414517037cf064e9aed954cdae96646f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b993d414517037cf064e9ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 14 20:19:58 2010 +0200 comctl32/imagelist: Pre-multiply the colors by the alpha channel when storing an image with alpha. --- dlls/comctl32/imagelist.c | 18 ++++++++++++++---- dlls/comctl32/tests/imagelist.c | 16 ++++++++-------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index bd1530e..7b30643 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -202,15 +202,25 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, for (j = n * width; j < (n + 1) * width; j++) if (!mask_bits || !((mask_bits[i * mask_width + j / 8] << (j % 8)) & 0x80)) bits[i * bm.bmWidth + j] |= 0xff000000; - StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); } else { if (himl->has_alpha) himl->has_alpha[pos + n] = 1; - StretchBlt( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - hdc, n * width, 0, width, height, SRCCOPY ); + + /* pre-multiply by the alpha channel */ + for (i = 0; i < height; i++) + for (j = n * width; j < (n + 1) * width; j++) + { + DWORD argb = bits[i * bm.bmWidth + j]; + DWORD alpha = argb >> 24; + bits[i * bm.bmWidth + j] = ((argb & 0xff000000) | + (((argb & 0x00ff0000) * alpha / 255) & 0x00ff0000) | + (((argb & 0x0000ff00) * alpha / 255) & 0x0000ff00) | + (((argb & 0x000000ff) * alpha / 255))); + } } + StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, + n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); if (hdcMask) StretchBlt( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, hdcMask, n * width, 0, width, height, SRCCOPY ); diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 43eeeca..cf749c8 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1189,17 +1189,17 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_IMAGE, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_PRESERVEALPHA, 0x00ABCDEF, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, 0x00D3E5F7, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_TRANSPARENT, 0x00D3E5F7, __LINE__); todo_wine { - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, 0x00D3E5F7, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_TRANSPARENT, 0x00D3E5F7, __LINE__); check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0x00E8F1FA, 0x009DA8B1, __LINE__); check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0x00E8F1FA, 0x008C99A3, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_MASK, 0x00D3E5F7, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_IMAGE, 0x00D3E5F7, __LINE__); - check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x005D6F81, __LINE__); } + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_MASK, 0x00D3E5F7, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_IMAGE, 0x00D3E5F7, __LINE__); + todo_wine check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x005D6F81, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iTransparentImage, ILD_NORMAL, 0x00FFFFFF, __LINE__); @@ -1207,8 +1207,8 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iImage, SRCINVERT, 0x00543210, __LINE__); /* ILD_ROP is ignored when the image has an alpha channel */ - todo_wine check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCCOPY, 0x00D3E5F7, __LINE__); - todo_wine check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCINVERT, 0x00D3E5F7, __LINE__); + check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCCOPY, 0x00D3E5F7, __LINE__); + check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCINVERT, 0x00D3E5F7, __LINE__); todo_wine check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_SATURATE, 0, 0x00CCCCCC, __LINE__); todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_SATURATE, 0, 0x00AFAFAF, 0x00F0F0F0, __LINE__); @@ -1217,7 +1217,7 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_SHADOW, 0, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00D5E6F7, __LINE__); - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00E9F2FB, 0x00AEB7C0, __LINE__); + check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00E9F2FB, 0x00AEB7C0, __LINE__); todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_NORMAL, 127, 0x00E9F2FB, 0x00D3E5F7, __LINE__); cleanup:

1 0

Alexandre Julliard : comctl32/imagelist: Generate the mask from the alpha channel if present.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 45fd49bab6a0ad714f638ca13b65f1e446c08e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=45fd49bab6a0ad714f638ca13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 16 12:48:08 2010 +0200 comctl32/imagelist: Generate the mask from the alpha channel if present. --- dlls/comctl32/imagelist.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 7b30643..e8d3323 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -145,15 +145,18 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, BOOL ret = FALSE; HDC hdcMask = 0; BITMAP bm; - BITMAPINFO *info; + BITMAPINFO *info, *mask_info = NULL; DWORD *bits = NULL; BYTE *mask_bits = NULL; int i, j, n; POINT pt; DWORD mask_width; - if (himl->uBitsPixel != 32) return FALSE; if (!GetObjectW( hbmImage, sizeof(bm), &bm )) return FALSE; + + /* if neither the imagelist nor the source bitmap can have an alpha channel, bail out now */ + if (himl->uBitsPixel != 32 && bm.bmBitsPixel != 32) return FALSE; + SelectObject( hdc, hbmImage ); mask_width = (bm.bmWidth + 31) / 32 * 4; @@ -174,13 +177,13 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, if (hbmMask) { - info->bmiHeader.biBitCount = 1; - info->bmiHeader.biSizeImage = mask_width * height; + if (!(mask_info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[2] )))) + goto done; + mask_info->bmiHeader = info->bmiHeader; + mask_info->bmiHeader.biBitCount = 1; + mask_info->bmiHeader.biSizeImage = mask_width * height; if (!(mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; - if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS )) goto done; - /* restore values for color info */ - info->bmiHeader.biBitCount = 32; - info->bmiHeader.biSizeImage = bm.bmWidth * height * 4; + if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; hdcMask = CreateCompatibleDC( 0 ); SelectObject( hdcMask, hbmMask ); } @@ -202,6 +205,8 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, for (j = n * width; j < (n + 1) * width; j++) if (!mask_bits || !((mask_bits[i * mask_width + j / 8] << (j % 8)) & 0x80)) bits[i * bm.bmWidth + j] |= 0xff000000; + if (hdcMask) StretchBlt( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, + hdcMask, n * width, 0, width, height, SRCCOPY ); } else { @@ -209,6 +214,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, /* pre-multiply by the alpha channel */ for (i = 0; i < height; i++) + { for (j = n * width; j < (n + 1) * width; j++) { DWORD argb = bits[i * bm.bmWidth + j]; @@ -218,12 +224,23 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, (((argb & 0x0000ff00) * alpha / 255) & 0x0000ff00) | (((argb & 0x000000ff) * alpha / 255))); } + } + + if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ + { + for (i = 0; i < height; i++) + for (j = n * width; j < (n + 1) * width; j++) + if ((bits[i * bm.bmWidth + j] >> 24) > 25) /* more than 10% alpha */ + mask_bits[i * mask_width + j / 8] &= ~(0x80 >> (j % 8)); + else + mask_bits[i * mask_width + j / 8] |= 0x80 >> (j % 8); + StretchDIBits( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, + n * width, 0, width, height, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY ); + } } StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); - if (hdcMask) StretchBlt( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, - hdcMask, n * width, 0, width, height, SRCCOPY ); } ret = TRUE;

1 0

Alexandre Julliard : comctl32/imagelist: Fix the allocated size of the has_alpha array.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 3915cfbd02faabc7eac1b4ca147a663779987722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3915cfbd02faabc7eac1b4ca1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 17 12:42:25 2010 +0200 comctl32/imagelist: Fix the allocated size of the has_alpha array. --- dlls/comctl32/imagelist.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index e8d3323..c1ea00a 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -324,8 +324,7 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount) if (himl->has_alpha) { - char *new_alpha = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - himl->has_alpha, himl->cMaxImage ); + char *new_alpha = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->has_alpha, nNewCount ); if (new_alpha) himl->has_alpha = new_alpha; else {

1 0

Alexandre Julliard : configure: Rename the 64-bit loader to wine64 and keep wine always for the 32-bit loader .
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: f3831cf2cb40fc9a5fe1065f640ec9c02552780f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3831cf2cb40fc9a5fe1065f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 16 17:01:52 2010 +0200 configure: Rename the 64-bit loader to wine64 and keep wine always for the 32-bit loader. This provides better backwards compatibility when running with a 32-bit prefix. --- .gitignore | 2 +- configure | 10 +++++----- configure.ac | 10 +++++----- dlls/kernel32/process.c | 12 ++++++------ loader/Makefile.in | 2 +- tools/winewrapper | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index a01cc19..b064d05 100644 --- a/.gitignore +++ b/.gitignore @@ -236,7 +236,7 @@ loader/wine-preloader loader/wine.de.man loader/wine.fr.man loader/wine.man -loader/wine32 +loader/wine64 programs/Makeprog.rules programs/rpcss/epm.h programs/rpcss/epm_s.c diff --git a/configure b/configure index 4940ce6..2ab935b 100755 --- a/configure +++ b/configure @@ -12250,7 +12250,7 @@ esac MAIN_BINARY="wine" -test -z "$with_wine64" || MAIN_BINARY="wine32" +test "x$enable_win64" != "xyes" || MAIN_BINARY="wine64" case $host_cpu in *i[3456789]86*) @@ -14818,13 +14818,13 @@ ac_config_files="$ac_config_files Make.tmp:Makefile.in" if test -n "$with_wine64" then -wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine32 +wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine fonts server: \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@ -$with_wine64/loader/wine32: - \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine32 \$@ +$with_wine64/loader/wine: + \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@ clean:: - \$(RM) fonts server $with_wine64/loader/wine32" + \$(RM) fonts server $with_wine64/loader/wine" fi wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall:: diff --git a/configure.ac b/configure.ac index 4224e37..df70de6 100644 --- a/configure.ac +++ b/configure.ac @@ -1734,7 +1734,7 @@ case $host_os in esac AC_SUBST(MAIN_BINARY,"wine") -test -z "$with_wine64" || MAIN_BINARY="wine32" +test "x$enable_win64" != "xyes" || MAIN_BINARY="wine64" case $host_cpu in *i[[3456789]]86*) @@ -2753,13 +2753,13 @@ dnl Some final makefile rules if test -n "$with_wine64" then WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], -[all: fonts server $with_wine64/loader/wine32 +[all: fonts server $with_wine64/loader/wine fonts server: \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@] -$with_wine64/loader/wine32: - \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine32 \$[@] +$with_wine64/loader/wine: + \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] clean:: - \$(RM) fonts server $with_wine64/loader/wine32]) + \$(RM) fonts server $with_wine64/loader/wine]) fi WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9a1f2f5..b71a390 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1579,17 +1579,17 @@ static const char *get_alternate_loader( char **ret_env ) *ret_env = NULL; - if (wine_get_build_dir()) loader = is_win64 ? "loader/wine32" : "server/../loader/wine"; + if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "server/../loader/wine64"; if (loader_env) { int len = strlen( loader_env ); - if (is_win64) + if (!is_win64) { if (!(env = HeapAlloc( GetProcessHeap(), 0, sizeof("WINELOADER=") + len + 2 ))) return NULL; strcpy( env, "WINELOADER=" ); strcat( env, loader_env ); - strcat( env, "32" ); + strcat( env, "64" ); } else { @@ -1597,7 +1597,7 @@ static const char *get_alternate_loader( char **ret_env ) strcpy( env, "WINELOADER=" ); strcat( env, loader_env ); len += sizeof("WINELOADER=") - 1; - if (!strcmp( env + len - 2, "32" )) env[len - 2] = 0; + if (!strcmp( env + len - 2, "64" )) env[len - 2] = 0; } if (!loader) { @@ -1606,7 +1606,7 @@ static const char *get_alternate_loader( char **ret_env ) } *ret_env = env; } - if (!loader) loader = is_win64 ? "wine32" : "wine"; + if (!loader) loader = is_win64 ? "wine" : "wine64"; return loader; } @@ -1637,7 +1637,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW if (!is_win64 && !is_wow64 && (binary_info->flags & BINARY_FLAG_64BIT)) { - ERR( "starting 64-bit process %s not supported on this platform\n", debugstr_w(filename) ); + ERR( "starting 64-bit process %s not supported on this environment\n", debugstr_w(filename) ); SetLastError( ERROR_BAD_EXE_FORMAT ); return FALSE; } diff --git a/loader/Makefile.in b/loader/Makefile.in index 6e08066..df55236 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -13,7 +13,7 @@ EXTRA_BINARIES = @EXTRA_BINARIES@ PROGRAMS = \ wine \ - wine32 \ + wine64 \ wine-installed \ wine-preloader diff --git a/tools/winewrapper b/tools/winewrapper index c664142..a4d17ac 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -83,8 +83,8 @@ fi if [ -x "$topdir/loader/wine" ] then WINELOADER="$topdir/loader/wine" -elif [ -x "$topdir/loader/wine32" ] -then WINELOADER="$topdir/loader/wine32" +elif [ -x "$topdir/loader/wine64" ] +then WINELOADER="$topdir/loader/wine64" else echo "$0: could not find the wine loader in $topdir" exit 1

1 0