wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Detlef Riekenberg : msvcr100: Sync exports to msvcr90.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 4e1b0da81462c0b31853d8c7e9f67d598ecbe3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1b0da81462c0b31853d8c7e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 14 14:32:29 2010 +0200 msvcr100: Sync exports to msvcr90. --- dlls/msvcr100/msvcr100.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 44c5b31..0d05c28 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -607,7 +607,7 @@ @ stub _fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ stub _fstat64i32 +@ cdecl _fstat64i32(long ptr) msvcr90._fstat64i32 @ stub _ftell_nolock @ stub _ftelli64 @ stub _ftelli64_nolock @@ -1079,7 +1079,7 @@ @ stub _stat32 @ stub _stat32i64 @ cdecl _stat64(str ptr) msvcrt._stat64 -@ stub _stat64i32 +@ cdecl _stat64i32(str ptr) msvcr90._stat64i32 @ cdecl _statusfp() msvcrt._statusfp @ stub _statusfp2 @ stub _strcoll_l

1 0

Detlef Riekenberg : msvcr7x: Sync exports to msvcrt.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 717bb348187811e412b368fdaf62037f80130c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=717bb348187811e412b368fda… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 14 14:32:27 2010 +0200 msvcr7x: Sync exports to msvcrt. --- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index edf3da4..7c84705 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -475,7 +475,7 @@ @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb( double long) msvcrt._scalb @ stub _scprintf -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ stub _set_SSE2_enable diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f0d6255..8599efa 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -470,7 +470,7 @@ @ cdecl _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb( double long) msvcrt._scalb @ stub _scprintf -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ stub _set_SSE2_enable

1 0

Hans Leidekker : msi: Add tests for MsiLocateComponent and make them pass.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: ff0f2b35e134cf56a753cb3e049ccc164f253c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0f2b35e134cf56a753cb3e0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 14 14:21:31 2010 +0200 msi: Add tests for MsiLocateComponent and make them pass. --- dlls/msi/msi.c | 6 ++ dlls/msi/tests/msi.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff0f2b35e134cf56a753c…

1 0

Hans Leidekker : msi: Don't trace the contents of an output buffer.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: b4674a3c2b9cde2c2c24dee38475290ac2e6ec6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4674a3c2b9cde2c2c24dee38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 14 14:21:12 2010 +0200 msi: Don't trace the contents of an output buffer. --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index def6a00..3e6a556 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -825,7 +825,7 @@ UINT WINAPI MsiGetProductCodeA(LPCSTR szComponent, LPSTR szBuffer) UINT r; WCHAR szwBuffer[GUID_SIZE]; - TRACE("%s %s\n",debugstr_a(szComponent), debugstr_a(szBuffer)); + TRACE("%s %p\n", debugstr_a(szComponent), szBuffer); if( szComponent ) {

1 0

Hans Leidekker : propsys: Return success from PSRegisterPropertySchema.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: e7d8fd126beec24377f1e0e0a57e202ac527eae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d8fd126beec24377f1e0e0a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 14 14:20:49 2010 +0200 propsys: Return success from PSRegisterPropertySchema. --- dlls/propsys/propsys_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index c5bcab7..d2b1744 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -50,14 +50,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) { - FIXME("stub\n"); + FIXME("%s\n", debugstr_w(path)); - return E_NOTIMPL; + return S_OK; } -HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR pszPath) +HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR path) { - FIXME("stub\n"); + FIXME("%s\n", debugstr_w(path)); return E_NOTIMPL; }

1 0

Alexandre Julliard : winecfg: Fix pointer truncation in audio setup.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: d57ab26840b83f44a695e76855bba6faeb9a12a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57ab26840b83f44a695e7685… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 13:23:57 2010 +0200 winecfg: Fix pointer truncation in audio setup. --- programs/winecfg/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 5cf2b34..c5cebcd 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -51,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #define DEVICE_MASK 0x40000000 #define MAX_NAME_LENGTH 64 -typedef DWORD (WINAPI * MessagePtr)(UINT, UINT, DWORD, DWORD, DWORD); +typedef DWORD (WINAPI * MessagePtr)(UINT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR); static struct DSOUNDACCEL {

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::open test.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 77a994db4216ed01b46b09b44926516d7cbf0c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a994db4216ed01b46b09b44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 14 02:20:50 2010 +0200 mshtml: Added IHTMLWindow2::open test. --- dlls/mshtml/tests/htmldoc.c | 100 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 7e0d437..319e5fd 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -38,6 +38,7 @@ #include "idispids.h" #include "shlguid.h" #include "perhist.h" +#include "shobjidl.h" #include "mshtml_test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -155,6 +156,7 @@ DEFINE_EXPECT(Frame_GetWindow); DEFINE_EXPECT(TranslateUrl); DEFINE_EXPECT(Advise_Close); DEFINE_EXPECT(OnViewChange); +DEFINE_EXPECT(EvaluateNewWindow); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -164,7 +166,7 @@ static BOOL ipsex, ipsw; static BOOL set_clientsite, container_locked, navigated_load; static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE, show_failed; -static BOOL inplace_deactivated; +static BOOL inplace_deactivated, open_call; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -296,6 +298,9 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, L BSTR doc_url = (void*)0xdeadbeef; HRESULT hres; + if(open_call) + return; /* FIXME */ + hres = IUnknown_QueryInterface(unk, &IID_IPersistMoniker, (void**)&permon); ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker) failed: %08x\n", hres); if(FAILED(hres)) @@ -332,7 +337,7 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, L }else if(exurl) { LPOLESTR url; - ok(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres); hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); @@ -737,6 +742,48 @@ static const IHlinkFrameVtbl HlinkFrameVtbl = { static IHlinkFrame HlinkFrame = { &HlinkFrameVtbl }; +static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI NewWindowManager_AddRef(INewWindowManager *iface) +{ + return 2; +} + +static ULONG WINAPI NewWindowManager_Release(INewWindowManager *iface) +{ + return 1; +} + +static HRESULT WINAPI NewWindowManager_EvaluateNewWindow(INewWindowManager *iface, LPCWSTR pszUrl, + LPCWSTR pszName, LPCWSTR pszUrlContext, LPCWSTR pszFeatures, BOOL fReplace, DWORD dwFlags, + DWORD dwUserActionTime) +{ + CHECK_EXPECT(EvaluateNewWindow); + + ok(!strcmp_wa(pszUrl, "about:blank"), "pszUrl = %s\n", wine_dbgstr_w(pszUrl)); + ok(!strcmp_wa(pszName, "test"), "pszName = %s\n", wine_dbgstr_w(pszName)); + ok(!strcmp_wa(pszUrlContext, "about:blank"), "pszUrlContext = %s\n", wine_dbgstr_w(pszUrlContext)); + ok(!pszFeatures, "pszFeatures = %s\n", wine_dbgstr_w(pszFeatures)); + ok(!fReplace, "fReplace = %x\n", fReplace); + ok(dwFlags == NWMF_FIRST, "dwFlags = %x\n", dwFlags); + ok(!dwUserActionTime, "dwUserActionime = %d\n", dwUserActionTime); + + return E_FAIL; +} + +static const INewWindowManagerVtbl NewWindowManagerVtbl = { + NewWindowManager_QueryInterface, + NewWindowManager_AddRef, + NewWindowManager_Release, + NewWindowManager_EvaluateNewWindow +}; + +static INewWindowManager NewWindowManager = { &NewWindowManagerVtbl }; + static HRESULT WINAPI PropertyNotifySink_QueryInterface(IPropertyNotifySink *iface, REFIID riid, void**ppv) { @@ -2423,6 +2470,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(V_BSTR(pvaIn) != NULL, "V_BSTR(pvaIn) = NULL\n"); test_readyState(NULL); return S_OK; + case OLECMDID_UPDATETRAVELENTRY_DATARECOVERY: + return E_FAIL; /* FIXME */ default: ok(0, "unexpected command %d\n", nCmdID); return E_FAIL; @@ -2701,6 +2750,12 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return S_OK; } + if(IsEqualGUID(&SID_SNewWindowManager, guidService)) { + ok(IsEqualGUID(&IID_INewWindowManager, riid), "unexpected riid\n"); + *ppv = &NewWindowManager; + return S_OK; + } + return E_NOINTERFACE; } @@ -2941,6 +2996,9 @@ static void _test_readyState(unsigned line, IUnknown *unk) "uninitialized" }; + if(open_call) + return; /* FIXME */ + if(!unk) unk = doc_unk; @@ -3405,6 +3463,43 @@ static void test_put_href(IHTMLDocument2 *doc) test_download(DWL_VERBDONE); } +static void test_open_window(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window, *new_window; + BSTR name, url; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + url = a2bstr("about:blank"); + name = a2bstr("test"); + new_window = (void*)0xdeadbeef; + + open_call = TRUE; + + SET_EXPECT(TranslateUrl); + SET_EXPECT(EvaluateNewWindow); + + hres = IHTMLWindow2_open(window, url, name, NULL, VARIANT_FALSE, &new_window); + todo_wine + ok(hres == S_OK, "open failed: %08x\n", hres); + todo_wine + ok(new_window == NULL, "new_window != NULL\n"); + + todo_wine + CHECK_CALLED(TranslateUrl); + todo_wine + CHECK_CALLED(EvaluateNewWindow); + + open_call = FALSE; + SysFreeString(url); + SysFreeString(name); + + IHTMLWindow2_Release(window); + SysFreeString(name); +} + static void test_clear(IHTMLDocument2 *doc) { HRESULT hres; @@ -4678,6 +4773,7 @@ static void test_HTMLDocument_http(void) test_GetCurMoniker((IUnknown*)doc, http_mon, NULL); test_put_href(doc); + test_open_window(doc); test_InPlaceDeactivate(doc, TRUE); test_Close(doc, FALSE);

1 0

Jacek Caban : shdocvw: Silence QueryService traces in non-interactive runs.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: ddaf9171a136696af6c42e2a75798165462358a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddaf9171a136696af6c42e2a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 14 02:20:38 2010 +0200 shdocvw: Silence QueryService traces in non-interactive runs. They only pollute output making it harder to find useful informations. --- 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 f396373..17189fc 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1350,6 +1350,9 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, { *ppv = NULL; + if(!winetest_interactive) + return E_NOINTERFACE; + if (IsEqualGUID(&SID_STopLevelBrowser, guidService)) trace("Service SID_STopLevelBrowser\n"); else if (IsEqualGUID(&SID_SEditCommandTarget, guidService))

1 0

Jacek Caban : mshtml: Don' t crash in on_start_uri_open on nscontainer without associated document.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 95d98bdb537adb13d931c5104d1afe7da8e4ff7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d98bdb537adb13d931c5104… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 14 02:19:12 2010 +0200 mshtml: Don't crash in on_start_uri_open on nscontainer without associated document. --- dlls/mshtml/nsio.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 63c9a6a..d9e822d 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -222,13 +222,15 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retva } if(!wine_uri->is_doc_uri) { + wine_uri->is_doc_uri = TRUE; + if(!wine_uri->container) { nsIWebBrowserChrome_AddRef(NSWBCHROME(nscontainer)); wine_uri->container = nscontainer; } - wine_uri->is_doc_uri = TRUE; - *_retval = translate_url(nscontainer->doc, wine_uri); + if(nscontainer->doc) + *_retval = translate_url(nscontainer->doc, wine_uri); } nsIURI_Release(NSURI(wine_uri));

1 0

Jacek Caban : docobj.idl: Added OLECMDID_UPDATETRAVELENTRY_DATARECOVERY declaration.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: e4bfae8306eb20230fec6412f63c10760f4413f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4bfae8306eb20230fec6412f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 14 02:19:02 2010 +0200 docobj.idl: Added OLECMDID_UPDATETRAVELENTRY_DATARECOVERY declaration. --- include/docobj.idl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/docobj.idl b/include/docobj.idl index c47d111..bc14b1d 100644 --- a/include/docobj.idl +++ b/include/docobj.idl @@ -274,7 +274,8 @@ interface IOleCommandTarget : IUnknown OLECMDID_OPTICAL_ZOOM = 63, OLECMDID_OPTICAL_GETZOOMRANGE = 64, OLECMDID_WINDOWSTATECHANGED = 65, - OLECMDID_ACTIVEXINSTALLSCOPE = 66 + OLECMDID_ACTIVEXINSTALLSCOPE = 66, + OLECMDID_UPDATETRAVELENTRY_DATARECOVERY = 67 } OLECMDID; HRESULT QueryStatus(

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2010