July 2008 - Wine-commits - list.winehq.org

James Hawkins : fusion: Add tests for IAssemblyCache::QueryAssemblyInfo.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: 02391eb8543b878fbf201dc13dd14cb56a9e10a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02391eb8543b878fbf201dc13… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 20:09:22 2008 -0500 fusion: Add tests for IAssemblyCache::QueryAssemblyInfo. --- dlls/fusion/tests/asmcache.c | 550 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 537 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02391eb8543b878fbf201…

1 0

Jon Griffiths : oleaut32: Implement ICreateTypeLib2_SetHelpContext.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: cc85e2410b5aa974c6094742664b5edc53070d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc85e2410b5aa974c60947426… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jun 29 08:15:43 2008 -0700 oleaut32: Implement ICreateTypeLib2_SetHelpContext. --- dlls/oleaut32/typelib2.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index de8c7db..6b773dc 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3192,8 +3192,11 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpFileName(ICreateTypeLib2 * iface, */ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 * iface, DWORD dwHelpContext) { - FIXME("(%p,%d), stub!\n", iface, dwHelpContext); - return E_OUTOFMEMORY; + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; + + TRACE("(%p,%d)\n", iface, dwHelpContext); + This->typelib_header.helpcontext = dwHelpContext; + return S_OK; } /******************************************************************************

1 0

Vladimir Pankratov : taskmgr: Changed about form to standard shell32.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: 92642828d69ed6831a89686c4c2e8d3c1fb67ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92642828d69ed6831a89686c4… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jun 30 12:38:38 2008 +0500 taskmgr: Changed about form to standard shell32. --- programs/taskmgr/about.c | 39 ++++++++------------------------------- 1 files changed, 8 insertions(+), 31 deletions(-) diff --git a/programs/taskmgr/about.c b/programs/taskmgr/about.c index 424124d..948c7ea 100644 --- a/programs/taskmgr/about.c +++ b/programs/taskmgr/about.c @@ -24,6 +24,7 @@ #include <windows.h> #include <commctrl.h> #include <stdlib.h> +#include <shellapi.h> #include <malloc.h> #include <memory.h> #include <tchar.h> @@ -31,38 +32,14 @@ #include "taskmgr.h" -static INT_PTR CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - HWND hLicenseEditWnd; - TCHAR strLicense[0x1000]; - - switch (message) - { - case WM_INITDIALOG: - - hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); - - LoadString(hInst, IDS_LICENSE, strLicense, 0x1000); - - SetWindowText(hLicenseEditWnd, strLicense); - - return TRUE; - - case WM_COMMAND: - - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - - break; - } - - return 0; -} void OnAbout(void) { - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hMainWnd, AboutDialogWndProc); + WCHAR appname[256]; + WCHAR copy[] = {'B','r','i','a','n',' ', + 'P','a','l','m','e','r',' ', + '<','b','r','i','a','n','p','@','r','e','a','c','t','o','s','.','o','r','g','>',0}; + LoadStringW( hInst, IDC_TASKMGR, appname, sizeof(appname)/sizeof(WCHAR) ); + ShellAboutW( hMainWnd, appname, copy, + LoadImageA( hInst, (LPSTR)IDI_TASKMANAGER, IMAGE_ICON, 32, 32, LR_SHARED )); }

1 0

James Hawkins : urlmon: Fix a few test failures.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: 9ac630e0582ab2ce8a9a7ed9c8eb49892a64eeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac630e0582ab2ce8a9a7ed9c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:21:11 2008 -0500 urlmon: Fix a few test failures. --- dlls/urlmon/tests/url.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 592eefa..c0e93ec 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2194,6 +2194,8 @@ static void test_BindToObject(int protocol, BOOL emul) SET_EXPECT(Start); if(test_protocol == HTTP_TEST) SET_EXPECT(Terminate); + if(test_protocol == FILE_TEST) + SET_EXPECT(OnProgress_MIMETYPEAVAILABLE); SET_EXPECT(UnlockRequest); }else { if(test_protocol == HTTP_TEST) { @@ -2260,6 +2262,8 @@ static void test_BindToObject(int protocol, BOOL emul) CHECK_CALLED(Start); if(test_protocol == HTTP_TEST) CHECK_CALLED(Terminate); + if(test_protocol == FILE_TEST) + CLEAR_CALLED(OnProgress_MIMETYPEAVAILABLE); /* not called in IE7 */ CHECK_CALLED(UnlockRequest); }else { if(test_protocol == HTTP_TEST) { @@ -2302,9 +2306,13 @@ static void test_BindToObject(int protocol, BOOL emul) if(test_protocol != HTTP_TEST || emul || urls[test_protocol] == SHORT_RESPONSE_URL) { ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); - }else todo_wine { - ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); - ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); + }else { + todo_wine ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); + + if(bindf & BINDF_ASYNCHRONOUS) + ok(IBindCtx_Release(bctx) != 0, "bctx should not be destroyed here\n"); + else + todo_wine ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); } if(emul)

1 0