February 2009 - Wine-commits

Detlef Riekenberg : shdocvw/tests: Dump the guid for additional interfaces.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 6b505e14255ce24369bc1265563b6c365dc3a3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b505e14255ce24369bc12655… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Feb 26 00:20:00 2009 +0100 shdocvw/tests: Dump the guid for additional interfaces. --- dlls/shdocvw/tests/webbrowser.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 2f1c7d7..c6c204a 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1290,6 +1290,9 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) if(*ppv) return S_OK; + /* are there more interfaces, that a host can support? */ + trace("%s: interface not supported\n", debugstr_guid(riid)); + return E_NOINTERFACE; }

1 0

Alexandre Julliard : user32/tests: Fix some input tests on Win9x and NT4.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: affd20d9c8b1a0661341f102b36eb8330303d681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=affd20d9c8b1a0661341f102b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 25 23:30:13 2009 +0100 user32/tests: Fix some input tests on Win9x and NT4. --- dlls/user32/tests/input.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index e534e1c..e4ad1de 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -755,6 +755,15 @@ static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, struct sendinput_tes "%2d (%x/%x): the msg 0x%04x was expected, but got msg 0x%04x instead\n", id, test->wVk, test->dwFlags, expected->message, actual->message); } + /* NT4 doesn't send SYSKEYDOWN/UP to hooks, only KEYDOWN/UP */ + else if ((expected->flags & hook) && + (expected->message == WM_SYSKEYDOWN || expected->message == WM_SYSKEYUP) && + (actual->message == expected->message - 4)) + { + ok((expected->flags & hook) == (actual->flags & hook), + "%2d (%x/%x): the msg 0x%04x should have been sent by a hook\n", + id, test->wVk, test->dwFlags, expected->message); + } else ok(FALSE, "%2d (%x/%x): the msg 0x%04x was expected, but got msg 0x%04x instead\n", @@ -888,6 +897,9 @@ static void test_Input_blackbox(void) if (!ii && sent_messages_cnt <= 1 && !memcmp( ks1, ks2, sizeof(ks1) )) { win_skip( "window doesn't receive the queued input\n" ); + /* release the key */ + i.u.ki.dwFlags |= KEYEVENTF_KEYUP; + pSendInput(1, (INPUT*)&i, sizeof(TEST_INPUT)); break; } compare_and_check(ii, ks1, ks2, &sendinput_test[ii]); @@ -973,7 +985,11 @@ static void test_mouse_ll_hook(void) 10, 10, 200, 200, NULL, NULL, NULL, NULL); SetCursorPos(100, 100); - hook2 = SetWindowsHookExA(WH_MOUSE_LL, hook_proc2, GetModuleHandleA(0), 0); + if (!(hook2 = SetWindowsHookExA(WH_MOUSE_LL, hook_proc2, GetModuleHandleA(0), 0))) + { + win_skip( "cannot set MOUSE_LL hook\n" ); + goto done; + } hook1 = SetWindowsHookExA(WH_MOUSE_LL, hook_proc1, GetModuleHandleA(0), 0); GetCursorPos(&pt_old); @@ -1030,6 +1046,7 @@ static void test_mouse_ll_hook(void) ok(pt.x == pt_new.x && pt.y == pt_new.y, "Position changed: (%d,%d)\n", pt.x, pt.y); UnhookWindowsHookEx(hook2); +done: DestroyWindow(hwnd); SetCursorPos(pt_org.x, pt_org.y); } @@ -1058,6 +1075,11 @@ static void test_GetMouseMovePointsEx(void) */ SetLastError(MYERROR); retval = pGetMouseMovePointsEx(0, &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); + if (retval == ERROR_INVALID_PARAMETER) + { + win_skip( "GetMouseMovePointsEx broken on WinME\n" ); + return; + } ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError());

1 0

Vincent Povirk : shell32: Implement Get/SetIDList on ShellItem objects.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: b4ea7d32217c782c270a0f0037409d50d03ef5f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ea7d32217c782c270a0f003… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 13 16:40:19 2009 -0600 shell32: Implement Get/SetIDList on ShellItem objects. --- dlls/shell32/shellitem.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index b995534..643f1b5 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -204,9 +204,20 @@ static HRESULT WINAPI ShellItem_IPersistIDList_SetIDList(IPersistIDList* iface, LPCITEMIDLIST pidl) { ShellItem *This = impl_from_IPersistIDList(iface); + LPITEMIDLIST new_pidl; - FIXME("(%p,%p)\n", This, pidl); - return E_NOTIMPL; + TRACE("(%p,%p)\n", This, pidl); + + new_pidl = ILClone(pidl); + + if (new_pidl) + { + ILFree(This->pidl); + This->pidl = new_pidl; + return S_OK; + } + else + return E_OUTOFMEMORY; } static HRESULT WINAPI ShellItem_IPersistIDList_GetIDList(IPersistIDList* iface, @@ -214,8 +225,13 @@ static HRESULT WINAPI ShellItem_IPersistIDList_GetIDList(IPersistIDList* iface, { ShellItem *This = impl_from_IPersistIDList(iface); - FIXME("(%p,%p)\n", This, ppidl); - return E_NOTIMPL; + TRACE("(%p,%p)\n", This, ppidl); + + *ppidl = ILClone(This->pidl); + if (*ppidl) + return S_OK; + else + return E_OUTOFMEMORY; } static const IPersistIDListVtbl ShellItem_IPersistIDList_Vtbl = {

1 0

Dylan Smith : wordpad: Show error when user tries to add more than max tab stops.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 0292135a92c4a19f0ac8e2143f3c92f854a8dd55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0292135a92c4a19f0ac8e2143… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Feb 25 15:15:22 2009 -0500 wordpad: Show error when user tries to add more than max tab stops. Previously there was no such error, and if more than MAX_TAB_STOPS were added, then some of the tab stops would be silently discarded. --- programs/wordpad/En.rc | 3 ++- programs/wordpad/wordpad.c | 7 +++++-- programs/wordpad/wordpad.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index eecfef4..d1cfa5a 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -239,5 +239,6 @@ BEGIN STRING_WRITE_ACCESS_DENIED, "You do not have access to save the file." STRING_OPEN_FAILED, "Could not open the file." STRING_OPEN_ACCESS_DENIED, "You do not have access to open the file." - STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented" + STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented" + STRING_MAX_TAB_STOPS, "Cannot add more than 32 tab stops." END diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 0120d4e..f2ec4c5 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1636,13 +1636,16 @@ static INT_PTR CALLBACK tabstops_proc(HWND hWnd, UINT message, WPARAM wParam, LP if(SendMessageW(hTabWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)&buffer) == CB_ERR) { float number = 0; + int item_count = SendMessage(hTabWnd, CB_GETCOUNT, 0, 0); if(!number_from_string(buffer, &number, TRUE)) { MessageBoxWithResStringW(hWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONINFORMATION); - } else - { + } else if (item_count >= MAX_TAB_STOPS) { + MessageBoxWithResStringW(hWnd, MAKEINTRESOURCEW(STRING_MAX_TAB_STOPS), + wszAppTitle, MB_OK | MB_ICONINFORMATION); + } else { SendMessageW(hTabWnd, CB_ADDSTRING, 0, (LPARAM)&buffer); SetWindowTextW(hTabWnd, 0); } diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 8126fdd..ece183f 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -200,6 +200,7 @@ #define STRING_OPEN_FAILED 1709 #define STRING_OPEN_ACCESS_DENIED 1710 #define STRING_PRINTING_NOT_IMPLEMENTED 1711 +#define STRING_MAX_TAB_STOPS 1712 LPWSTR file_basename(LPWSTR);

1 0

Dylan Smith : wordpad: Sort tab stops by numeric value rather than as string.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 8e8c02a71f48f990772fbed423fe5e3eb1b123cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8c02a71f48f990772fbed42… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Feb 25 15:15:25 2009 -0500 wordpad: Sort tab stops by numeric value rather than as string. The bug could be seen by inserting tabs stops 1cm, 2cm, & 10cm. The 10cm tab stop would be inserted before 2cm since the comparison isn't based on the numeric value. --- programs/wordpad/Da.rc | 2 +- programs/wordpad/De.rc | 2 +- programs/wordpad/En.rc | 2 +- programs/wordpad/Fr.rc | 2 +- programs/wordpad/Hu.rc | 2 +- programs/wordpad/Ja.rc | 2 +- programs/wordpad/Ko.rc | 2 +- programs/wordpad/Nl.rc | 2 +- programs/wordpad/No.rc | 2 +- programs/wordpad/Pl.rc | 2 +- programs/wordpad/Pt.rc | 2 +- programs/wordpad/Ru.rc | 2 +- programs/wordpad/Si.rc | 2 +- programs/wordpad/Sv.rc | 2 +- programs/wordpad/Tr.rc | 2 +- programs/wordpad/Zh.rc | 4 ++-- programs/wordpad/wordpad.c | 22 ++++++++++++++++++++-- 17 files changed, 37 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e8c02a71f48f990772fb…

1 0

Dylan Smith : richedit: EM_SETOPTIONS modify format rect when selbar setting change.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 88eb1b5b6c6e9ce93059f9f273fe66a9f21233ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=88eb1b5b6c6e9ce93059f9f27… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Feb 25 16:18:36 2009 -0500 richedit: EM_SETOPTIONS modify format rect when selbar setting change. Before the code was modifying the format rect to compensate for space being added or removed for the selection bar, but this should only happen when the ECO_SELECTIONBAR setting bit changes. --- dlls/riched20/editor.c | 56 ++++++++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index dc03d42..09feb96 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2654,8 +2654,13 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ME_CheckCharOffsets(ed); ed->bDefaultFormatRect = TRUE; ITextHost_TxGetSelectionBarWidth(ed->texthost, &selbarwidth); - /* FIXME: Convert selbarwidth from HIMETRIC to pixels */ - ed->selofs = selbarwidth ? SELECTIONBAR_WIDTH : 0; + if (selbarwidth) { + /* FIXME: Convert selbarwidth from HIMETRIC to pixels */ + ed->selofs = SELECTIONBAR_WIDTH; + ed->styleFlags |= ES_SELECTIONBAR; + } else { + ed->selofs = 0; + } ed->nSelectionType = stPosition; ed->cPasswordMask = 0; @@ -3067,31 +3072,36 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } changedSettings = oldSettings ^ settings; - if (oldSettings ^ settings) { + if (changedSettings) { editor->styleFlags = (editor->styleFlags & ~mask) | (settings & mask); - if (settings & ECO_SELECTIONBAR) { - editor->selofs = SELECTIONBAR_WIDTH; - editor->rcFormat.left += SELECTIONBAR_WIDTH; - } else { - editor->selofs = 0; - editor->rcFormat.left -= SELECTIONBAR_WIDTH; + if (changedSettings & ECO_SELECTIONBAR) + { + ITextHost_TxInvalidateRect(editor->texthost, &editor->rcFormat, TRUE); + if (settings & ECO_SELECTIONBAR) { + assert(!editor->selofs); + editor->selofs = SELECTIONBAR_WIDTH; + editor->rcFormat.left += editor->selofs; + } else { + editor->rcFormat.left -= editor->selofs; + editor->selofs = 0; + } + ME_RewrapRepaint(editor); } - ME_WrapMarkedParagraphs(editor); - } - if (settings & ECO_VERTICAL) - FIXME("ECO_VERTICAL not implemented yet!\n"); - if (settings & ECO_AUTOHSCROLL) - FIXME("ECO_AUTOHSCROLL not implemented yet!\n"); - if (settings & ECO_AUTOVSCROLL) - FIXME("ECO_AUTOVSCROLL not implemented yet!\n"); - if (settings & ECO_NOHIDESEL) - FIXME("ECO_NOHIDESEL not implemented yet!\n"); - if (settings & ECO_WANTRETURN) - FIXME("ECO_WANTRETURN not implemented yet!\n"); - if (settings & ECO_AUTOWORDSELECTION) - FIXME("ECO_AUTOWORDSELECTION not implemented yet!\n"); + if (changedSettings & settings & ECO_VERTICAL) + FIXME("ECO_VERTICAL not implemented yet!\n"); + if (changedSettings & settings & ECO_AUTOHSCROLL) + FIXME("ECO_AUTOHSCROLL not implemented yet!\n"); + if (changedSettings & settings & ECO_AUTOVSCROLL) + FIXME("ECO_AUTOVSCROLL not implemented yet!\n"); + if (changedSettings & settings & ECO_NOHIDESEL) + FIXME("ECO_NOHIDESEL not implemented yet!\n"); + if (changedSettings & settings & ECO_WANTRETURN) + FIXME("ECO_WANTRETURN not implemented yet!\n"); + if (changedSettings & settings & ECO_AUTOWORDSELECTION) + FIXME("ECO_AUTOWORDSELECTION not implemented yet!\n"); + } return settings; }

1 0

Juan Lang : crypt32: Fix more test failures on Win9x.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 5ed04c645d41779b3d9478b315905f393207e245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed04c645d41779b3d9478b31… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 25 12:38:20 2009 -0800 crypt32: Fix more test failures on Win9x. --- dlls/crypt32/tests/msg.c | 50 ++++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 0150490..e296721 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -409,11 +409,11 @@ static void test_data_msg_update(void) /* Doesn't appear to be able to update CMSG-DATA with non-final updates */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - ok(!ret && GetLastError() == E_INVALIDARG, + ok((!ret && GetLastError() == E_INVALIDARG) || broken(ret /* Win9x */), "Expected E_INVALIDARG, got %x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - ok(!ret && GetLastError() == E_INVALIDARG, + ok((!ret && GetLastError() == E_INVALIDARG) || broken(ret /* Win9x */), "Expected E_INVALIDARG, got %x\n", GetLastError()); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); @@ -487,11 +487,11 @@ static void test_data_msg_get_param(void) NULL, &streamInfo); SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); - ok(!ret && GetLastError() == E_INVALIDARG, + ok((!ret && GetLastError() == E_INVALIDARG) || broken(ret /* Win9x */), "Expected E_INVALIDARG, got %x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); - ok(!ret && GetLastError() == E_INVALIDARG, + ok((!ret && GetLastError() == E_INVALIDARG) || broken(ret /* Win9x */), "Expected E_INVALIDARG, got %x\n", GetLastError()); CryptMsgClose(msg); } @@ -804,7 +804,8 @@ static void test_hash_msg_get_param(void) /* Content and bare content are always gettable for non-streamed messages */ size = 0; ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == OSS_LIMITED /* Win9x */), + "CryptMsgGetParam failed: %08x\n", GetLastError()); size = 0; ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); ok(ret || broken(GetLastError() == OSS_LIMITED /* Win9x */), @@ -841,11 +842,14 @@ static void test_hash_msg_get_param(void) /* The version is also available, and should be zero for this message. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, NULL, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == CRYPT_E_INVALID_MSG_TYPE /* Win9x */), + "CryptMsgGetParam failed: %08x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, &value, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); - ok(value == 0, "Expected version 0, got %d\n", value); + ok(ret || broken(GetLastError() == CRYPT_E_INVALID_MSG_TYPE /* Win9x */), + "CryptMsgGetParam failed: %08x\n", GetLastError()); + if (ret) + ok(value == 0, "Expected version 0, got %d\n", value); /* As usual, the type isn't available. */ ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, NULL, &size); ok(!ret, "Expected failure\n"); @@ -856,12 +860,14 @@ static void test_hash_msg_get_param(void) /* Streamed messages don't allow you to get the content or bare content. */ SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %x\n", GetLastError()); + ok(!ret && (GetLastError() == E_INVALIDARG || + GetLastError() == OSS_LIMITED /* Win9x */), + "Expected E_INVALIDARG or OSS_LIMITED, got %x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %x\n", GetLastError()); + ok(!ret && (GetLastError() == E_INVALIDARG || + GetLastError() == OSS_LIMITED /* Win9x */), + "Expected E_INVALIDARG or OSS_LIMITED, got %x\n", GetLastError()); /* The hash is still available. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); @@ -2797,8 +2803,10 @@ static void test_msg_control(void) */ SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && GetLastError() == CRYPT_E_SIGNER_NOT_FOUND, - "Expected CRYPT_E_SIGNER_NOT_FOUND, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_SIGNER_NOT_FOUND || + GetLastError() == OSS_DATA_ERROR /* Win9x */), + "Expected CRYPT_E_SIGNER_NOT_FOUND or OSS_DATA_ERROR, got %08x\n", + GetLastError()); /* The cert info is expected to have an issuer, serial number, and public * key info set. */ @@ -2808,8 +2816,9 @@ static void test_msg_control(void) certInfo.Issuer.pbData = encodedCommonName; SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, - "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_DATA_ERROR /* Win9x */), + "Expected CRYPT_E_ASN1_EOD or OSS_DATA_ERROR, got %08x\n", GetLastError()); CryptMsgClose(msg); /* This cert has a public key, but it's not in a usable form */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, @@ -2885,7 +2894,8 @@ static void test_msg_control(void) CryptMsgUpdate(msg, signedWithCertWithValidPubKeyContent, sizeof(signedWithCertWithValidPubKeyContent), TRUE); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), + "CryptMsgControl failed: %08x\n", GetLastError()); CryptMsgClose(msg); /* Test verifying signature of a detached signed message */ @@ -2897,8 +2907,10 @@ static void test_msg_control(void) /* Can't verify the sig without having updated the data */ SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, - "expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == NTE_BAD_SIGNATURE || + GetLastError() == OSS_DATA_ERROR /* Win9x */), + "expected NTE_BAD_SIGNATURE or OSS_DATA_ERROR, got %08x\n", + GetLastError()); /* Now that the signature's been checked, can't do the final update */ ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); todo_wine

1 0

Detlef Riekenberg : mshtml/tests: Fix typos from copy&paste.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: c823c9ebae62c6524f7771f3c512704d91d88008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c823c9ebae62c6524f7771f3c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 25 22:37:27 2009 +0100 mshtml/tests: Fix typos from copy&paste. --- dlls/mshtml/tests/dom.c | 80 +++++++++++++++++++++++----------------------- 1 files changed, 40 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c823c9ebae62c6524f777…

1 0

Alexandre Julliard : winetest: Don' t add the emulated version to the tag for Wine runs, it' s not useful information.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: tools Branch: master Commit: f95615cd47ebf0c7e5f056446e8d52e6b8d995e6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f95615cd47ebf0c7e5f05644… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 25 15:22:46 2009 +0100 winetest: Don't add the emulated version to the tag for Wine runs, it's not useful information. --- winetest/dissect | 1 - winetest/gather | 4 ---- 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index a9b64dc..657ef9b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -180,7 +180,6 @@ if ($plid==1 && $major==4) { $version = "ce$major$minor"; } if ($wine) { - $tag = "_$version$tag"; $version = "wine"; } if ($wine_build) { diff --git a/winetest/gather b/winetest/gather index 6d40787..bbe7cc0 100755 --- a/winetest/gather +++ b/winetest/gather @@ -116,10 +116,6 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { (my $dir = $file) =~ s|^\Q$datadir/$build\E/(.*?)/summary.txt$|$1|; (my $id, my @tag) = split /_/, $dir; my $group = $idmap{$id}; - if ($id eq "wine" && defined $tag[0]) { - $tag[0] = $idmap{$tag[0]}->{name}; - $group = undef unless defined $tag[0]; # make the check below fail - } if (!defined $group) { print STDERR "$name0:error: unknown architecture '$id' in '$file'\n"; next;

1 0

Dmitry Timoshkov : mlang: Implement IMLangFontLink_GetStrCodePages.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: b86552f58d96f3bf3b324a6ed115a1c4a846174d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b86552f58d96f3bf3b324a6ed… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 25 23:02:45 2009 +0800 mlang: Implement IMLangFontLink_GetStrCodePages. --- dlls/mlang/mlang.c | 37 ++++++++++++++--- dlls/mlang/tests/mlang.c | 96 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 113 insertions(+), 20 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 11fa366..f9c3f8e 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1912,9 +1912,34 @@ static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( DWORD* pdwCodePages, long* pcchCodePages) { - FIXME("(pszSrc=%s, cchSrc=%ld, dwPriorityCodePages=%d) stub\n", debugstr_w(pszSrc), cchSrc, dwPriorityCodePages); - *pdwCodePages = 0; - *pcchCodePages = 1; + long i; + DWORD cps = 0; + + TRACE("(%p)->%s %ld %x %p %p\n", iface, debugstr_wn(pszSrc,cchSrc),cchSrc,dwPriorityCodePages,pdwCodePages,pcchCodePages); + + if (pdwCodePages) *pdwCodePages = 0; + if (pcchCodePages) *pcchCodePages = 0; + + if (!pszSrc || !cchSrc || cchSrc < 0) + return E_INVALIDARG; + + for (i = 0; i < cchSrc; i++) + { + DWORD cp; + HRESULT ret; + + ret = fnIMLangFontLink_GetCharCodePages(iface, pszSrc[i], &cp); + if (ret != S_OK) return E_FAIL; + + if (!cps) cps = cp; + else cps &= cp; + + /* FIXME: not tested */ + if (dwPriorityCodePages & cps) break; + } + + if (pdwCodePages) *pdwCodePages = cps; + if (pcchCodePages) *pcchCodePages = i; return S_OK; } @@ -3179,10 +3204,8 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This, const WCHAR *pszSrc, long cchSrc, DWORD dwPriorityCodePages, DWORD *pdwCodePages, long *pcchCodePages) { - FIXME("(%p)->%s %li %x %p %p\n",This, debugstr_wn(pszSrc,cchSrc),cchSrc,dwPriorityCodePages,pdwCodePages,pcchCodePages); - *pdwCodePages = 0; - *pcchCodePages = 1; - return S_OK; + return fnIMLangFontLink_GetStrCodePages((IMLangFontLink *)This, + pszSrc, cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); } static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* This, diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index ae5060a..13c2729 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -211,7 +211,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) ok(lenA == expected_len, "expected lenA %u, got %u\n", expected_len, lenA); } -static inline void cpinfo_cmp(MIMECPINFO *cpinfo1, MIMECPINFO *cpinfo2) +static void cpinfo_cmp(MIMECPINFO *cpinfo1, MIMECPINFO *cpinfo2) { ok(cpinfo1->dwFlags == cpinfo2->dwFlags, "dwFlags mismatch: %08x != %08x\n", cpinfo1->dwFlags, cpinfo2->dwFlags); ok(cpinfo1->uiCodePage == cpinfo2->uiCodePage, "uiCodePage mismatch: %u != %u\n", cpinfo1->uiCodePage, cpinfo2->uiCodePage); @@ -538,7 +538,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) IEnumCodePage_Release(iEnumCP); } -static inline void scriptinfo_cmp(SCRIPTINFO *sinfo1, SCRIPTINFO *sinfo2) +static void scriptinfo_cmp(SCRIPTINFO *sinfo1, SCRIPTINFO *sinfo2) { ok(sinfo1->ScriptId == sinfo2->ScriptId, "ScriptId mismatch: %d != %d\n", sinfo1->ScriptId, sinfo2->ScriptId); ok(sinfo1->uiCodePage == sinfo2->uiCodePage, "uiCodePage mismatch: %u != %u\n", sinfo1->uiCodePage, sinfo2->uiCodePage); @@ -649,6 +649,8 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) DWORD dwCodePages, dwManyCodePages; DWORD dwCmpCodePages; UINT CodePage; + static const WCHAR str[3] = { 'd', 0x0436, 0xff90 }; + long processed; HRESULT ret; dwCodePages = ~0u; @@ -693,21 +695,89 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) dwCmpCodePages = FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC | FS_GREEK | FS_TURKISH | FS_HEBREW | FS_ARABIC | FS_BALTIC | FS_VIETNAMESE | FS_THAI | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG | FS_CHINESETRAD; - ok(IMLangFontLink_GetCharCodePages(iMLFL, 'd', &dwCodePages) == S_OK, - "IMLangFontLink_GetCharCodePages failed\n"); - ok(dwCodePages == dwCmpCodePages, "Incorrect CodePages returned (%i)\n", dwCodePages); + ret = IMLangFontLink_GetCharCodePages(iMLFL, 'd', &dwCodePages); + ok(ret == S_OK, "IMLangFontLink_GetCharCodePages error %x\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[0], 1, 0, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + ok(processed == 1, "expected 1, got %ld\n", processed); /* Cyrillic */ dwCmpCodePages = FS_CYRILLIC | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG; - ok(IMLangFontLink_GetCharCodePages(iMLFL, 0x0436, &dwCodePages) == S_OK, - "IMLangFontLink_GetCharCodePages failed\n"); - ok(dwCodePages == dwCmpCodePages, "Incorrect CodePages returned (%i)\n", dwCodePages); + ret = IMLangFontLink_GetCharCodePages(iMLFL, 0x0436, &dwCodePages); + ok(ret == S_OK, "IMLangFontLink_GetCharCodePages error %x\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[1], 1, 0, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + ok(processed == 1, "expected 1, got %ld\n", processed); /* Japanese */ dwCmpCodePages = FS_JISJAPAN; - ok(IMLangFontLink_GetCharCodePages(iMLFL, 0xff90, &dwCodePages) == S_OK, - "IMLangFontLink_GetCharCodePages failed\n"); - ok(dwCodePages == dwCmpCodePages, "Incorrect CodePages returned (%i)\n", dwCodePages); + ret = IMLangFontLink_GetCharCodePages(iMLFL, 0xff90, &dwCodePages); + ok(ret == S_OK, "IMLangFontLink_GetCharCodePages error %x\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + ok(processed == 1, "expected 1, got %ld\n", processed); + + dwCmpCodePages = FS_CYRILLIC | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG; + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 2, 0, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + ok(processed == 2, "expected 2, got %ld\n", processed); + + dwCmpCodePages = FS_JISJAPAN; + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 3, 0, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + ok(processed == 3, "expected 3, got %ld\n", processed); + + dwCodePages = 0xffff; + processed = -1; + ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + ok(processed == 1, "expected 0, got %ld\n", processed); + + ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, NULL, NULL); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); + + dwCodePages = 0xffff; + processed = -1; + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, -1, 0, &dwCodePages, &processed); + ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret); + ok(dwCodePages == 0, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + ok(processed == 0, "expected 0, got %ld\n", processed); + + dwCodePages = 0xffff; + processed = -1; + ret = IMLangFontLink_GetStrCodePages(iMLFL, NULL, 1, 0, &dwCodePages, &processed); + ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret); + ok(dwCodePages == 0, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + ok(processed == 0, "expected 0, got %ld\n", processed); + + dwCodePages = 0xffff; + processed = -1; + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 0, 0, &dwCodePages, &processed); + ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret); + ok(dwCodePages == 0, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + ok(processed == 0, "expected 0, got %ld\n", processed); } /* copied from libs/wine/string.c */ @@ -1395,7 +1465,7 @@ static void test_GetScriptFontInfo(IMLangFontLink2 *font_link) hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidLatin, SCRIPTCONTF_FIXED_FONT, &nfonts, sfi); ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); ok(nfonts == 1, "got %u, expected 1\n", nfonts); - ok(sfi[0].scripts, "unexpected result\n"); + ok(sfi[0].scripts != 0, "unexpected result\n"); ok(sfi[0].wszFont[0], "unexpected result\n"); nfonts = 1; @@ -1403,7 +1473,7 @@ static void test_GetScriptFontInfo(IMLangFontLink2 *font_link) hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidLatin, SCRIPTCONTF_PROPORTIONAL_FONT, &nfonts, sfi); ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); ok(nfonts == 1, "got %u, expected 1\n", nfonts); - ok(sfi[0].scripts, "unexpected result\n"); + ok(sfi[0].scripts != 0, "unexpected result\n"); ok(sfi[0].wszFont[0], "unexpected result\n"); }

1 0