July 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : rpcrt4: Convert old-style arguments for stub calls.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: ad7cb0cf6c8e154a62ae885b55eb7f70a30ae2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7cb0cf6c8e154a62ae885b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 17:48:19 2011 +0200 rpcrt4: Convert old-style arguments for stub calls. --- dlls/rpcrt4/ndr_stubless.c | 265 ++++++++++---------------------------------- 1 files changed, 57 insertions(+), 208 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad7cb0cf6c8e154a62ae8…

1 0

Alexandre Julliard : rpcrt4: Convert old-style argument formats to new style so that the client call implementation can be shared .
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: e8e3a2da83e45a7201d983a149b36246bb0fd371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e3a2da83e45a7201d983a14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 16:54:01 2011 +0200 rpcrt4: Convert old-style argument formats to new style so that the client call implementation can be shared. --- dlls/rpcrt4/ndr_stubless.c | 131 +++++++++++++++++++++++++++++++------------- 1 files changed, 93 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8e3a2da83e45a7201d98…

1 0

Michael Stefaniuc : dmusic: Merge the IClassFactory implementations.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 0c4ec942ba56d7c3364bc7be78b7986d8b30426e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4ec942ba56d7c3364bc7be7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 28 10:19:59 2011 +0200 dmusic: Merge the IClassFactory implementations. --- dlls/dmusic/dmusic_main.c | 131 +++++++++++++++++++-------------------------- 1 files changed, 55 insertions(+), 76 deletions(-) diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index b786ed6..3a2db89 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -31,106 +31,85 @@ static HINSTANCE instance; LONG DMUSIC_refCount = 0; typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); } IClassFactoryImpl; /****************************************************************** - * DirectMusic ClassFactory + * IClassFactory implementation */ -static HRESULT WINAPI DirectMusicCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); - - if (ppobj == NULL) return E_POINTER; - - return E_NOINTERFACE; -} - -static ULONG WINAPI DirectMusicCF_AddRef(LPCLASSFACTORY iface) { - DMUSIC_LockModule(); - - return 2; /* non-heap based object */ -} - -static ULONG WINAPI DirectMusicCF_Release(LPCLASSFACTORY iface) { - DMUSIC_UnlockModule(); - - return 1; /* non-heap based object */ +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); } -static HRESULT WINAPI DirectMusicCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - return DMUSIC_CreateDirectMusicImpl (riid, ppobj, pOuter); +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid)) + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + else if (IsEqualGUID(&IID_IClassFactory, riid)) + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + else { + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = iface; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static HRESULT WINAPI DirectMusicCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - TRACE("(%d)\n", dolock); +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + DMUSIC_LockModule(); - if (dolock) - DMUSIC_LockModule(); - else - DMUSIC_UnlockModule(); - - return S_OK; + return 2; /* non-heap based object */ } -static const IClassFactoryVtbl DirectMusicCF_Vtbl = { - DirectMusicCF_QueryInterface, - DirectMusicCF_AddRef, - DirectMusicCF_Release, - DirectMusicCF_CreateInstance, - DirectMusicCF_LockServer -}; - -static IClassFactoryImpl DirectMusic_CF = {&DirectMusicCF_Vtbl}; - -/****************************************************************** - * DirectMusicCollection ClassFactory - */ -static HRESULT WINAPI CollectionCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + DMUSIC_UnlockModule(); - if (ppobj == NULL) return E_POINTER; - - return E_NOINTERFACE; + return 1; /* non-heap based object */ } -static ULONG WINAPI CollectionCF_AddRef(LPCLASSFACTORY iface) { - DMUSIC_LockModule(); - - return 2; /* non-heap based object */ -} +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, + REFIID riid, void **ppv) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); -static ULONG WINAPI CollectionCF_Release(LPCLASSFACTORY iface) { - DMUSIC_UnlockModule(); + TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return 1; /* non-heap based object */ + return This->fnCreateInstance(riid, ppv, pUnkOuter); } -static HRESULT WINAPI CollectionCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - return DMUSIC_CreateDirectMusicCollectionImpl (riid, ppobj, pOuter); -} +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + TRACE("(%d)\n", dolock); -static HRESULT WINAPI CollectionCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - TRACE("(%d)\n", dolock); + if (dolock) + DMUSIC_LockModule(); + else + DMUSIC_UnlockModule(); - if (dolock) - DMUSIC_LockModule(); - else - DMUSIC_UnlockModule(); - - return S_OK; + return S_OK; } -static const IClassFactoryVtbl CollectionCF_Vtbl = { - CollectionCF_QueryInterface, - CollectionCF_AddRef, - CollectionCF_Release, - CollectionCF_CreateInstance, - CollectionCF_LockServer +static const IClassFactoryVtbl classfactory_vtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer }; -static IClassFactoryImpl Collection_CF = {&CollectionCF_Vtbl}; +static IClassFactoryImpl DirectMusic_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicImpl}; +static IClassFactoryImpl Collection_CF = {{&classfactory_vtbl}, + DMUSIC_CreateDirectMusicCollectionImpl}; /****************************************************************** * DllMain

1 0

Michael Stefaniuc : dswave: Implement IClassFactory::QueryInterface.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 3ff39057d21c148dcdb56cf4ff090635fbbbce82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ff39057d21c148dcdb56cf4f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 28 10:23:01 2011 +0200 dswave: Implement IClassFactory::QueryInterface. --- dlls/dswave/dswave_main.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 9055dfa..d9b16d6 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -37,13 +37,24 @@ typedef struct { /****************************************************************** * DirectMusicWave ClassFactory */ -static HRESULT WINAPI WaveCF_QueryInterface(IClassFactory * iface, REFIID riid, void **ppobj) +static HRESULT WINAPI WaveCF_QueryInterface(IClassFactory * iface, REFIID riid, void **ppv) { - FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); - - if (ppobj == NULL) return E_POINTER; - - return E_NOINTERFACE; + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid)) + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + else if (IsEqualGUID(&IID_IClassFactory, riid)) + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + else { + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = iface; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI WaveCF_AddRef(IClassFactory * iface)

1 0

Alexandre Julliard : rpcrt4: Use a single structure for all parameter types in new format descriptors.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 4447f221db81aa965fe0fbf2d1e1387f41e98f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4447f221db81aa965fe0fbf2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 12:43:27 2011 +0200 rpcrt4: Use a single structure for all parameter types in new format descriptors. --- dlls/rpcrt4/ndr_stubless.c | 151 +++++++++++++++++--------------------------- dlls/rpcrt4/ndr_stubless.h | 33 +++------- 2 files changed, 69 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4447f221db81aa965fe0f…

1 0

Michael Stefaniuc : dmime: Merge the IClassFactory implementations.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 29575d2f4c75a2c525c6de838029c6daf86d4d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29575d2f4c75a2c525c6de838… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 28 10:21:26 2011 +0200 dmime: Merge the IClassFactory implementations. --- dlls/dmime/dmime_main.c | 747 +++++------------------------------------------ 1 files changed, 72 insertions(+), 675 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29575d2f4c75a2c525c6d…

1 0

Michael Stefaniuc : dswave: COM cleanup for the IClassFactory iface.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 348392fe2b6a0b47c2110d06f03a4efc76c85042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=348392fe2b6a0b47c2110d06f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 28 10:18:37 2011 +0200 dswave: COM cleanup for the IClassFactory iface. --- dlls/dswave/dswave_main.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index a3d5809..9055dfa 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -31,13 +31,14 @@ static HINSTANCE instance; LONG DSWAVE_refCount = 0; typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; } IClassFactoryImpl; /****************************************************************** * DirectMusicWave ClassFactory */ -static HRESULT WINAPI WaveCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { +static HRESULT WINAPI WaveCF_QueryInterface(IClassFactory * iface, REFIID riid, void **ppobj) +{ FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -45,25 +46,30 @@ static HRESULT WINAPI WaveCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPV return E_NOINTERFACE; } -static ULONG WINAPI WaveCF_AddRef(LPCLASSFACTORY iface) { +static ULONG WINAPI WaveCF_AddRef(IClassFactory * iface) +{ DSWAVE_LockModule(); return 2; /* non-heap based object */ } -static ULONG WINAPI WaveCF_Release(LPCLASSFACTORY iface) { +static ULONG WINAPI WaveCF_Release(IClassFactory * iface) +{ DSWAVE_UnlockModule(); return 1; /* non-heap based object */ } -static HRESULT WINAPI WaveCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { +static HRESULT WINAPI WaveCF_CreateInstance(IClassFactory * iface, IUnknown *pOuter, REFIID riid, + void **ppobj) +{ TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - + return DMUSIC_CreateDirectMusicWaveImpl (riid, ppobj, pOuter); } -static HRESULT WINAPI WaveCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { +static HRESULT WINAPI WaveCF_LockServer(IClassFactory * iface, BOOL dolock) +{ TRACE("(%d)\n", dolock); if (dolock) @@ -82,7 +88,7 @@ static const IClassFactoryVtbl WaveCF_Vtbl = { WaveCF_LockServer }; -static IClassFactoryImpl Wave_CF = {&WaveCF_Vtbl}; +static IClassFactoryImpl Wave_CF = {{&WaveCF_Vtbl}}; /****************************************************************** * DllMain

1 0

Vincent Povirk : windowscodecs: Implement FlipRotator_GetResolution.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 6956f2be1bfb8871e4fd5e2957d7160e79b49db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6956f2be1bfb8871e4fd5e295… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 27 16:07:57 2011 -0500 windowscodecs: Implement FlipRotator_GetResolution. --- dlls/windowscodecs/fliprotate.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c index 2e834a2..26062cd 100644 --- a/dlls/windowscodecs/fliprotate.c +++ b/dlls/windowscodecs/fliprotate.c @@ -129,9 +129,15 @@ static HRESULT WINAPI FlipRotator_GetPixelFormat(IWICBitmapFlipRotator *iface, static HRESULT WINAPI FlipRotator_GetResolution(IWICBitmapFlipRotator *iface, double *pDpiX, double *pDpiY) { - FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); + TRACE("(%p,%p,%p)\n", iface, pDpiX, pDpiY); - return E_NOTIMPL; + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + else if (This->swap_xy) + return IWICBitmapSource_GetResolution(This->source, pDpiY, pDpiX); + else + return IWICBitmapSource_GetResolution(This->source, pDpiX, pDpiY); } static HRESULT WINAPI FlipRotator_CopyPalette(IWICBitmapFlipRotator *iface,

1 0

Hans Leidekker : winhttp: Disable automatic authentication.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 7939090fde5a51b7db63bdcdd683c98eb672b16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7939090fde5a51b7db63bdcdd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 28 09:08:26 2011 +0200 winhttp: Disable automatic authentication. --- dlls/winhttp/request.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ef5c2cb..01fdc20 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2440,7 +2440,7 @@ static HRESULT WINAPI winhttp_request_Open( HINTERNET hsession = NULL, hconnect = NULL, hrequest; URL_COMPONENTS uc; WCHAR *hostname, *path; - DWORD err, len, flags = 0, request_flags = 0; + DWORD err, len, flags = 0, request_flags = 0, disable_flags; TRACE("%p, %s, %s, %s\n", request, debugstr_w(method), debugstr_w(url), debugstr_variant(&async)); @@ -2488,6 +2488,12 @@ static HRESULT WINAPI winhttp_request_Open( err = get_last_error(); goto error; } + disable_flags = WINHTTP_DISABLE_AUTHENTICATION; + if (!WinHttpSetOption( hrequest, WINHTTP_OPTION_DISABLE_FEATURE, &disable_flags, sizeof(disable_flags) )) + { + err = get_last_error(); + goto error; + } if (flags & WINHTTP_FLAG_ASYNC) { request->wait = CreateEventW( NULL, FALSE, FALSE, NULL );

1 0

Vincent Povirk : windowscodecs: Implement IcoFrameDecode_GetResolution.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 5f46f701c5755da3502005477c2929891785a6e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f46f701c5755da3502005477… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 27 16:29:53 2011 -0500 windowscodecs: Implement IcoFrameDecode_GetResolution. --- dlls/windowscodecs/icoformat.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index fcb5d49..b9e7c61 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -69,6 +69,7 @@ typedef struct { IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; LONG ref; UINT width, height; + double dpiX, dpiY; BYTE *bits; } IcoFrameDecode; @@ -155,8 +156,14 @@ static HRESULT WINAPI IcoFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface static HRESULT WINAPI IcoFrameDecode_GetResolution(IWICBitmapFrameDecode *iface, double *pDpiX, double *pDpiY) { - FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); - return E_NOTIMPL; + IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); + + *pDpiX = This->dpiX; + *pDpiY = This->dpiY; + + TRACE("(%p) -> (%f,%f)\n", iface, *pDpiX, *pDpiY); + + return S_OK; } static HRESULT WINAPI IcoFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, @@ -276,6 +283,9 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) IWICBitmapSource_Release(source); } + if (SUCCEEDED(hr)) + hr = IWICBitmapFrameDecode_GetResolution(source, &result->dpiX, &result->dpiY); + IWICBitmapFrameDecode_Release(framedecode); } @@ -402,6 +412,9 @@ static HRESULT ReadIcoPng(IStream *stream, IcoFrameDecode *result) hr = IWICBitmapFrameDecode_GetSize(sourceFrame, &result->width, &result->height); if (FAILED(hr)) goto end; + hr = IWICBitmapFrameDecode_GetResolution(sourceFrame, &result->dpiX, &result->dpiY); + if (FAILED(hr)) + goto end; result->bits = HeapAlloc(GetProcessHeap(), 0, 4 * result->width * result->height); if (result->bits == NULL) {

1 0