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
August 2012
----- 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
541 discussions
Start a n
N
ew thread
Piotr Caban : msvcp90: Added basic_istringstream<short> implementation.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: b1ff81a7702d2cdc08d69648af81323d6b2380f8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b1ff81a7702d2cdc08d69648a…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:27 2012 +0200 msvcp90: Added basic_istringstream<short> implementation. --- dlls/msvcp90/ios.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 ++++++++++++++-------------- 2 files changed, 75 insertions(+), 18 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1ff81a7702d2cdc08d69…
1
0
0
0
Piotr Caban : msvcp90: Added basic_ostringstream<short> implementation.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: 8499ea376dbda112b3361aac6bf6a1a90fd604ae URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8499ea376dbda112b3361aac6…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:17 2012 +0200 msvcp90: Added basic_ostringstream<short> implementation. --- dlls/msvcp90/ios.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 ++++++++++++++-------------- 2 files changed, 75 insertions(+), 18 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=8499ea376dbda112b3361…
1
0
0
0
Piotr Caban : msvcp90: Export wcin, wcout, wcerr and wclog objects.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: fe8811bfd88a51a56f1a18bdc8dbe276006a6567 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fe8811bfd88a51a56f1a18bdc…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:06 2012 +0200 msvcp90: Export wcin, wcout, wcerr and wclog objects. --- dlls/msvcp90/ios.c | 160 ++++++++++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.spec | 48 +++++++------- 2 files changed, 168 insertions(+), 40 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe8811bfd88a51a56f1a1…
1
0
0
0
Jacek Caban : shlwapi: Use proper helpers for iface calls.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: 4d5bebb32180945d4c3bd28408b4dd48a3c7c672 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4d5bebb32180945d4c3bd2840…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 15 11:54:42 2012 +0200 shlwapi: Use proper helpers for iface calls. --- dlls/shlwapi/ordinal.c | 12 ++++++------ dlls/shlwapi/tests/ordinal.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 0c64ed0..88f415b 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -446,7 +446,7 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) IEnumFORMATETC_Release(pClone); } - IEnumFORMATETC_Release(pIUnknown); + IUnknown_Release(pIUnknown); } IUnknown_Release(V_UNKNOWN(&var)); } @@ -1202,7 +1202,7 @@ HRESULT WINAPI ConnectToConnectionPoint(IUnknown* lpUnkSink, REFIID riid, BOOL f IConnectionPoint_Release(lpCP); /* Release it */ } - IUnknown_Release(lpContainer); + IConnectionPointContainer_Release(lpContainer); } return hRet; } @@ -1400,7 +1400,7 @@ HRESULT WINAPI IUnknown_SetSite( { hr = IObjectWithSite_SetSite(iobjwithsite, site); TRACE("done IObjectWithSite_SetSite ret=%08x\n", hr); - IUnknown_Release(iobjwithsite); + IObjectWithSite_Release(iobjwithsite); } else { @@ -1410,7 +1410,7 @@ HRESULT WINAPI IUnknown_SetSite( hr = IInternetSecurityManager_SetSecuritySite(isecmgr, (IInternetSecurityMgrSite *)site); TRACE("done IInternetSecurityManager_SetSecuritySite ret=%08x\n", hr); - IUnknown_Release(isecmgr); + IInternetSecurityManager_Release(isecmgr); } return hr; } @@ -1493,7 +1493,7 @@ HRESULT WINAPI IUnknown_QueryService(IUnknown* lpUnknown, REFGUID sid, REFIID ri TRACE("(IServiceProvider*)%p returned (IUnknown*)%p\n", pService, *lppOut); - IUnknown_Release(pService); + IServiceProvider_Release(pService); } return hRet; } @@ -1613,7 +1613,7 @@ HRESULT WINAPI IUnknown_UIActivateIO(IUnknown *unknown, BOOL activate, LPMSG msg if (ret == S_OK) { ret = IInputObject_UIActivateIO(object, activate, msg); - IUnknown_Release(object); + IInputObject_Release(object); } return ret; diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index e787daa..1229ae2 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -833,7 +833,7 @@ static HRESULT WINAPI Disp_QueryInterface( if (*ppvObject) { - IUnknown_AddRef(This); + IDispatch_AddRef(This); return S_OK; } @@ -948,7 +948,7 @@ static HRESULT WINAPI Enum_QueryInterface( if (*ppvObject) { - IUnknown_AddRef(This); + IEnumConnections_AddRef(This); return S_OK; } @@ -1040,7 +1040,7 @@ static HRESULT WINAPI ConPt_QueryInterface( if (*ppvObject) { - IUnknown_AddRef(This); + IConnectionPoint_AddRef(This); return S_OK; } @@ -1181,7 +1181,7 @@ static HRESULT WINAPI EnumPt_QueryInterface( if (*ppvObject) { - IUnknown_AddRef(This); + IEnumConnectionPoints_AddRef(This); return S_OK; } @@ -1217,7 +1217,7 @@ static HRESULT WINAPI EnumPt_Next( if (cConnections > 0 && iface->idx < iface->container->ptCount) { *rgcd = iface->container->pt[iface->idx]; - IUnknown_AddRef(iface->container->pt[iface->idx]); + IConnectionPoint_AddRef(iface->container->pt[iface->idx]); if (pcFetched) *pcFetched = 1; iface->idx++; @@ -1272,7 +1272,7 @@ static HRESULT WINAPI Contain_QueryInterface( if (*ppvObject) { - IUnknown_AddRef(This); + IConnectionPointContainer_AddRef(This); return S_OK; } @@ -1300,7 +1300,7 @@ static ULONG WINAPI Contain_Release( { int i; for (i = 0; i < iface->ptCount; i++) - IUnknown_Release(iface->pt[i]); + IConnectionPoint_Release(iface->pt[i]); HeapFree(GetProcessHeap(),0,iface->pt); } HeapFree(GetProcessHeap(),0,This); @@ -1456,7 +1456,7 @@ static HRESULT WINAPI Prop_QueryInterface( if (*ppvObject) { - IUnknown_AddRef(This); + IPropertyBag_AddRef(This); return S_OK; } @@ -2104,7 +2104,7 @@ static HRESULT WINAPI IOleCommandTargetImpl_QueryInterface(IOleCommandTarget *if if(*ppvObj) { - IUnknown_AddRef(iface); + IOleCommandTarget_AddRef(iface); return S_OK; } @@ -2215,7 +2215,7 @@ static HRESULT WINAPI IServiceProviderImpl_QueryInterface(IServiceProvider *ifac if(*ppvObj) { - IUnknown_AddRef(iface); + IServiceProvider_AddRef(iface); /* native uses redefined IID_IServiceProvider symbol, so we can't compare pointers */ if (IsEqualIID(riid, &IID_IServiceProvider)) add_call(&trace_got, 1, iface, &IID_IServiceProvider, 0, 0, 0); @@ -2333,7 +2333,7 @@ static HRESULT WINAPI IProfferServiceImpl_QueryInterface(IProfferService *iface, if(*ppvObj) { - IUnknown_AddRef(iface); + IProfferService_AddRef(iface); return S_OK; }
1
0
0
0
Jacek Caban : strmbase: Use proper helpers for iface calls.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: db82997560b753c3c30e29c85ef1e7bfb609509b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=db82997560b753c3c30e29c85…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 15 11:45:21 2012 +0200 strmbase: Use proper helpers for iface calls. --- dlls/strmbase/outputqueue.c | 2 +- dlls/strmbase/qualitycontrol.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index 3656d49..cbcd964 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -275,7 +275,7 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) IMemInputPin_Release(pOutputQueue->pInputPin->pMemInputPin); } for (i = 0; i < nSamples; i++) - IUnknown_Release(ppSamples[i]); + IMediaSample_Release(ppSamples[i]); HeapFree(GetProcessHeap(),0,ppSamples); /* Process Non-Samples */ diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index f6c9ea7..f96ed64 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -56,17 +56,17 @@ HRESULT QualityControlImpl_Destroy(QualityControlImpl *This) HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { QualityControlImpl *This = (QualityControlImpl*)iface; - return IUnknown_QueryInterface(This->self, riid, ppv); + return IBaseFilter_QueryInterface(This->self, riid, ppv); } ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) { QualityControlImpl *This = (QualityControlImpl*)iface; - return IUnknown_AddRef(This->self); + return IBaseFilter_AddRef(This->self); } ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) { QualityControlImpl *This = (QualityControlImpl*)iface; - return IUnknown_Release(This->self); + return IBaseFilter_Release(This->self); } HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { @@ -79,7 +79,7 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se IPin_ConnectedTo(This->input, &to); if (to) { IQualityControl *qc = NULL; - IUnknown_QueryInterface(to, &IID_IQualityControl, (void**)&qc); + IPin_QueryInterface(to, &IID_IQualityControl, (void**)&qc); if (qc) { hr = IQualityControl_Notify(qc, This->self, qm); IQualityControl_Release(qc);
1
0
0
0
Jacek Caban : mmdevapi: Use proper helpers for iface calls.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: 223105b9b37cb20926ff0a9975a818c754e9ec4e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=223105b9b37cb20926ff0a997…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 15 11:45:03 2012 +0200 mmdevapi: Use proper helpers for iface calls. --- dlls/mmdevapi/devenum.c | 2 +- dlls/mmdevapi/main.c | 6 ++-- dlls/mmdevapi/tests/capture.c | 2 +- dlls/mmdevapi/tests/dependency.c | 8 +++--- dlls/mmdevapi/tests/mmdevenum.c | 40 ++++++++++++++++++------------------ dlls/mmdevapi/tests/propstore.c | 2 +- dlls/mmdevapi/tests/render.c | 42 +++++++++++++++++++------------------- 7 files changed, 51 insertions(+), 51 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=223105b9b37cb20926ff0…
1
0
0
0
Jacek Caban : rpcrt4: Moved sending echo request to separated function.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: ee40973b2b71980b669470b5b250decc606ed4cd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ee40973b2b71980b669470b5b…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 15 10:23:07 2012 +0200 rpcrt4: Moved sending echo request to separated function. --- dlls/rpcrt4/rpc_transport.c | 46 ++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 347bb41..686ce68 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2174,31 +2174,43 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) return RPC_S_OK; } +static RPC_STATUS send_echo_request(HINTERNET req, RpcHttpAsyncData *async_data, HANDLE cancel_event) +{ + DWORD bytes_read; + BYTE buf[20]; + BOOL ret; + RPC_STATUS status; + + prepare_async_request(async_data); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + status = wait_async_request(async_data, ret, cancel_event); + if (status != RPC_S_OK) return status; + + status = rpcrt4_http_check_response(req); + if (status != RPC_S_OK) return status; + + InternetReadFile(req, buf, sizeof(buf), &bytes_read); + /* FIXME: do something with retrieved data */ + + return RPC_S_OK; +} + /* prepare the in pipe for use by RPC packets */ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsyncData *async_data, HANDLE cancel_event, const UUID *connection_uuid, const UUID *in_pipe_uuid, const UUID *association_uuid) { - BYTE packet[44]; BOOL ret; RPC_STATUS status; RpcPktHdr *hdr; INTERNET_BUFFERSW buffers_in; - DWORD bytes_read, bytes_written; + DWORD bytes_written; /* prepare in pipe */ - prepare_async_request(async_data); - ret = HttpSendRequestW(in_request, NULL, 0, NULL, 0); - status = wait_async_request(async_data, ret, cancel_event); - if(status != RPC_S_OK) return status; - - status = rpcrt4_http_check_response(in_request); + status = send_echo_request(in_request, async_data, cancel_event); if (status != RPC_S_OK) return status; - InternetReadFile(in_request, packet, 20, &bytes_read); - /* FIXME: do something with retrieved data */ - memset(&buffers_in, 0, sizeof(buffers_in)); buffers_in.dwStructSize = sizeof(buffers_in); /* FIXME: get this from the registry */ @@ -2275,26 +2287,16 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, const UUID *out_pipe_uuid, ULONG *flow_control_increment) { - BYTE packet[20]; BOOL ret; RPC_STATUS status; RpcPktHdr *hdr; - DWORD bytes_read; BYTE *data_from_server; RpcPktHdr pkt_from_server; ULONG field1, field3; - prepare_async_request(async_data); - ret = HttpSendRequestW(out_request, NULL, 0, NULL, 0); - status = wait_async_request(async_data, ret, cancel_event); + status = send_echo_request(out_request, async_data, cancel_event); if (status != RPC_S_OK) return status; - status = rpcrt4_http_check_response(out_request); - if (status != RPC_S_OK) return status; - - InternetReadFile(out_request, packet, 20, &bytes_read); - /* FIXME: do something with retrieved data */ - hdr = RPCRT4_BuildHttpConnectHeader(0, TRUE, connection_uuid, out_pipe_uuid, NULL); if (!hdr) return RPC_S_OUT_OF_RESOURCES;
1
0
0
0
Jacek Caban : rpcrt4: Fixed memory leak.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: 07cb28c64132b8323d715a1bebd53b5a0844463f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=07cb28c64132b8323d715a1be…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 15 10:22:56 2012 +0200 rpcrt4: Fixed memory leak. --- dlls/rpcrt4/rpc_transport.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b44198f..347bb41 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2384,12 +2384,14 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) if (!httpc->in_request) { ERR("HttpOpenRequestW failed with error %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, url); return RPC_S_SERVER_UNAVAILABLE; } httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, wszAcceptTypes, (secure ? INTERNET_FLAG_SECURE : 0)|INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_PRAGMA_NOCACHE, (DWORD_PTR)httpc->async_data); + HeapFree(GetProcessHeap(), 0, url); if (!httpc->out_request) { ERR("HttpOpenRequestW failed with error %d\n", GetLastError());
1
0
0
0
Jacek Caban : rpcrt4: Added cancelling support for all HTTP requests.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: cbdb58476a4b966a6303cc35bcc588b9851ecfb4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cbdb58476a4b966a6303cc35b…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 15 10:22:39 2012 +0200 rpcrt4: Added cancelling support for all HTTP requests. --- dlls/rpcrt4/rpc_transport.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 76a9714..b44198f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1877,6 +1877,9 @@ static void prepare_async_request(RpcHttpAsyncData *async_data) static RPC_STATUS wait_async_request(RpcHttpAsyncData *async_data, BOOL call_ret, HANDLE cancel_event) { + HANDLE handles[2] = { async_data->completion_event, cancel_event }; + DWORD res; + if(call_ret) { RpcHttpAsyncData_Release(async_data); return RPC_S_OK; @@ -1888,16 +1891,12 @@ static RPC_STATUS wait_async_request(RpcHttpAsyncData *async_data, BOOL call_ret return RPC_S_SERVER_UNAVAILABLE; } - if(cancel_event) { - HANDLE handles[2] = { async_data->completion_event, cancel_event }; - DWORD res; - - res = WaitForMultipleObjects(2, handles, FALSE, DEFAULT_NCACN_HTTP_TIMEOUT); - if(res != WAIT_OBJECT_0) - return RPC_S_CALL_CANCELLED; - }else { - WaitForSingleObject(async_data->completion_event, INFINITE); + res = WaitForMultipleObjects(2, handles, FALSE, DEFAULT_NCACN_HTTP_TIMEOUT); + if(res != WAIT_OBJECT_0) { + TRACE("Cancelled\n"); + return RPC_S_CALL_CANCELLED; } + if(async_data->async_result) { ERR("Async request failed with error %d\n", async_data->async_result); return RPC_S_SERVER_UNAVAILABLE; @@ -2176,7 +2175,7 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) } /* prepare the in pipe for use by RPC packets */ -static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsyncData *async_data, +static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsyncData *async_data, HANDLE cancel_event, const UUID *connection_uuid, const UUID *in_pipe_uuid, const UUID *association_uuid) @@ -2191,7 +2190,7 @@ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsync /* prepare in pipe */ prepare_async_request(async_data); ret = HttpSendRequestW(in_request, NULL, 0, NULL, 0); - status = wait_async_request(async_data, ret, NULL); + status = wait_async_request(async_data, ret, cancel_event); if(status != RPC_S_OK) return status; status = rpcrt4_http_check_response(in_request); @@ -2206,7 +2205,7 @@ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsync buffers_in.dwBufferTotal = 1024 * 1024 * 1024; /* 1Gb */ prepare_async_request(async_data); ret = HttpSendRequestExW(in_request, &buffers_in, NULL, 0, 0); - status = wait_async_request(async_data, ret, NULL); + status = wait_async_request(async_data, ret, cancel_event); if (status != RPC_S_OK) return status; TRACE("sending HTTP connect header to server\n"); @@ -2271,6 +2270,7 @@ static RPC_STATUS rpcrt4_http_read_http_packet(HINTERNET request, RpcPktHdr *hdr /* prepare the out pipe for use by RPC packets */ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsyncData *async_data, + HANDLE cancel_event, const UUID *connection_uuid, const UUID *out_pipe_uuid, ULONG *flow_control_increment) @@ -2286,7 +2286,7 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, prepare_async_request(async_data); ret = HttpSendRequestW(out_request, NULL, 0, NULL, 0); - status = wait_async_request(async_data, ret, NULL); + status = wait_async_request(async_data, ret, cancel_event); if (status != RPC_S_OK) return status; status = rpcrt4_http_check_response(out_request); @@ -2300,7 +2300,7 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, prepare_async_request(async_data); ret = HttpSendRequestW(out_request, NULL, 0, hdr, hdr->common.frag_len); - status = wait_async_request(async_data, ret, NULL); + status = wait_async_request(async_data, ret, cancel_event); RPCRT4_FreeHeader(hdr); if (status != RPC_S_OK) return status; @@ -2398,6 +2398,7 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) status = rpcrt4_http_prepare_in_pipe(httpc->in_request, httpc->async_data, + httpc->cancel_event, &httpc->connection_uuid, &httpc->in_pipe_uuid, &Connection->assoc->http_uuid); @@ -2406,6 +2407,7 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) status = rpcrt4_http_prepare_out_pipe(httpc->out_request, httpc->async_data, + httpc->cancel_event, &httpc->connection_uuid, &httpc->out_pipe_uuid, &httpc->flow_control_increment);
1
0
0
0
Alistair Leslie-Hughes : scrrun: Add missing id value.
by Alexandre Julliard
15 Aug '12
15 Aug '12
Module: wine Branch: master Commit: f40bad4ce53ff17fe6602ef225b970182082817c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f40bad4ce53ff17fe6602ef22…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 6 11:23:16 2012 +1000 scrrun: Add missing id value. --- dlls/scrrun/scrrun.idl | 1 + dlls/scrrun/tests/scrrun.idl | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl index f1e8984..4b18af1 100644 --- a/dlls/scrrun/scrrun.idl +++ b/dlls/scrrun/scrrun.idl @@ -526,6 +526,7 @@ library Scripting [id(0x00002713), propget] HRESULT AtEndOfLine([out, retval] VARIANT_BOOL* EOL); + [id(0x00002714)] HRESULT Read([in] long Characters, [out, retval] BSTR* Text); [id(0x00002715)] diff --git a/dlls/scrrun/tests/scrrun.idl b/dlls/scrrun/tests/scrrun.idl index f1e8984..4b18af1 100644 --- a/dlls/scrrun/tests/scrrun.idl +++ b/dlls/scrrun/tests/scrrun.idl @@ -526,6 +526,7 @@ library Scripting [id(0x00002713), propget] HRESULT AtEndOfLine([out, retval] VARIANT_BOOL* EOL); + [id(0x00002714)] HRESULT Read([in] long Characters, [out, retval] BSTR* Text); [id(0x00002715)]
1
0
0
0
← Newer
1
...
37
38
39
40
41
42
43
...
55
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
Results per page:
10
25
50
100
200