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
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
October 2010
----- 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
1174 discussions
Start a n
N
ew thread
Alexandre Julliard : Release 1.3.4.
by Alexandre Julliard
01 Oct '10
01 Oct '10
Module: wine Branch: master Commit: 3f76a25201f94c732b5c7e7ec9889cbf1c0d73fe URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3f76a25201f94c732b5c7e7ec…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 20:46:44 2010 +0200 Release 1.3.4. --- ANNOUNCE | 1142 ++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 643 insertions(+), 519 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f76a25201f94c732b5c7…
1
0
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
0
Hans Leidekker : advapi32: Add a stub implementation of EventRegister.
by Alexandre Julliard
01 Oct '10
01 Oct '10
Module: wine Branch: master Commit: aba86be1016ef04698f04e6c0142e8f3c618b869 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aba86be1016ef04698f04e6c0…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 1 15:38:42 2010 +0200 advapi32: Add a stub implementation of EventRegister. --- dlls/advapi32/advapi32.spec | 1 + dlls/advapi32/eventlog.c | 10 +++++++++ include/Makefile.in | 1 + include/evntprov.h | 45 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 11a335b..7521294 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -217,6 +217,7 @@ # @ stub EqualDomainSid @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) +@ stdcall EventRegister(ptr ptr ptr ptr) @ stdcall FileEncryptionStatusA(str ptr) @ stdcall FileEncryptionStatusW(wstr ptr) @ stdcall FindFirstFreeAce(ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index df44cd2..d048eed 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -28,6 +28,7 @@ #include "winternl.h" #include "wmistr.h" #include "evntrace.h" +#include "evntprov.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -807,3 +808,12 @@ ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); return ERROR_CALL_NOT_IMPLEMENTED; } + +/****************************************************************************** + * EventRegister [ADVAPI32.@] + */ +ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle ) +{ + FIXME("%s, %p, %p, %p\n", debugstr_guid(provider), callback, context, handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/Makefile.in b/include/Makefile.in index c4bb8db..fc6df0f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -248,6 +248,7 @@ SRCDIR_INCLUDES = \ errorrep.h \ errors.h \ evcode.h \ + evntprov.h \ evntrace.h \ excpt.h \ exdispid.h \ diff --git a/include/evntprov.h b/include/evntprov.h new file mode 100644 index 0000000..4bb3d14 --- /dev/null +++ b/include/evntprov.h @@ -0,0 +1,45 @@ +/* + * Copyright 2010 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _EVNTPROV_H_ +#define _EVNTPROV_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef ULONGLONG REGHANDLE, *PREGHANDLE; + +typedef struct _EVENT_FILTER_DESCRIPTOR +{ + ULONGLONG Ptr; + ULONG Size; + ULONG Type; + +} EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR; + +typedef VOID (NTAPI *PENABLECALLBACK)(LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,PEVENT_FILTER_DESCRIPTOR,PVOID); + +ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); +ULONG WINAPI EventUnregister(REGHANDLE); + +#ifdef __cplusplus +} +#endif + +#endif /* _EVNTPROV_H_ */
1
0
0
0
Jacek Caban : urlmon: Replace also bind_info in set_binding_sink.
by Alexandre Julliard
01 Oct '10
01 Oct '10
Module: wine Branch: master Commit: 39f2c63055ca386fce0cb4cc6dbeda7536960ffc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=39f2c63055ca386fce0cb4cc6…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 13:56:56 2010 +0200 urlmon: Replace also bind_info in set_binding_sink. --- dlls/urlmon/binding.c | 7 +++++-- dlls/urlmon/bindprot.c | 17 ++++++++++------- dlls/urlmon/tests/url.c | 8 +++----- dlls/urlmon/urlmon_main.h | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index e0f3624..02053b0 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1077,8 +1077,11 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres } if(This->to_object) { - if(!(This->state & BINDING_OBJAVAIL)) + if(!(This->state & BINDING_OBJAVAIL)) { + IBinding_AddRef(BINDING(This)); create_object(This); + IBinding_Release(BINDING(This)); + } }else { STGMEDIUM stgmed; HRESULT hres; @@ -1519,7 +1522,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I } if(binding_ctx) { - set_binding_sink(binding->protocol, PROTSINK(binding)); + set_binding_sink(binding->protocol, PROTSINK(binding), BINDINF(binding)); if(binding_ctx->redirect_url) IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_REDIRECTING, binding_ctx->redirect_url); report_data(binding, 0, 0, 0); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 29b8532..01443e3 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -382,7 +382,7 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocol *iface) if(This->filter_proxy) IInternetProtocol_Release(PROTOCOL(This->filter_proxy)); - set_binding_sink(PROTOCOL(This), NULL); + set_binding_sink(PROTOCOL(This), NULL, NULL); if(This->notif_hwnd) release_notif_hwnd(This->notif_hwnd); @@ -488,7 +488,7 @@ static HRESULT WINAPI BindProtocol_UnlockRequest(IInternetProtocol *iface) return IInternetProtocol_UnlockRequest(This->protocol_handler); } -void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink) +void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink, IInternetBindInfo *bind_info) { BindProtocol *This = PROTOCOL_THIS(bind_protocol); IInternetProtocolSink *prev_sink; @@ -505,6 +505,12 @@ void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *s service_provider = InterlockedExchangePointer((void**)&This->service_provider, service_provider); if(service_provider) IServiceProvider_Release(service_provider); + + if(bind_info) + IInternetBindInfo_AddRef(bind_info); + bind_info = InterlockedExchangePointer((void**)&This->bind_info, bind_info); + if(bind_info) + IInternetBindInfo_Release(bind_info); } IWinInetInfo *get_wininet_info(IInternetProtocol *bind_protocol) @@ -619,10 +625,7 @@ static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocol *iface, LPCWSTR sz if(urlmon_protocol) IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&This->wininet_info); - IInternetBindInfo_AddRef(pOIBindInfo); - This->bind_info = pOIBindInfo; - - set_binding_sink(PROTOCOL(This), pOIProtSink); + set_binding_sink(PROTOCOL(This), pOIProtSink, pOIBindInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); if(SUCCEEDED(hres)) { @@ -670,7 +673,7 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD This->filter_proxy = NULL; } - set_binding_sink(PROTOCOL(This), NULL); + set_binding_sink(PROTOCOL(This), NULL, NULL); if(This->bind_info) { IInternetBindInfo_Release(This->bind_info); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index e25db0b..a010d23 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2674,13 +2674,11 @@ static void test_BindToObject(int protocol, DWORD flags) CHECK_CALLED(Obj_OnStopBinding); } - if(test_protocol != HTTP_TEST || emulate_protocol || !(bindf & BINDF_ASYNCHRONOUS)) { - ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); + ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); + if(test_protocol != HTTP_TEST || emulate_protocol || !(bindf & BINDF_ASYNCHRONOUS)) 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"); + else IBindCtx_Release(bctx); - } if(emulate_protocol) CoRevokeClassObject(regid); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index e6bc594..3aada09 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -78,7 +78,7 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol **protocol); -void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink); +void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink, IInternetBindInfo *bind_info); IWinInetInfo *get_wininet_info(IInternetProtocol*); typedef struct ProtocolVtbl ProtocolVtbl;
1
0
0
0
← Newer
1
...
109
110
111
112
113
114
115
...
118
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
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
Results per page:
10
25
50
100
200