February 2009 - Wine-commits

Jacek Caban : shdocvw: Added loading tests.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 7ac34f9e50f742d0a7d40510dbd36ba48a4bf421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac34f9e50f742d0a7d40510d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 23 15:38:23 2009 +0100 shdocvw: Added loading tests. --- dlls/shdocvw/tests/webbrowser.c | 148 ++++++++++++++++++++++++++++++++++----- 1 files changed, 129 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ac34f9e50f742d0a7d40…

1 0

Jacek Caban : shdocvw: Added QueryStatus implementation.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 64adaf723bdffabedef62d7f166df6675e1988b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64adaf723bdffabedef62d7f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 23 15:38:30 2009 +0100 shdocvw: Added QueryStatus implementation. --- dlls/shdocvw/oleobject.c | 21 +++++++++++++++++++-- dlls/shdocvw/tests/webbrowser.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 9b7168f..aab06d0 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -868,9 +868,26 @@ static HRESULT WINAPI WBOleCommandTarget_QueryStatus(IOleCommandTarget *iface, const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) { WebBrowser *This = OLECMD_THIS(iface); - FIXME("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, + IOleCommandTarget *cmdtrg; + HRESULT hres; + + TRACE("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); - return E_NOTIMPL; + + if(!This->doc_host.document) + return 0x80040104; + + /* NOTE: There are probably some commands that we should handle here + * instead of forwarding to document object. */ + + hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(FAILED(hres)) + return hres; + + hres = IOleCommandTarget_QueryStatus(cmdtrg, pguidCmdGroup, cCmds, prgCmds, pCmdText); + IOleCommandTarget_Release(cmdtrg); + + return hres; } static HRESULT WINAPI WBOleCommandTarget_Exec(IOleCommandTarget *iface, diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index f699e90..2f1c7d7 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -30,6 +30,7 @@ #include "exdisp.h" #include "htiframe.h" #include "mshtmhst.h" +#include "mshtmcid.h" #include "idispids.h" #include "olectl.h" #include "mshtmdid.h" @@ -2123,6 +2124,36 @@ static void test_download(void) CHECK_CALLED(Invoke_DOCUMENTCOMPLETE); } +static void test_olecmd(IUnknown *unk, BOOL loaded) +{ + IOleCommandTarget *cmdtrg; + OLECMD cmds[3]; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "Could not get IOleCommandTarget iface: %08x\n", hres); + if(FAILED(hres)) + return; + + cmds[0].cmdID = OLECMDID_SPELL; + cmds[0].cmdf = 0xdeadbeef; + cmds[1].cmdID = OLECMDID_REFRESH; + cmds[1].cmdf = 0xdeadbeef; + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 2, cmds, NULL); + if(loaded) { + ok(hres == S_OK, "QueryStatus failed: %08x\n", hres); + ok(cmds[0].cmdf == OLECMDF_SUPPORTED, "OLECMDID_SPELL cmdf = %x\n", cmds[0].cmdf); + ok(cmds[1].cmdf == (OLECMDF_ENABLED|OLECMDF_SUPPORTED), + "OLECMDID_REFRESH cmdf = %x\n", cmds[1].cmdf); + }else { + ok(hres == 0x80040104, "QueryStatus failed: %08x\n", hres); + ok(cmds[0].cmdf == 0xdeadbeef, "OLECMDID_SPELL cmdf = %x\n", cmds[0].cmdf); + ok(cmds[1].cmdf == 0xdeadbeef, "OLECMDID_REFRESH cmdf = %x\n", cmds[0].cmdf); + } + + IOleCommandTarget_Release(cmdtrg); +} + static void test_IServiceProvider(IUnknown *unk) { IServiceProvider *servprov = (void*)0xdeadbeef; @@ -2213,10 +2244,12 @@ static void test_WebBrowser(BOOL do_download) test_Extent(unk); test_wb_funcs(unk, TRUE); test_DoVerb(unk); + test_olecmd(unk, FALSE); test_Navigate2(unk); if(do_download) { test_download(); + test_olecmd(unk, TRUE); } test_ClientSite(unk, NULL);

1 0

Dylan Smith : richedit: EM_SHOWSCROLLBAR hides scrollbars for less than page of text.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 963407a9ef315e42efd6fa9b74cfe564077f161f URL: http://source.winehq.org/git/wine.git/?a=commit;h=963407a9ef315e42efd6fa9b7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 24 02:39:03 2009 -0500 richedit: EM_SHOWSCROLLBAR hides scrollbars for less than page of text. When all the text fits on the screen, the scrollbars are not shown from EM_SHOWSCROLLBAR. The message instead adds support for the specified scrollbar when lParam is TRUE, so that the scrollbar will be shown when sufficient text is in the document. --- dlls/riched20/editor.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8af973c..4bfc9c2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3156,12 +3156,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; } - if (lParam) + if (lParam) { editor->styleFlags |= flags; - else - editor->styleFlags &= flags; - - ITextHost_TxShowScrollBar(editor->texthost, wParam, lParam); + if (flags & WS_HSCROLL) + ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, + editor->nTotalWidth > editor->sizeWindow.cx); + if (flags & WS_VSCROLL) + ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, + editor->nTotalLength > editor->sizeWindow.cy); + } else { + editor->styleFlags &= ~flags; + ITextHost_TxShowScrollBar(editor->texthost, wParam, FALSE); + } return 0; } case EM_SETTEXTEX:

1 0

Dylan Smith : richedit: Never wrap for single line controls.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 73e0c5ea8b6697b6c8955c7b73902099f267b841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e0c5ea8b6697b6c8955c7b7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 24 02:56:18 2009 -0500 richedit: Never wrap for single line controls. I tested without the ES_MULTILINE style, and found that wrapping doesn't occur where it normally would. --- dlls/riched20/editor.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4bfc9c2..dc03d42 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2636,7 +2636,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); ed->nAvailWidth = 0; /* wrap to client area */ - ed->bWordWrap = (props & TXTBIT_WORDWRAP) != 0; ed->bHideSelection = FALSE; ed->pfnWordBreak = NULL; ed->lpOleCallback = NULL; @@ -2665,8 +2664,12 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) if (props & TXTBIT_AUTOWORDSEL) ed->styleFlags |= ECO_AUTOWORDSELECTION; - if (props & TXTBIT_MULTILINE) + if (props & TXTBIT_MULTILINE) { ed->styleFlags |= ES_MULTILINE; + ed->bWordWrap = (props & TXTBIT_WORDWRAP) != 0; + } else { + ed->bWordWrap = FALSE; + } if (props & TXTBIT_READONLY) ed->styleFlags |= ES_READONLY; if (!(props & TXTBIT_HIDESELECTION)) @@ -4296,7 +4299,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_SETTARGETDEVICE: if (wParam == 0) { - BOOL new = (lParam == 0); + BOOL new = (lParam == 0 && (editor->styleFlags & ES_MULTILINE)); if (editor->nAvailWidth || editor->bWordWrap != new) { editor->bWordWrap = new; @@ -4305,7 +4308,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } } else { int width = max(0, lParam); - if (!editor->bWordWrap || editor->nAvailWidth != width) + if ((editor->styleFlags & ES_MULTILINE) && + (!editor->bWordWrap || editor->nAvailWidth != width)) { editor->nAvailWidth = width; editor->bWordWrap = TRUE;

1 0

Dylan Smith : richedit: Return FALSE for EM_LINESCROLL with single line control.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: f28988684e02f5e3992e83aa942a491352e67c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28988684e02f5e3992e83aa9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 24 02:38:57 2009 -0500 richedit: Return FALSE for EM_LINESCROLL with single line control. --- dlls/riched20/editor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e73679e..8af973c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3375,8 +3375,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_LINESCROLL: { + if (!(editor->styleFlags & ES_MULTILINE)) + return FALSE; ME_ScrollDown(editor, lParam * 8); /* FIXME follow the original */ - return TRUE; /* Should return false if a single line richedit control */ + return TRUE; } case WM_CLEAR: {

1 0

Dylan Smith : richedit: Fixed scrollbar visiblility calculation after SetScrollInfo.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 5f51221d9c1b94040ef354e7f62a0ce9a838cdab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f51221d9c1b94040ef354e7f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 24 02:38:49 2009 -0500 richedit: Fixed scrollbar visiblility calculation after SetScrollInfo. The scrollbar visibility can be changed from SetScrollRange or SetScrollInfo, but the visiblity that is a result of these calls are not consistent with the calculation made by richedit controls to decide whether to show or hide the scrollbars. --- dlls/riched20/paint.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index f235082..620ac69 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1111,6 +1111,18 @@ void ME_ScrollRight(ME_TextEditor *editor, int cx) ME_HScrollAbs(editor, editor->horz_si.nPos + cx); } +/* Calculates the visiblity after a call to SetScrollRange or + * SetScrollInfo with SIF_RANGE. */ +static BOOL ME_PostSetScrollRangeVisibility(SCROLLINFO *si) +{ + if (si->fMask & SIF_DISABLENOSCROLL) + return TRUE; + + /* This must match the check in SetScrollInfo to determine whether + * to show or hide the scrollbars. */ + return si->nMin < si->nMax - max(si->nPage - 1, 0); +} + void ME_UpdateScrollBar(ME_TextEditor *editor) { /* Note that this is the only function that should ever call @@ -1158,15 +1170,14 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, si.nMin, si.nMax, FALSE); ITextHost_TxSetScrollPos(editor->texthost, SB_HORZ, si.nPos, TRUE); } + /* SetScrollInfo or SetScrollRange change scrollbar visibility. */ + bScrollBarWasVisible = ME_PostSetScrollRangeVisibility(&si); } } if (si.fMask & SIF_DISABLENOSCROLL) { bScrollBarWillBeVisible = TRUE; } else if (!(editor->styleFlags & WS_HSCROLL)) { - /* SetScrollInfo or SetScrollRange may cause the scrollbar to be - * shown, so hide the scrollbar if necessary. */ - bScrollBarWasVisible = bScrollBarWillBeVisible; bScrollBarWillBeVisible = FALSE; } @@ -1205,15 +1216,14 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, si.nMin, si.nMax, FALSE); ITextHost_TxSetScrollPos(editor->texthost, SB_VERT, si.nPos, TRUE); } + /* SetScrollInfo or SetScrollRange change scrollbar visibility. */ + bScrollBarWasVisible = ME_PostSetScrollRangeVisibility(&si); } } if (si.fMask & SIF_DISABLENOSCROLL) { bScrollBarWillBeVisible = TRUE; } else if (!(editor->styleFlags & WS_VSCROLL)) { - /* SetScrollInfo or SetScrollRange may cause the scrollbar to be - * shown, so hide the scrollbar if necessary. */ - bScrollBarWasVisible = bScrollBarWillBeVisible; bScrollBarWillBeVisible = FALSE; }

1 0

Dylan Smith : richedit: Added missing initialization of nAvailWidth for ME_TextEditor.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: b9b9835f9368c83e15451e04c8e0781012ac4a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b9835f9368c83e15451e04c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 24 02:37:03 2009 -0500 richedit: Added missing initialization of nAvailWidth for ME_TextEditor. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2a053d7..e73679e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2635,6 +2635,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); + ed->nAvailWidth = 0; /* wrap to client area */ ed->bWordWrap = (props & TXTBIT_WORDWRAP) != 0; ed->bHideSelection = FALSE; ed->pfnWordBreak = NULL;

1 0

Dylan Smith : richedit: Don' t show vertical scrollbar for single line controls.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: a0466e2c0eb25fc0c2c6db1fbcca00b42be1d941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0466e2c0eb25fc0c2c6db1fb… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Feb 24 02:37:21 2009 -0500 richedit: Don't show vertical scrollbar for single line controls. The vertical scrollbar is not shown when the ES_MULTILINE style isn't used, unless ES_DISBALENOSCROLL is also used. --- dlls/riched20/paint.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 35ca097..f235082 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1071,7 +1071,8 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy - && (editor->styleFlags & WS_VSCROLL)) + && (editor->styleFlags & WS_VSCROLL) + && (editor->styleFlags & ES_MULTILINE)) || (editor->styleFlags & ES_DISABLENOSCROLL); if (bScrollBarIsVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, @@ -1174,7 +1175,8 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) /* Update vertical scrollbar */ bScrollBarWasVisible = editor->vert_si.nMax > editor->vert_si.nPage; - bScrollBarWillBeVisible = editor->nTotalLength > editor->sizeWindow.cy; + bScrollBarWillBeVisible = editor->nTotalLength > editor->sizeWindow.cy && + (editor->styleFlags & ES_MULTILINE); if (editor->vert_si.nPos && !bScrollBarWillBeVisible) {

1 0

Francois Gouget : crypt32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: df4d66458218ef4cf369356cd1cc3df6e3516ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4d66458218ef4cf369356cd… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 24 00:04:36 2009 +0100 crypt32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/crypt32/tests/base64.c | 4 ++-- dlls/crypt32/tests/cert.c | 10 +++++----- dlls/crypt32/tests/chain.c | 6 +++--- dlls/crypt32/tests/crl.c | 4 ++-- dlls/crypt32/tests/encode.c | 2 +- dlls/crypt32/tests/oid.c | 2 +- dlls/crypt32/tests/protectdata.c | 2 +- dlls/crypt32/tests/store.c | 14 +++++++------- dlls/crypt32/tests/str.c | 10 +++++----- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 15f41c8..5a260ed 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -449,10 +449,10 @@ START_TEST(base64) if (pCryptBinaryToStringA) testBinaryToStringA(); else - skip("CryptBinaryToStringA is not available\n"); + win_skip("CryptBinaryToStringA is not available\n"); if (pCryptStringToBinaryA) testStringToBinaryA(); else - skip("CryptStringToBinaryA is not available\n"); + win_skip("CryptStringToBinaryA is not available\n"); } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index ffb9105..322fa2f 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1672,12 +1672,12 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, if (!pCryptVerifyCertificateSignatureEx) { - skip("no CryptVerifyCertificateSignatureEx support\n"); + win_skip("no CryptVerifyCertificateSignatureEx support\n"); return; } if (!pCryptEncodeObjectEx) { - skip("no CryptEncodeObjectEx support\n"); + win_skip("no CryptEncodeObjectEx support\n"); return; } ret = pCryptVerifyCertificateSignatureEx(0, 0, 0, NULL, 0, NULL, 0, NULL); @@ -1897,7 +1897,7 @@ static void testCreateSelfSignCert(void) if (!pCertCreateSelfSignCertificate) { - skip("CertCreateSelfSignCertificate() is not available\n"); + win_skip("CertCreateSelfSignCertificate() is not available\n"); return; } @@ -2334,7 +2334,7 @@ static void testGetValidUsages(void) if (!pCertGetValidUsages) { - skip("CertGetValidUsages() is not available\n"); + win_skip("CertGetValidUsages() is not available\n"); return; } @@ -2875,7 +2875,7 @@ static void testAcquireCertPrivateKey(void) if (!pCryptAcquireCertificatePrivateKey) { - skip("CryptAcquireCertificatePrivateKey() is not available\n"); + win_skip("CryptAcquireCertificatePrivateKey() is not available\n"); return; } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 73fda34..f7efe64 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -68,7 +68,7 @@ static void testCreateCertChainEngine(void) if (!pCertCreateCertificateChainEngine || !pCertFreeCertificateChainEngine) { - skip("Cert*CertificateChainEngine() functions are not available\n"); + win_skip("Cert*CertificateChainEngine() functions are not available\n"); return; } @@ -1930,7 +1930,7 @@ static void testVerifyCertChainPolicy(void) if (!pCertVerifyCertificateChainPolicy) { - skip("CertVerifyCertificateChainPolicy() is not available\n"); + win_skip("CertVerifyCertificateChainPolicy() is not available\n"); return; } @@ -2010,7 +2010,7 @@ START_TEST(chain) testCreateCertChainEngine(); if (!pCertGetCertificateChain) { - skip("CertGetCertificateChain() is not available\n"); + win_skip("CertGetCertificateChain() is not available\n"); } else { diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 0bd0e5c..abd8491 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -219,7 +219,7 @@ static void testFindCRL(void) if (!store) return; if (!pCertFindCRLInStore) { - skip("CertFindCRLInStore() is not available\n"); + win_skip("CertFindCRLInStore() is not available\n"); return; } @@ -619,7 +619,7 @@ static void testFindCertInCRL(void) if (!pCertFindCertificateInCRL) { - skip("CertFindCertificateInCRL() is not available\n"); + win_skip("CertFindCertificateInCRL() is not available\n"); return; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 439a25f..e406194 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7497,7 +7497,7 @@ START_TEST(encode) pCryptEncodeObjectEx = (void*)GetProcAddress(hCrypt32, "CryptEncodeObjectEx"); if (!pCryptDecodeObjectEx || !pCryptEncodeObjectEx) { - skip("CryptDecodeObjectEx() is not available\n"); + win_skip("CryptDecodeObjectEx() is not available\n"); return; } diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index bb23a1e..9b50129 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -531,7 +531,7 @@ static void test_enumOIDInfo(void) if (!pCryptEnumOIDInfo) { - skip("CryptEnumOIDInfo() is not available\n"); + win_skip("CryptEnumOIDInfo() is not available\n"); return; } diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index 97b08c5..82cf1aa 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -221,7 +221,7 @@ START_TEST(protectdata) pCryptUnprotectData = (void*)GetProcAddress(hCrypt32, "CryptUnprotectData"); if (!pCryptProtectData || !pCryptUnprotectData) { - skip("Crypt(Un)ProtectData() is not available\n"); + win_skip("Crypt(Un)ProtectData() is not available\n"); return; } diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 65d7f15..ae10fbc 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -285,7 +285,7 @@ static void testCollectionStore(void) if (!pCertAddStoreToCollection) { - skip("CertAddStoreToCollection() is not available\n"); + win_skip("CertAddStoreToCollection() is not available\n"); return; } @@ -545,7 +545,7 @@ static void testCollectionStore(void) if (!pCertRemoveStoreFromCollection) { - skip("CertRemoveStoreFromCollection() is not available\n"); + win_skip("CertRemoveStoreFromCollection() is not available\n"); } else { @@ -639,7 +639,7 @@ static void testRegStore(void) /* It looks like the remainder pretty much needs CertControlStore() */ if (!pCertControlStore) { - skip("CertControlStore() is not available\n"); + win_skip("CertControlStore() is not available\n"); return; } @@ -1113,7 +1113,7 @@ static void testFileStore(void) if (!pCertControlStore) { - skip("CertControlStore() is not available\n"); + win_skip("CertControlStore() is not available\n"); return; } @@ -1714,7 +1714,7 @@ static void testCertEnumSystemStore(void) if (!pCertEnumSystemStore) { - skip("CertEnumSystemStore() is not available\n"); + win_skip("CertEnumSystemStore() is not available\n"); return; } @@ -1754,7 +1754,7 @@ static void testStoreProperty(void) if (!pCertGetStoreProperty || !pCertSetStoreProperty) { - skip("CertGet/SetStoreProperty() is not available\n"); + win_skip("CertGet/SetStoreProperty() is not available\n"); return; } @@ -2016,7 +2016,7 @@ static void test_I_UpdateStore(void) if (!pI_CertUpdatestore) { - skip("No I_CertUpdateStore\n"); + win_skip("No I_CertUpdateStore\n"); return; } store1 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 2b30995..ebc3342 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -281,7 +281,7 @@ static void test_CertRDNValueToStrW(void) if (!pCertRDNValueToStrW) { - skip("CertRDNValueToStrW is not available\n"); + win_skip("CertRDNValueToStrW is not available\n"); return; } @@ -333,7 +333,7 @@ static void test_CertNameToStrA(void) if (!pCertNameToStrA) { - skip("CertNameToStrA is not available\n"); + win_skip("CertNameToStrA is not available\n"); return; } @@ -412,7 +412,7 @@ static void test_CertNameToStrW(void) if (!pCertNameToStrW) { - skip("CertNameToStrW is not available\n"); + win_skip("CertNameToStrW is not available\n"); return; } @@ -499,7 +499,7 @@ static void test_CertStrToNameA(void) if (!pCertStrToNameA) { - skip("CertStrToNameA is not available\n"); + win_skip("CertStrToNameA is not available\n"); return; } @@ -584,7 +584,7 @@ static void test_CertStrToNameW(void) if (!pCertStrToNameW) { - skip("CertStrToNameW is not available\n"); + win_skip("CertStrToNameW is not available\n"); return; }

1 0

Ken Thomases : winecoreaudio: Fix a copy-paste accident ("In" vs. "Out").
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: ad1090c23c29b42e6328edaa65f4837a1426c5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1090c23c29b42e6328edaa6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 23 17:34:07 2009 -0600 winecoreaudio: Fix a copy-paste accident ("In" vs. "Out"). --- dlls/winecoreaudio.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 43f2451..b6f55b8 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -542,7 +542,7 @@ LONG CoreAudio_WaveInit(void) for (i = 0; i < MAX_WAVEOUTDRV; ++i) { static const WCHAR wszWaveOutFormat[] = - {'C','o','r','e','A','u','d','i','o',' ','W','a','v','e','I','n',' ','%','d',0}; + {'C','o','r','e','A','u','d','i','o',' ','W','a','v','e','O','u','t',' ','%','d',0}; WOutDev[i].state = WINE_WS_CLOSED; WOutDev[i].cadev = &CoreAudio_DefaultDevice;

1 0