February 2009 - Wine-Commits

Jacek Caban : shdocvw: Added loading tests.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

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

Aurimas Fischer : mshtml: Add Lithuanian translation.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: d1c3fbbbfcd923b3c2ed50692875f0d70e08f152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c3fbbbfcd923b3c2ed50692… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sun Feb 22 12:16:59 2009 +0200 mshtml: Add Lithuanian translation. --- dlls/mshtml/Lt.rc | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/rsrc.rc | 1 + 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Lt.rc b/dlls/mshtml/Lt.rc new file mode 100644 index 0000000..c008183 --- /dev/null +++ b/dlls/mshtml/Lt.rc @@ -0,0 +1,59 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_HTMLDISABLED "HTML atvaizdavimas yra išjungtas." + IDS_HTMLDOCUMENT "HTML dokumentas" + IDS_DOWNLOADING "Atsiunčiama..." + IDS_INSTALLING "Įdiegiama..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko diegimo programa" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ši programa mėgina parodyti HTML puslapį. Šiam puslapiui parodyti reikia, kad būtų " \ + "įdiegtas Gecko (Mozilla HTML variklis). Spauskite įdiegti, jei norite, kad Wine " \ + "automatiškai atsiųstų ir įdiegtų Gecko.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT + CONTROL "Eiga", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Įdiegti", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Atsisakyti", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Saitas" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Saito informacija", -1, 5, 5, 190, 55 + LTEXT "&Tipas:", -1, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", -1, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Gerai", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Atsisakyti", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} + +#pragma code_page(default) diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index 83e9d69..8be957f 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -43,6 +43,7 @@ #include "Hu.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

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

Feb. 24, 2009

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: EM_SHOWSCROLLBAR hides scrollbars for less than page of text.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

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: Return FALSE for EM_LINESCROLL with single line control.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

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 Feb. 24, 2009

Feb. 24, 2009

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: Don' t show vertical scrollbar for single line controls.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

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

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

Feb. 24, 2009

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

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

Feb. 24, 2009

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 Feb. 24, 2009

Feb. 24, 2009

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