winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2011
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
852 discussions
Start a n
N
ew thread
André Hentschel : po: Update German translation.
by Alexandre Julliard
14 Nov '11
14 Nov '11
Module: wine Branch: master Commit: 32664381fb59bb47ca972b92b428dcba23c392a5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=32664381fb59bb47ca972b92b…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 17:24:46 2011 +0100 po: Update German translation. --- po/de.po | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/po/de.po b/po/de.po index 89cc6e0..1803b0c 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To:
http://bugs.winehq.org\n
" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-01 14:03+0100\n" +"PO-Revision-Date: 2011-11-12 17:21+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -2034,73 +2034,71 @@ msgstr "%uMB benutzt, %uMB verfügbar" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "Westlich" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "Mitteleuropäisch" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "Kyrillisch" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "Grün" +msgstr "Griechisch" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "Türkisch" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "Hebräisch" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "Arabisch" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "Baltisch" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamesisch" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "Thailändisch" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "Ausschnitt" +msgstr "Japanisch" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "CHINESE_GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "Koreanisch" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "CHINESE_BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "Koreanisch(Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Symbol" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: hhctrl.rc:56 msgid "S&ync" @@ -11013,7 +11011,7 @@ msgstr "Festplattenreset fehlgeschlagen!" #: winecfg.rc:91 msgid "(System default)" -msgstr "(System Ordner)" +msgstr "(System Standard)" #: winecfg.rc:51 msgid ""
1
0
0
0
Andrew Talbot : dinput: Remove unused Wine debug channel.
by Alexandre Julliard
14 Nov '11
14 Nov '11
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
0
0
Andrew Talbot : dinput: Qualify use of WINE_DEFAULT_DEBUG_CHANNEL.
by Alexandre Julliard
14 Nov '11
14 Nov '11
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
0
0
Andrew Talbot : cryptnet: Remove unused file-static variable.
by Alexandre Julliard
14 Nov '11
14 Nov '11
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
0
0
Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard
14 Nov '11
14 Nov '11
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
0
0
Jacek Caban : urlmon: Fixed some failures on IE9.
by Alexandre Julliard
14 Nov '11
14 Nov '11
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
0
0
Jacek Caban : mshtml: Improved debug traces in nsIChannel:: AsyncOpen implementation.
by Alexandre Julliard
14 Nov '11
14 Nov '11
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
0
0
Jacek Caban : urlmon: Improved IUri debug traces.
by Alexandre Julliard
14 Nov '11
14 Nov '11
Module: wine Branch: master Commit: 64b94ebffcbe1c115433a01b150c1915959a31df URL:
http://source.winehq.org/git/wine.git/?a=commit;h=64b94ebffcbe1c115433a01b1…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 15:00:32 2011 +0100 urlmon: Improved IUri debug traces. --- dlls/urlmon/uri.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 2b0b9ad..9fd0fe0 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4206,7 +4206,7 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST { Uri *This = impl_from_IUri(iface); HRESULT hres; - TRACE("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); + TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pbstrProperty, dwFlags); if(!pbstrProperty) return E_POINTER; @@ -4496,7 +4496,7 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D { Uri *This = impl_from_IUri(iface); HRESULT hres; - TRACE("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags); if(!pcchProperty) return E_INVALIDARG; @@ -4631,7 +4631,7 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW Uri *This = impl_from_IUri(iface); HRESULT hres; - TRACE("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags); if(!pcchProperty) return E_INVALIDARG; @@ -4681,7 +4681,8 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW static HRESULT WINAPI Uri_HasProperty(IUri *iface, Uri_PROPERTY uriProp, BOOL *pfHasProperty) { Uri *This = impl_from_IUri(iface); - TRACE("(%p)->(%d %p)\n", This, uriProp, pfHasProperty); + + TRACE("(%p %s)->(%d %p)\n", This, debugstr_w(This->canon_uri), uriProp, pfHasProperty); if(!pfHasProperty) return E_INVALIDARG; @@ -4872,7 +4873,7 @@ static HRESULT WINAPI Uri_GetZone(IUri *iface, DWORD *pdwZone) static HRESULT WINAPI Uri_GetProperties(IUri *iface, DWORD *pdwProperties) { Uri *This = impl_from_IUri(iface); - TRACE("(%p)->(%p)\n", This, pdwProperties); + TRACE("(%p %s)->(%p)\n", This, debugstr_w(This->canon_uri), pdwProperties); if(!pdwProperties) return E_INVALIDARG; @@ -4922,7 +4923,7 @@ static HRESULT WINAPI Uri_IsEqual(IUri *iface, IUri *pUri, BOOL *pfEqual) Uri *This = impl_from_IUri(iface); Uri *other; - TRACE("(%p)->(%p %p)\n", This, pUri, pfEqual); + TRACE("(%p %s)->(%p %p)\n", This, debugstr_w(This->canon_uri), pUri, pfEqual); if(!pfEqual) return E_POINTER; @@ -4935,9 +4936,10 @@ static HRESULT WINAPI Uri_IsEqual(IUri *iface, IUri *pUri, BOOL *pfEqual) } /* Try to convert it to a Uri (allows for a more simple comparison). */ - if((other = get_uri_obj(pUri))) + if((other = get_uri_obj(pUri))) { + TRACE("comparing to %s\n", debugstr_w(other->canon_uri)); *pfEqual = are_equal_simple(This, other); - else { + }else { /* Do it the hard way. */ FIXME("(%p)->(%p %p) No support for unknown IUri's yet.\n", iface, pUri, pfEqual); return E_NOTIMPL;
1
0
0
0
Jacek Caban : mshtml: Moved QueryService(IID_IShellBrowser) call to the right place.
by Alexandre Julliard
14 Nov '11
14 Nov '11
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
0
0
Jacek Caban : mshtml: Get rid of an unused parameter in prepare_for_binding .
by Alexandre Julliard
14 Nov '11
14 Nov '11
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
0
0
← Newer
1
...
54
55
56
57
58
59
60
...
86
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
Results per page:
10
25
50
100
200