August 2012 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp90: Added basic_ostringstream<short> implementation.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

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

Piotr Caban : msvcp90: Export wcin, wcout, wcerr and wclog objects.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

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

Piotr Caban : msvcp90: Added basic_stringstream<short> implementation.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 625940a5607ba4c8fbe4706af010c246ee6a4062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=625940a5607ba4c8fbe4706af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:37 2012 +0200 msvcp90: Added basic_stringstream<short> implementation. --- dlls/msvcp90/ios.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 38 +++++++++++++------------- 2 files changed, 81 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=625940a5607ba4c8fbe47…

1 0

Jacek Caban : shlwapi: Use proper helpers for iface calls.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

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

Alistair Leslie-Hughes : scrrun: Add missing id value.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

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

Matteo Bruni : wined3d: Fix pixel format masks.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 902049c054f6b4d59287efb209604459227e6c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=902049c054f6b4d59287efb20… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 15 00:38:25 2012 +0200 wined3d: Fix pixel format masks. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/state.c | 6 +- dlls/wined3d/surface.c | 20 +++- dlls/wined3d/utils.c | 207 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 12 ++- 5 files changed, 127 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=902049c054f6b4d59287e…

1 0

Michael Stefaniuc : widl: Avoid FALSE:TRUE conditional expressions.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 2c97f3fcb5ecc73db7b1ab601dac00f93eb8a60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c97f3fcb5ecc73db7b1ab601… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 14 23:56:28 2012 +0200 widl: Avoid FALSE:TRUE conditional expressions. --- tools/widl/server.c | 5 ++--- tools/widl/typegen.c | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 7f817b0..29b5bec 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -175,11 +175,10 @@ static void write_function_stub(const type_t *iface, const var_t *func, unsigned /* if the context_handle attribute appears in the chain of types * without pointers being followed, then the context handle must * be direct, otherwise it is a pointer */ - int is_ch_ptr = is_aliaschain_attr(var->type, ATTR_CONTEXTHANDLE) ? FALSE : TRUE; + const char *ch_ptr = is_aliaschain_attr(var->type, ATTR_CONTEXTHANDLE) ? "*" : ""; print_server("("); write_type_decl_left(server, var->type); - fprintf(server, ")%sNDRSContextValue(__frame->%s)", - is_ch_ptr ? "" : "*", var->name); + fprintf(server, ")%sNDRSContextValue(__frame->%s)", ch_ptr, var->name); } else { diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 516d8e7..280bd05 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4146,10 +4146,11 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const /* if the context_handle attribute appears in the chain of types * without pointers being followed, then the context handle must * be direct, otherwise it is a pointer */ - int is_ch_ptr = is_aliaschain_attr(type, ATTR_CONTEXTHANDLE) ? FALSE : TRUE; + const char *ch_ptr = is_aliaschain_attr(type, ATTR_CONTEXTHANDLE) ? "" : "*"; print_file(file, indent, "NdrClientContextMarshall(\n"); print_file(file, indent + 1, "&__frame->_StubMsg,\n"); - print_file(file, indent + 1, "(NDR_CCONTEXT)%s%s%s,\n", is_ch_ptr ? "*" : "", local_var_prefix, var->name); + print_file(file, indent + 1, "(NDR_CCONTEXT)%s%s%s,\n", ch_ptr, local_var_prefix, + var->name); print_file(file, indent + 1, "%s);\n", in_attr && out_attr ? "1" : "0"); } else

1 0

Jacek Caban : rpcrt4: Fixed memory leak.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

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

Jacek Caban : rpcrt4: Moved sending echo request to separated function.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

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

Jacek Caban : strmbase: Use proper helpers for iface calls.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

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