March 2015 - Wine-commits - list.winehq.org

Henri Verbeet : d3d10core/tests: Add a test for D3D10_APPEND_ALIGNED_ELEMENT.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: e72845e6483e4e4f29156c2b7ccd9ef154e2c3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e72845e6483e4e4f29156c2b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 09:38:27 2015 +0100 d3d10core/tests: Add a test for D3D10_APPEND_ALIGNED_ELEMENT. --- dlls/d3d10core/tests/device.c | 247 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e72845e6483e4e4f29156…

1 0

Michael Stefaniuc : mscoree: Use SUCCEEDED instead of !FAILED.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 60d54eee93b0bc218a61cb6a9383322430811853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d54eee93b0bc218a61cb6a9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 09:52:20 2015 +0100 mscoree: Use SUCCEEDED instead of !FAILED. --- dlls/mscoree/corruntimehost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 6a037f8..87f1d32 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1318,7 +1318,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) goto cleanup; hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) { /* * The registry doesn't have a CodeBase entry and it's not in the GAC.

1 0

Michael Stefaniuc : taskschd: Print the debug string instead of the pointer value.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 87cfceb8bf76100e5285583792fe90c0c662f244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87cfceb8bf76100e528558379… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 09:56:00 2015 +0100 taskschd: Print the debug string instead of the pointer value. --- dlls/taskschd/task.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d1bc7eb..5a7ade8 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -137,7 +137,7 @@ static HRESULT WINAPI RegistrationInfo_put_Description(IRegistrationInfo *iface, { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(description)); + TRACE("%p,%s\n", iface, debugstr_w(description)); if (!description) return E_INVALIDARG; @@ -163,7 +163,7 @@ static HRESULT WINAPI RegistrationInfo_put_Author(IRegistrationInfo *iface, BSTR { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(author)); + TRACE("%p,%s\n", iface, debugstr_w(author)); if (!author) return E_INVALIDARG; @@ -189,7 +189,7 @@ static HRESULT WINAPI RegistrationInfo_put_Version(IRegistrationInfo *iface, BST { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(version)); + TRACE("%p,%s\n", iface, debugstr_w(version)); if (!version) return E_INVALIDARG; @@ -215,7 +215,7 @@ static HRESULT WINAPI RegistrationInfo_put_Date(IRegistrationInfo *iface, BSTR d { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(date)); + TRACE("%p,%s\n", iface, debugstr_w(date)); if (!date) return E_INVALIDARG; @@ -241,7 +241,7 @@ static HRESULT WINAPI RegistrationInfo_put_Documentation(IRegistrationInfo *ifac { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(doc)); + TRACE("%p,%s\n", iface, debugstr_w(doc)); if (!doc) return E_INVALIDARG; @@ -259,7 +259,7 @@ static HRESULT WINAPI RegistrationInfo_get_XmlText(IRegistrationInfo *iface, BST static HRESULT WINAPI RegistrationInfo_put_XmlText(IRegistrationInfo *iface, BSTR xml) { - FIXME("%p,%p: stub\n", iface, debugstr_w(xml)); + FIXME("%p,%s: stub\n", iface, debugstr_w(xml)); return E_NOTIMPL; } @@ -279,7 +279,7 @@ static HRESULT WINAPI RegistrationInfo_put_URI(IRegistrationInfo *iface, BSTR ur { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(uri)); + TRACE("%p,%s\n", iface, debugstr_w(uri)); if (!uri) return E_INVALIDARG; @@ -297,7 +297,7 @@ static HRESULT WINAPI RegistrationInfo_get_SecurityDescriptor(IRegistrationInfo static HRESULT WINAPI RegistrationInfo_put_SecurityDescriptor(IRegistrationInfo *iface, VARIANT sddl) { - FIXME("%p,%p: stub\n", iface, debugstr_variant(&sddl)); + FIXME("%p,%s: stub\n", iface, debugstr_variant(&sddl)); return E_NOTIMPL; } @@ -317,7 +317,7 @@ static HRESULT WINAPI RegistrationInfo_put_Source(IRegistrationInfo *iface, BSTR { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(source)); + TRACE("%p,%s\n", iface, debugstr_w(source)); if (!source) return E_INVALIDARG;

1 0

Michael Stefaniuc : mshtml: Print the debug string instead of the pointer value.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: a21b2cc5b90612c9c334f101d57b2b7c97ce4076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a21b2cc5b90612c9c334f101d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 09:59:33 2015 +0100 mshtml: Print the debug string instead of the pointer value. --- dlls/mshtml/htmlstyle3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 9355bd0..f8c7466 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -560,7 +560,7 @@ static HRESULT WINAPI HTMLStyle5_get_maxHeight(IHTMLStyle5 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - TRACE("(%p)->(%p)\n", This, debugstr_variant(p)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(p)); return get_nsstyle_attr_var(This->nsstyle, STYLEID_MAX_HEIGHT, p, 0); }

1 0

Michael Stefaniuc : qcap: Print the debug string instead of the pointer value.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: f7a21ee1d748bebe9c6074f0f01a3e01f52ff68f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a21ee1d748bebe9c6074f0f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 10:01:26 2015 +0100 qcap: Print the debug string instead of the pointer value. --- dlls/qcap/avimux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 0a73942..44a032a 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1015,7 +1015,7 @@ static HRESULT WINAPI MediaSeeking_SetTimeFormat( IMediaSeeking *iface, const GUID *pFormat) { AviMux *This = impl_from_IMediaSeeking(iface); - FIXME("(%p)->(%p)\n", This, debugstr_guid(pFormat)); + FIXME("(%p)->(%s)\n", This, debugstr_guid(pFormat)); return E_NOTIMPL; }

1 0

Michael Stefaniuc : scrrun: Print the debug string instead of the pointer value.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 6ab6564b9fd760a71591d16f40507ce674dc107f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab6564b9fd760a71591d16f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 10:02:45 2015 +0100 scrrun: Print the debug string instead of the pointer value. --- dlls/scrrun/dictionary.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index cce8a37..631d0b0 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -671,7 +671,7 @@ static HRESULT WINAPI dictionary_Remove(IDictionary *iface, VARIANT *key) dictionary *This = impl_from_IDictionary(iface); struct keyitem_pair *pair; - TRACE("(%p)->(%p)\n", This, debugstr_variant(key)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(key)); if (!(pair = get_keyitem_pair(This, key))) return CTL_E_ELEMENT_NOT_FOUND;

1 0

Michael Stefaniuc : schedsvc: Drop WINE_ prefix from ERR().
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 6f6aa9b8a6f41e50f2f4e92c6ade72a03453e23c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6aa9b8a6f41e50f2f4e92c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 10:05:49 2015 +0100 schedsvc: Drop WINE_ prefix from ERR(). --- dlls/schedsvc/svc_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 8c451c9..b559311 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -129,35 +129,35 @@ static RPC_STATUS RPC_init(void) status = RpcServerUseProtseqEpW(transport, 0, NULL, NULL); if (status != RPC_S_OK) { - WINE_ERR("RpcServerUseProtseqEp error %#x\n", status); + ERR("RpcServerUseProtseqEp error %#x\n", status); return status; } status = RpcServerRegisterIf(ITaskSchedulerService_v1_0_s_ifspec, 0, 0); if (status != RPC_S_OK) { - WINE_ERR("RpcServerRegisterIf error %#x\n", status); + ERR("RpcServerRegisterIf error %#x\n", status); return status; } status = RpcServerInqBindings(&sched_bindings); if (status != RPC_S_OK) { - WINE_ERR("RpcServerInqBindings error %#x\n", status); + ERR("RpcServerInqBindings error %#x\n", status); return status; } status = RpcEpRegisterW(ITaskSchedulerService_v1_0_s_ifspec, sched_bindings, NULL, NULL); if (status != RPC_S_OK) { - WINE_ERR("RpcEpRegister error %#x\n", status); + ERR("RpcEpRegister error %#x\n", status); return status; } status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); if (status != RPC_S_OK) { - WINE_ERR("RpcServerListen error %#x\n", status); + ERR("RpcServerListen error %#x\n", status); return status; } return RPC_S_OK; @@ -180,7 +180,7 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) schedsvc_handle = RegisterServiceCtrlHandlerW(scheduleW, schedsvc_handler); if (!schedsvc_handle) { - WINE_ERR("RegisterServiceCtrlHandler error %d\n", GetLastError()); + ERR("RegisterServiceCtrlHandler error %d\n", GetLastError()); return; }

1 0

Michael Stefaniuc : fntcache: Drop WINE_ prefix from FIXME/TRACE.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 01eed947ebe300c24af60974c8ce6d6571cd412b URL: http://source.winehq.org/git/wine.git/?a=commit;h=01eed947ebe300c24af60974c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 10:06:44 2015 +0100 fntcache: Drop WINE_ prefix from FIXME/TRACE. --- dlls/fntcache/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/fntcache/main.c b/dlls/fntcache/main.c index 91c20e0..8de84b2 100644 --- a/dlls/fntcache/main.c +++ b/dlls/fntcache/main.c @@ -64,14 +64,14 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, void *event_d { case SERVICE_CONTROL_STOP: case SERVICE_CONTROL_SHUTDOWN: - WINE_TRACE( "shutting down\n" ); + TRACE( "shutting down\n" ); status.dwCurrentState = SERVICE_STOP_PENDING; status.dwControlsAccepted = 0; SetServiceStatus( service_handle, &status ); SetEvent( stop_event ); return NO_ERROR; default: - WINE_FIXME( "got service ctrl %x\n", ctrl ); + FIXME( "got service ctrl %x\n", ctrl ); status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); return NO_ERROR; @@ -86,7 +86,7 @@ VOID WINAPI ServiceMain(DWORD argc, LPWSTR *argv) static const WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e',0}; SERVICE_STATUS status; - WINE_TRACE( "starting service\n" ); + TRACE( "starting service\n" ); stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -108,5 +108,5 @@ VOID WINAPI ServiceMain(DWORD argc, LPWSTR *argv) status.dwCurrentState = SERVICE_STOPPED; status.dwControlsAccepted = 0; SetServiceStatus( service_handle, &status ); - WINE_TRACE( "service stopped\n" ); + TRACE( "service stopped\n" ); }

1 0

Nikolay Sivov : ole32: Return interface pointers instead of impl pointers from QI.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 7d44fa714a94bb9010f270926b3e8596e7c8dd15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d44fa714a94bb9010f270926… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 10:15:42 2015 +0300 ole32: Return interface pointers instead of impl pointers from QI. --- dlls/ole32/bindctx.c | 2 +- dlls/ole32/hglobalstream.c | 2 +- dlls/ole32/moniker.c | 2 +- dlls/ole32/storage32.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 5e7fe8f..8be88a6 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -92,7 +92,7 @@ BindCtxImpl_QueryInterface(IBindCtx* iface,REFIID riid,void** ppvObject) if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IBindCtx, riid)) { - *ppvObject = This; + *ppvObject = &This->IBindCtx_iface; IBindCtx_AddRef(iface); return S_OK; } diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index ff1dfa2..655e380 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -89,7 +89,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_QueryInterface( IsEqualIID(&IID_ISequentialStream, riid) || IsEqualIID(&IID_IStream, riid)) { - *ppvObject = This; + *ppvObject = &This->IStream_iface; } if ((*ppvObject)==0) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 2997156..6f7afa0 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -316,7 +316,7 @@ RunningObjectTableImpl_QueryInterface(IRunningObjectTable* iface, if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IRunningObjectTable, riid)) - *ppvObject = This; + *ppvObject = &This->IRunningObjectTable_iface; if ((*ppvObject)==0) return E_NOINTERFACE; diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f09beec..07fae9c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6300,7 +6300,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_QueryInterface( if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IEnumSTATSTG, riid)) { - *ppvObject = This; + *ppvObject = &This->IEnumSTATSTG_iface; IEnumSTATSTG_AddRef(&This->IEnumSTATSTG_iface); return S_OK; }

1 0

Nikolay Sivov : ole32/tests: Return interface pointer instead of impl pointer from QI.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 597515c074939f01da8db5716ecd86b6bd8dcaed URL: http://source.winehq.org/git/wine.git/?a=commit;h=597515c074939f01da8db5716… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 10:17:30 2015 +0300 ole32/tests: Return interface pointer instead of impl pointer from QI. --- dlls/ole32/tests/clipboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index db090bd..ce469a6 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -96,7 +96,7 @@ static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFII if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { IEnumFORMATETC_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IEnumFORMATETC_iface; return S_OK; } *ppvObj = NULL; @@ -201,7 +201,7 @@ static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID r if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { IDataObject_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IDataObject_iface; return S_OK; } *ppvObj = NULL;

1 0