October 2010 - Wine-commits

Tag wine-1.3.4 : Alexandre Julliard : Release 1.3.4
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: refs/tags/wine-1.3.4 Tag: 53cae9a6e042a3f92e8f16cf0a0fac371ce71a50 URL: http://source.winehq.org/git/wine.git/?a=tag;h=53cae9a6e042a3f92e8f16cf0a0f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 20:46:45 2010 +0200 Release 1.3.4

1 0

Andrew Eikum : msi/tests: Fix copy-paste errors in tests.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: f62439c0d4cf402a9153768131c445f1f0211e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62439c0d4cf402a915376813… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 1 09:41:32 2010 -0500 msi/tests: Fix copy-paste errors in tests. --- dlls/msi/tests/package.c | 78 +++++++++++++++++++++++----------------------- 1 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f62439c0d4cf402a91537…

1 0

Austin English : ddraw/tests: Fix a few compiler warnings on clang.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: b2a8b61dd55846221f09ddaf934eb2b1ea5b0320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a8b61dd55846221f09ddaf9… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 1 02:09:18 2010 -0500 ddraw/tests: Fix a few compiler warnings on clang. --- dlls/ddraw/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 48e77f1..c756bac 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -672,7 +672,7 @@ static void offscreen_test(IDirect3DDevice7 *device) DWORD color; DDSURFACEDESC2 ddsd; - static const float quad[][5] = { + static float quad[][5] = { {-0.5f, -0.5f, 0.1f, 0.0f, 0.0f}, {-0.5f, 0.5f, 0.1f, 0.0f, 1.0f}, { 0.5f, -0.5f, 0.1f, 1.0f, 0.0f}, @@ -795,7 +795,7 @@ static void alpha_test(IDirect3DDevice7 *device) { 1.0f, 0.0f, 0.1f, 0xc00000ff}, { 1.0f, 1.0f, 0.1f, 0xc00000ff}, }; - static const float composite_quad[][5] = { + static float composite_quad[][5] = { { 0.0f, -1.0f, 0.1f, 0.0f, 1.0f}, { 0.0f, 1.0f, 0.1f, 0.0f, 0.0f}, { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f},

1 0

Hans Leidekker : include: Add a prototype for EnumSystemLocalesEx.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 9cb467911dce84390178603f47fd76fd3c66e944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb467911dce84390178603f4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 1 15:38:52 2010 +0200 include: Add a prototype for EnumSystemLocalesEx. --- include/winnls.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index 279c944..adefcee 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -733,6 +733,7 @@ WINBASEAPI BOOL WINAPI EnumSystemGeoID(GEOCLASS,GEOID,GEO_ENUMPROC); WINBASEAPI BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA,DWORD); WINBASEAPI BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD); #define EnumSystemLocales WINELIB_NAME_AW(EnumSystemLocales) +WINBASEAPI BOOL WINAPI EnumSystemLocalesEx(LOCALE_ENUMPROCEX,DWORD,LPARAM,LPVOID); WINBASEAPI BOOL WINAPI EnumSystemLanguageGroupsA(LANGUAGEGROUP_ENUMPROCA,DWORD,LONG_PTR); WINBASEAPI BOOL WINAPI EnumSystemLanguageGroupsW(LANGUAGEGROUP_ENUMPROCW,DWORD,LONG_PTR); #define EnumSystemLanguageGroups WINELIB_NAME_AW(EnumSystemLanguageGroups)

1 0

Hans Leidekker : msi: Remove an unnecessary warning.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: ddbf3c754ea7992144e105d05d4e3e259e92c945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbf3c754ea7992144e105d05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 1 15:39:02 2010 +0200 msi: Remove an unnecessary warning. --- dlls/msi/media.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 06cd76d..788528e 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -211,9 +211,6 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) UINT r; IStream *stm; - if (oflag) - WARN("ignoring open flags 0x%08x\n", oflag); - r = db_get_raw_stream( cab_stream.db, cab_stream.name, &stm ); if (r != ERROR_SUCCESS) {

1 0

Hans Leidekker : msi: Set more 64-bit properties.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: dfc9351ba41161c8726e9fde41cdc0466375d7c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc9351ba41161c8726e9fde4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 1 15:39:11 2010 +0200 msi: Set more 64-bit properties. --- dlls/msi/package.c | 50 ++++++++++--- dlls/msi/tests/install.c | 3 +- dlls/msi/tests/package.c | 187 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 226 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfc9351ba41161c8726e9…

1 0

Saulius Krasuckas : winmm/tests: Initialize whole MIDIHDR struct before using it.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 815cd34c535cbd7218a8b184c7e838f135fc3f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815cd34c535cbd7218a8b184c… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Fri Oct 1 16:39:18 2010 +0300 winmm/tests: Initialize whole MIDIHDR struct before using it. --- dlls/winmm/tests/midi.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index e1f5104..972899e 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -127,6 +127,7 @@ static void test_midiIn_device(UINT udev, HWND hwnd) test_notification(hwnd, "midiInOpen", MIM_OPEN, 0); + memset(&mhdr, 0, sizeof(mhdr)); mhdr.dwFlags = 0; mhdr.dwUser = 0x56FA552C; mhdr.dwBufferLength = 70000; /* > 64KB! */ @@ -283,6 +284,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd) if (!rc) Sleep(400); /* Hear note */ } + memset(&mhdr, 0, sizeof(mhdr)); mhdr.dwFlags = 0; mhdr.dwUser = 0x56FA552C; mhdr.dwOffset = 0xDEADBEEF; @@ -407,6 +409,7 @@ static void test_midiStream(UINT udev, HWND hwnd) ok(!rc, "midiStreamProperty TIMEDIV rc=%s\n", mmsys_error(rc)); todo_wine ok(24==LOWORD(midiprop.tdiv.dwTimeDiv), "default stream time division %u\n", midiprop.tdiv.dwTimeDiv); + memset(&mhdr, 0, sizeof(mhdr)); mhdr.dwFlags = 0; mhdr.dwUser = 0x56FA552C; mhdr.dwOffset = 1234567890;

1 0

Jacek Caban : urlmon.idl: Added more error codes.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: a19a8040f57f7bbd62e2817530c520e1fbe381da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19a8040f57f7bbd62e281753… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 16:12:30 2010 +0200 urlmon.idl: Added more error codes. --- include/urlmon.idl | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index ac856e8..bea1c12 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1898,12 +1898,18 @@ cpp_quote("#define INET_E_CANNOT_LOAD_DATA _HRESULT_TYPEDEF_(0x800C000F cpp_quote("#define INET_E_CANNOT_INSTANTIATE_OBJECT _HRESULT_TYPEDEF_(0x800C0010)") cpp_quote("#define INET_E_USE_DEFAULT_PROTOCOLHANDLER _HRESULT_TYPEDEF_(0x800C0011)") cpp_quote("#define INET_E_USE_DEFAULT_SETTING _HRESULT_TYPEDEF_(0x800C0012L)") +cpp_quote("#define INET_E_DEFAULT_ACTION INET_E_USE_DEFAULT_PROTOCOLHANDLER") cpp_quote("#define INET_E_QUERYOPTION_UNKNOWN _HRESULT_TYPEDEF_(0x800C0013)") cpp_quote("#define INET_E_REDIRECT_FAILED _HRESULT_TYPEDEF_(0x800C0014)") cpp_quote("#define INET_E_REDIRECT_TO_DIR _HRESULT_TYPEDEF_(0x800C0015)") cpp_quote("#define INET_E_CANNOT_LOCK_REQUEST _HRESULT_TYPEDEF_(0x800C0016)") -cpp_quote("#define INET_E_ERROR_LAST INET_E_REDIRECT_TO_DIR") -cpp_quote("#define INET_E_DEFAULT_ACTION INET_E_USE_DEFAULT_PROTOCOLHANDLER") +cpp_quote("#define INET_E_CODE_DOWNLOAD_DECLINED _HRESULT_TYPEDEF_(0x800C0100)") +cpp_quote("#define INET_E_RESULT_DISPATCHED _HRESULT_TYPEDEF_(0x800C0200)") +cpp_quote("#define INET_E_CANNOT_REPLACE_SFP_FILE _HRESULT_TYPEDEF_(0x800C0300)") +cpp_quote("#define INET_E_CODE_INSTALL_SUPPRESSED _HRESULT_TYPEDEF_(0x800C0400)") +cpp_quote("#define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY _HRESULT_TYPEDEF_(0x800C0500)") +cpp_quote("#define INET_E_DOWNLOAD_BLOCKED_BY_INPRIVATE _HRESULT_TYPEDEF_(0x800C0501)") +cpp_quote("#define INET_E_ERROR_LAST INET_E_DOWNLOAD_BLOCKED_BY_INPRIVATE") cpp_quote("HRESULT WINAPI CoGetClassObjectFromURL(REFCLSID, LPCWSTR, DWORD, DWORD, LPCWSTR, LPBINDCTX, DWORD, LPVOID, REFIID, LPVOID*);") cpp_quote("HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk);")

1 0

Vitaly Perov : shdocvw: Silence more invalid QueryInterface FIXMEs.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: a15301a0bcbaa6c654f0fa7e23b3ef121e428513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15301a0bcbaa6c654f0fa7e2… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Fri Oct 1 13:09:40 2010 +0400 shdocvw: Silence more invalid QueryInterface FIXMEs. --- dlls/shdocvw/tests/webbrowser.c | 10 ++++++++++ dlls/shdocvw/webbrowser.c | 6 ++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 04a0b8e..babfe11 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -2437,6 +2437,8 @@ static void test_QueryInterface(IUnknown *unk) IObjectWithSite *site = (void*)0xdeadbeef; IViewObjectEx *viewex = (void*)0xdeadbeef; IOleLink *link = (void*)0xdeadbeef; + IMarshal *marshal = (void*)0xdeadbeef; + IStdMarshalInfo *marshalinfo = (void*)0xdeadbeef; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa); @@ -2471,6 +2473,14 @@ static void test_QueryInterface(IUnknown *unk) ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(link == NULL, "link=%p, expected NULL\n", link); + hres = IUnknown_QueryInterface(unk, &IID_IMarshal, (void**)&marshal); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(marshal == NULL, "marshal=%p, expected NULL\n", marshal); + + hres = IUnknown_QueryInterface(unk, &IID_IStdMarshalInfo, (void**)&marshalinfo); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(marshalinfo == NULL, "marshalinfo=%p, expected NULL\n", marshalinfo); + } static void test_WebBrowser(BOOL do_download) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 0c1bb12..ef46236 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -130,6 +130,12 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IOleLink, riid)) { TRACE("(%p)->(IID_IOleLink %p) returning NULL\n", This, ppv); return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IMarshal, riid)) { + TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IStdMarshalInfo, riid)) { + TRACE("(%p)->(IID_IStdMarshalInfo %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) { return S_OK; }

1 0

Jacek Caban : jscript: Don't use to_object for nullDisp in Object function.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 93e6ca87479ed9688c88d67614637be60250842a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e6ca87479ed9688c88d6761… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 13:54:42 2010 +0200 jscript: Don't use to_object for nullDisp in Object function. --- dlls/jscript/object.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 05eb509..bbb0372 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -186,7 +186,7 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(arg_cnt(dp)) { VARIANT *arg = get_arg(dp,0); - if(V_VT(arg) != VT_EMPTY && V_VT(arg) != VT_NULL) { + if(V_VT(arg) != VT_EMPTY && V_VT(arg) != VT_NULL && (V_VT(arg) != VT_DISPATCH || V_DISPATCH(arg))) { IDispatch *disp; hres = to_object(ctx, arg, &disp);

1 0