November 2011 - Wine-Commits

Andrew Talbot : dinput: Remove unused Wine debug channel.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: f3d0c715a33322f52cb01dfc2230a4f1c427d441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d0c715a33322f52cb01dfc2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 12 22:49:32 2011 +0000 dinput: Remove unused Wine debug channel. --- dlls/dinput/config.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 56cbdf3..abf3fd5 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -18,15 +18,12 @@ #define NONAMELESSUNION -#include "wine/debug.h" #include "wine/unicode.h" #include "objbase.h" #include "dinput_private.h" #include "device_private.h" #include "resource.h" -WINE_DEFAULT_DEBUG_CHANNEL(dinput); - typedef struct { int nobjects; IDirectInputDevice8W *lpdid;

1 0

Jacek Caban : mshtml: Use set_nsstyle_attr_var in IHTMLStyle:: put_height implementation.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 6f9e67e0b45804e7256959819d3f11bb7935b588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9e67e0b45804e7256959819… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 14:32:31 2011 +0100 mshtml: Use set_nsstyle_attr_var in IHTMLStyle::put_height implementation. --- dlls/mshtml/htmlstyle.c | 10 +--------- dlls/mshtml/tests/style.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a9c6133..f006193 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2069,15 +2069,7 @@ static HRESULT WINAPI HTMLStyle_put_height(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - switch(V_VT(&v)) { - case VT_BSTR: - return set_style_attr(This, STYLEID_HEIGHT, V_BSTR(&v), 0); - default: - FIXME("unimplemented vt %d\n", V_VT(&v)); - return E_NOTIMPL; - } - - return S_OK; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_HEIGHT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_height(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e37c593..bdb3dc2 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -872,7 +872,7 @@ static void test_body_style(IHTMLStyle *style) "expected 4.0 or 4.9 (IE8) got %f\n", f); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("64px"); + V_BSTR(&v) = a2bstr("70px"); hres = IHTMLStyle_put_height(style, v); ok(hres == S_OK, "put_height failed: %08x\n", hres); VariantClear(&v); @@ -881,6 +881,18 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_height(style, &v); ok(hres == S_OK, "get_height failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "70px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_I4; + V_I4(&v) = 64; + hres = IHTMLStyle_put_height(style, v); + ok(hres == S_OK, "put_height failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_height(style, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "64px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v);

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 82c3b84e4004d52cb8eda04403dcf512be05248a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c3b84e4004d52cb8eda0440… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 12 19:09:51 2011 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 7901b6e..987801f 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4535,13 +4535,13 @@ static BOOL fourcc_supported(DWORD fourcc, DWORD caps) IDirectDrawSurface *surface; reset_ddsd(&ddsd); - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; ddsd.dwWidth = 4; ddsd.dwHeight = 4; ddsd.ddsCaps.dwCaps = caps; - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_FOURCC; - U4(ddsd).ddpfPixelFormat.dwFourCC = fourcc; + ddsd.ddpfPixelFormat.dwFlags = DDPF_FOURCC; + ddsd.ddpfPixelFormat.dwFourCC = fourcc; hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); if (FAILED(hr)) {

1 0

Jacek Caban : urlmon: Fixed some failures on IE9.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 7230b6b2b6bff9080c54b28250bd516d1a7e23b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7230b6b2b6bff9080c54b2825… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 19:48:06 2011 +0100 urlmon: Fixed some failures on IE9. --- dlls/urlmon/tests/protocol.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 0cc14f5..52da99b 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -701,7 +701,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) { if(tested_protocol == BIND_TEST) - ok(szStatusText == expect_wsz, "unexpected szStatusText\n"); + ok(!lstrcmpW(szStatusText, expect_wsz), "unexpected szStatusText %s\n", wine_dbgstr_w(szStatusText)); else if (http_post_test) ok(lstrlenW(text_plain) <= lstrlenW(szStatusText) && !memcmp(szStatusText, text_plain, lstrlenW(text_plain)*sizeof(WCHAR)), @@ -785,8 +785,9 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(!szStatusText, "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_PROXYDETECTING: - CHECK_EXPECT(ReportProgress_PROXYDETECTING); - SET_EXPECT(ReportProgress_CONNECTING); + if(!called_ReportProgress_PROXYDETECTING) + SET_EXPECT(ReportProgress_CONNECTING); + CHECK_EXPECT2(ReportProgress_PROXYDETECTING); ok(!szStatusText, "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_LOADINGMIMEHANDLER:

1 0

Andrew Talbot : dinput: Qualify use of WINE_DEFAULT_DEBUG_CHANNEL.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: bf3d67c46031119f7fe8e68e2f541b2c843b6a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3d67c46031119f7fe8e68e2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 12 22:49:26 2011 +0000 dinput: Qualify use of WINE_DEFAULT_DEBUG_CHANNEL. --- dlls/dinput/joystick_osx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index cbd005c..40268ad 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -79,10 +79,10 @@ #include "device_private.h" #include "joystick_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(dinput); - #ifdef HAVE_IOHIDMANAGERCREATE +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + static IOHIDManagerRef gIOHIDManagerRef = NULL; static CFArrayRef gCollections = NULL;

1 0

Jacek Caban : mshtml: Get rid of an unused parameter in prepare_for_binding .
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: dc604f4a27b29b88942122549fb7769b81288cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc604f4a27b29b88942122549… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 14:33:39 2011 +0100 mshtml: Get rid of an unused parameter in prepare_for_binding. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/persist.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 3e8b87c..6d9ed85 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -106,7 +106,7 @@ HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLS HRESULT create_doc_uri(HTMLWindow*,WCHAR*,nsWineURI**) DECLSPEC_HIDDEN; HRESULT load_nsuri(HTMLWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; -void prepare_for_binding(HTMLDocument*,IMoniker*,IBindCtx*,BOOL) DECLSPEC_HIDDEN; +void prepare_for_binding(HTMLDocument*,IMoniker*,BOOL) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,WCHAR*,BYTE*,DWORD,nsChannelBSC**) DECLSPEC_HIDDEN; HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1b09697..98fbc0b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1960,7 +1960,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, return hres; } - prepare_for_binding(&This->doc_obj->basedoc, mon, NULL, TRUE); + prepare_for_binding(&This->doc_obj->basedoc, mon, TRUE); hres = IUri_GetScheme(uri, &scheme); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index ef80f8d..3107e92 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -232,7 +232,7 @@ static void set_downloading_task_destr(task_t *_task) heap_free(task); } -void prepare_for_binding(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL navigated_binding) +void prepare_for_binding(HTMLDocument *This, IMoniker *mon, BOOL navigated_binding) { HRESULT hres; @@ -485,7 +485,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva } } - prepare_for_binding(This, pimkName, pibc, FALSE); + prepare_for_binding(This, pimkName, FALSE); hres = set_moniker(This, pimkName, pibc, NULL, TRUE); if(FAILED(hres)) return hres; @@ -756,7 +756,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM return hres; } - prepare_for_binding(This, mon, NULL, FALSE); + prepare_for_binding(This, mon, FALSE); hres = set_moniker(This, mon, NULL, NULL, TRUE); IMoniker_Release(mon); if(FAILED(hres)) @@ -815,7 +815,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) return hres; } - prepare_for_binding(This, mon, NULL, FALSE); + prepare_for_binding(This, mon, FALSE); hres = set_moniker(This, mon, NULL, NULL, FALSE); IMoniker_Release(mon); if(FAILED(hres))

1 0

Jacek Caban : mshtml: Fixed HTMLPrivateWindow_GetAddressBarUrl function name.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 52826af93c37ebf87e8c7e9b2a787a6cde719b1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=52826af93c37ebf87e8c7e9b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 14:32:47 2011 +0100 mshtml: Fixed HTMLPrivateWindow_GetAddressBarUrl function name. --- dlls/mshtml/htmlwindow.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 650d18f..1b09697 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2034,7 +2034,7 @@ static HRESULT WINAPI HTMLPrivateWindow_FindWindowByName(IHTMLPrivateWindow *ifa return E_NOTIMPL; } -static HRESULT WINAPI HTMLPrivateWindow_GetAddressBar(IHTMLPrivateWindow *iface, BSTR *url) +static HRESULT WINAPI HTMLPrivateWindow_GetAddressBarUrl(IHTMLPrivateWindow *iface, BSTR *url) { HTMLWindow *This = impl_from_IHTMLPrivateWindow(iface); TRACE("(%p)->(%p)\n", This, url); @@ -2055,7 +2055,7 @@ static const IHTMLPrivateWindowVtbl HTMLPrivateWindowVtbl = { HTMLPrivateWindow_SetPICSTarget, HTMLPrivateWindow_PICSComplete, HTMLPrivateWindow_FindWindowByName, - HTMLPrivateWindow_GetAddressBar + HTMLPrivateWindow_GetAddressBarUrl }; static inline HTMLWindow *impl_from_IDispatchEx(IDispatchEx *iface)

1 0

Andrew Talbot : cryptnet: Remove unused file-static variable.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 9192a20132c751f977e87ee81fe3057d92c5fd3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9192a20132c751f977e87ee81… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 12 22:49:20 2011 +0000 cryptnet: Remove unused file-static variable. --- dlls/cryptnet/cryptnet_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index e7f9f46..5d06396 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -60,8 +60,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) static const WCHAR cryptNet[] = { 'c','r','y','p','t','n','e','t','.', 'd','l','l',0 }; -static const WCHAR ldapProvOpenStore[] = { 'L','d','a','p','P','r','o','v', - 'O','p','e','S','t','o','r','e',0 }; /*********************************************************************** * DllRegisterServer (CRYPTNET.@)

1 0

Jacek Caban : mshtml: Improved debug traces in nsIChannel:: AsyncOpen implementation.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 69f4def9e5521dde1b8257edefccc6386fcc95fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f4def9e5521dde1b8257ede… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 18:25:23 2011 +0100 mshtml: Improved debug traces in nsIChannel::AsyncOpen implementation. --- dlls/mshtml/nsio.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d266ddf..7b6bb78 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -949,6 +949,13 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen if(!ensure_uri(This->uri)) return NS_ERROR_FAILURE; + if(TRACE_ON(mshtml)) { + BSTR uri_str; + IUri_GetDisplayUri(This->uri->uri, &uri_str); + TRACE("opening %s\n", debugstr_w(uri_str)); + SysFreeString(uri_str); + } + if(This->uri->is_doc_uri) { window = get_channel_window(This); if(window) {

1 0

Jacek Caban : mshtml: Moved QueryService(IID_IShellBrowser) call to the right place.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 54faf0852fe377a009f873ecb941995dd36dd710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54faf0852fe377a009f873ecb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 14:54:09 2011 +0100 mshtml: Moved QueryService(IID_IShellBrowser) call to the right place. --- dlls/mshtml/oleobj.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index d80db20..fa2694e 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -98,7 +98,6 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite HTMLDocument *This = impl_from_IOleObject(iface); IOleCommandTarget *cmdtrg = NULL; IOleWindow *ole_window; - IServiceProvider *sp; BOOL hostui_setup; VARIANT silent; HWND hwnd; @@ -133,25 +132,6 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite IOleClientSite_AddRef(pClientSite); This->doc_obj->client = pClientSite; - hres = IOleClientSite_QueryInterface(pClientSite, &IID_IServiceProvider, (void**)&sp); - if(SUCCEEDED(hres)) { - IBrowserService *browser_service; - IDocObjectService *doc_object_service; - - hres = IServiceProvider_QueryService(sp, &IID_IShellBrowser, - &IID_IBrowserService, (void**)&browser_service); - if(SUCCEEDED(hres)) { - hres = IBrowserService_QueryInterface(browser_service, - &IID_IDocObjectService, (void**)&doc_object_service); - if(SUCCEEDED(hres)) - This->doc_obj->doc_object_service = doc_object_service; - - IBrowserService_Release(browser_service); - } - - IServiceProvider_Release(sp); - } - hostui_setup = This->doc_obj->hostui_setup; if(!This->doc_obj->hostui) { @@ -222,9 +202,29 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite OLECMD cmd = {OLECMDID_SETPROGRESSTEXT, 0}; if(!hostui_setup) { + IServiceProvider *sp; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)&This->window->IHTMLWindow2_iface; IOleCommandTarget_Exec(cmdtrg, &CGID_DocHostCmdPriv, DOCHOST_DOCCANNAVIGATE, 0, &var, NULL); + + hres = IOleClientSite_QueryInterface(pClientSite, &IID_IServiceProvider, (void**)&sp); + if(SUCCEEDED(hres)) { + IDocObjectService *doc_object_service; + IBrowserService *browser_service; + + hres = IServiceProvider_QueryService(sp, &IID_IShellBrowser, + &IID_IBrowserService, (void**)&browser_service); + if(SUCCEEDED(hres)) { + hres = IBrowserService_QueryInterface(browser_service, + &IID_IDocObjectService, (void**)&doc_object_service); + if(SUCCEEDED(hres)) + This->doc_obj->doc_object_service = doc_object_service; + IBrowserService_Release(browser_service); + } + + IServiceProvider_Release(sp); + } } IOleCommandTarget_QueryStatus(cmdtrg, NULL, 1, &cmd, NULL);

1 0