October 2010 - Wine-commits

Stefan Oberhumer : ntdll/tests: Add some more tests for qsort().
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 024530133c0c51c269f90a96332b5bba02a9df9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=024530133c0c51c269f90a963… Author: Stefan Oberhumer <stefan(a)obssys.com> Date: Tue Oct 5 12:20:13 2010 +0200 ntdll/tests: Add some more tests for qsort(). --- dlls/ntdll/tests/string.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 3f7236a..03fc436 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1175,6 +1175,27 @@ static void test_qsort(void) "." }; + p_qsort ((void*)arr, 0, sizeof(int), intcomparefunc); + ok(arr[0] == 23, "badly sorted, nmemb=0, arr[0] is %d\n", arr[0]); + ok(arr[1] == 42, "badly sorted, nmemb=0, arr[1] is %d\n", arr[1]); + ok(arr[2] == 8, "badly sorted, nmemb=0, arr[2] is %d\n", arr[2]); + ok(arr[3] == 4, "badly sorted, nmemb=0, arr[3] is %d\n", arr[3]); + ok(arr[4] == 16, "badly sorted, nmemb=0, arr[4] is %d\n", arr[4]); + + p_qsort ((void*)arr, 1, sizeof(int), intcomparefunc); + ok(arr[0] == 23, "badly sorted, nmemb=1, arr[0] is %d\n", arr[0]); + ok(arr[1] == 42, "badly sorted, nmemb=1, arr[1] is %d\n", arr[1]); + ok(arr[2] == 8, "badly sorted, nmemb=1, arr[2] is %d\n", arr[2]); + ok(arr[3] == 4, "badly sorted, nmemb=1, arr[3] is %d\n", arr[3]); + ok(arr[4] == 16, "badly sorted, nmemb=1, arr[4] is %d\n", arr[4]); + + p_qsort ((void*)arr, 5, 0, intcomparefunc); + ok(arr[0] == 23, "badly sorted, size=0, arr[0] is %d\n", arr[0]); + ok(arr[1] == 42, "badly sorted, size=0, arr[1] is %d\n", arr[1]); + ok(arr[2] == 8, "badly sorted, size=0, arr[2] is %d\n", arr[2]); + ok(arr[3] == 4, "badly sorted, size=0, arr[3] is %d\n", arr[3]); + ok(arr[4] == 16, "badly sorted, size=0, arr[4] is %d\n", arr[4]); + p_qsort ((void*)arr, 5, sizeof(int), intcomparefunc); ok(arr[0] == 4, "badly sorted, arr[0] is %d\n", arr[0]); ok(arr[1] == 8, "badly sorted, arr[1] is %d\n", arr[1]);

1 0

Henri Verbeet : ddraw: Remove another hack.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 5fa84c56c344927dcb13b12409fbf64d738438f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa84c56c344927dcb13b1240… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 5 14:32:35 2010 +0200 ddraw: Remove another hack. It breaks actual front buffer / back buffer flips. --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/device.c | 78 ++++++---------------------------------- dlls/wined3d/device.c | 86 -------------------------------------------- include/wine/wined3d.idl | 4 -- 4 files changed, 11 insertions(+), 158 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 9b3f614..f9b9a48 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -359,7 +359,6 @@ struct IDirect3DDeviceImpl IDirectDrawImpl *ddraw; IWineD3DBuffer *indexbuffer; IDirectDrawSurfaceImpl *target; - BOOL OffScreenTarget; /* Viewport management */ IDirect3DViewportImpl *viewport_list; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 30109e9..0056a40 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -311,34 +311,10 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) * IDirect3DVertexBuffer::Release will unset it. */ - /* Restore the render targets */ - if(This->OffScreenTarget) - { - WINED3DVIEWPORT vp; - - vp.X = 0; - vp.Y = 0; - vp.Width = This->ddraw->d3d_target->surface_desc.dwWidth; - vp.Height = This->ddraw->d3d_target->surface_desc.dwHeight; - vp.MinZ = 0.0; - vp.MaxZ = 1.0; - IWineD3DDevice_SetViewport(This->wineD3DDevice, - &vp); - - /* Set the device up to render to the front buffer since the back buffer will - * vanish soon. - */ - IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, 0, - This->ddraw->d3d_target->WineD3DSurface, - FALSE); - /* This->target is the offscreen target. - * This->ddraw->d3d_target is the target used by DDraw - */ - TRACE("(%p) Release: Using %p as front buffer, %p as back buffer\n", This, This->ddraw->d3d_target, NULL); - IWineD3DDevice_SetFrontBackBuffers(This->wineD3DDevice, - This->ddraw->d3d_target->WineD3DSurface, - NULL); - } + /* Set the device up to render to the front buffer since the back + * buffer will vanish soon. */ + IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, 0, + This->ddraw->d3d_target->WineD3DSurface, TRUE); /* Release the WineD3DDevice. This won't destroy it */ if(IWineD3DDevice_Release(This->wineD3DDevice) <= 0) @@ -7024,46 +7000,14 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi device->wineD3DDevice = ddraw->wineD3DDevice; IWineD3DDevice_AddRef(ddraw->wineD3DDevice); - /* This is for apps which create a non-flip, non-d3d primary surface - * and an offscreen D3DDEVICE surface, then render to the offscreen surface - * and do a Blt from the offscreen to the primary surface. - * - * Set the offscreen D3DDDEVICE surface(=target) as the back buffer, - * and the primary surface(=This->d3d_target) as the front buffer. - * - * This way the app will render to the D3DDEVICE surface and WineD3D - * will catch the Blt was Back Buffer -> Front buffer blt and perform - * a flip instead. This way we don't have to deal with a mixed GL / GDI - * environment. - * - * This should be checked against windowed apps. The only app tested with - * this is moto racer 2 during the loading screen. - */ - TRACE("Is rendertarget: %s, d3d_target %p.\n", - target->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE ? "true" : "false", ddraw->d3d_target); - - if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - && ddraw->d3d_target != target) - { - TRACE("Using %p as front buffer, %p as back buffer.\n", ddraw->d3d_target, target); - - hr = IWineD3DDevice_SetFrontBackBuffers(ddraw->wineD3DDevice, - ddraw->d3d_target->WineD3DSurface, target->WineD3DSurface); - if (FAILED(hr)) - { - ERR("Failed to set front and back buffer, hr %#x.\n", hr); - IParent_Release((IParent *)index_buffer_parent); - ddraw_handle_table_destroy(&device->handle_table); - return hr; - } - - /* Render to the back buffer */ - IWineD3DDevice_SetRenderTarget(ddraw->wineD3DDevice, 0, target->WineD3DSurface, TRUE); - device->OffScreenTarget = TRUE; - } - else + /* Render to the back buffer */ + hr = IWineD3DDevice_SetRenderTarget(ddraw->wineD3DDevice, 0, target->WineD3DSurface, TRUE); + if (FAILED(hr)) { - device->OffScreenTarget = FALSE; + ERR("Failed to set render target, hr %#x.\n", hr); + IParent_Release((IParent *)index_buffer_parent); + ddraw_handle_table_destroy(&device->handle_table); + return hr; } /* FIXME: This is broken. The target AddRef() makes some sense, because diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ea4f69e..1e42409 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5636,91 +5636,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderTarget(IWineD3DDevice *iface, return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *iface, - IWineD3DSurface *front, IWineD3DSurface *back) -{ - IWineD3DSurfaceImpl *front_impl = (IWineD3DSurfaceImpl *)front; - IWineD3DSurfaceImpl *back_impl = (IWineD3DSurfaceImpl *)back; - IWineD3DSwapChainImpl *swapchain; - HRESULT hr; - - TRACE("iface %p, front %p, back %p.\n", iface, front, back); - - if (FAILED(hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **)&swapchain))) - { - ERR("Failed to get the swapchain, hr %#x.\n", hr); - return hr; - } - - if (front_impl && !(front_impl->resource.usage & WINED3DUSAGE_RENDERTARGET)) - { - ERR("Trying to set a front buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage.\n"); - IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); - return WINED3DERR_INVALIDCALL; - } - - if (back_impl) - { - if (!(back_impl->resource.usage & WINED3DUSAGE_RENDERTARGET)) - { - ERR("Trying to set a back buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage.\n"); - IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); - return WINED3DERR_INVALIDCALL; - } - - if (!swapchain->back_buffers) - { - swapchain->back_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*swapchain->back_buffers)); - if (!swapchain->back_buffers) - { - ERR("Failed to allocate back buffer array memory.\n"); - IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); - return E_OUTOFMEMORY; - } - } - } - - if (swapchain->front_buffer != front_impl) - { - TRACE("Changing the front buffer from %p to %p.\n", swapchain->front_buffer, front_impl); - - if (swapchain->front_buffer) - surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_NONE, NULL); - swapchain->front_buffer = front_impl; - - if (front_impl) - surface_set_container(front_impl, WINED3D_CONTAINER_SWAPCHAIN, (IWineD3DBase *)swapchain); - } - - if (swapchain->back_buffers[0] != back_impl) - { - TRACE("Changing the back buffer from %p to %p.\n", swapchain->back_buffers[0], back_impl); - - if (swapchain->back_buffers[0]) - surface_set_container(swapchain->back_buffers[0], WINED3D_CONTAINER_NONE, NULL); - swapchain->back_buffers[0] = back_impl; - - if (back_impl) - { - swapchain->presentParms.BackBufferWidth = back_impl->currentDesc.Width; - swapchain->presentParms.BackBufferHeight = back_impl->currentDesc.Height; - swapchain->presentParms.BackBufferFormat = back_impl->resource.format->id; - swapchain->presentParms.BackBufferCount = 1; - - surface_set_container(back_impl, WINED3D_CONTAINER_SWAPCHAIN, (IWineD3DBase *)swapchain); - } - else - { - swapchain->presentParms.BackBufferCount = 0; - HeapFree(GetProcessHeap(), 0, swapchain->back_buffers); - swapchain->back_buffers = NULL; - } - } - - IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); - return WINED3D_OK; -} - static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice *iface, IWineD3DSurface **depth_stencil) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; @@ -6803,7 +6718,6 @@ static const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_GetRenderState, IWineD3DDeviceImpl_SetRenderTarget, IWineD3DDeviceImpl_GetRenderTarget, - IWineD3DDeviceImpl_SetFrontBackBuffers, IWineD3DDeviceImpl_SetSamplerState, IWineD3DDeviceImpl_GetSamplerState, IWineD3DDeviceImpl_SetScissorRect, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 548a08a..d990f70 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3137,10 +3137,6 @@ interface IWineD3DDevice : IUnknown [in] DWORD render_target_idx, [out] IWineD3DSurface **render_target ); - HRESULT SetFrontBackBuffers( - [in] IWineD3DSurface *front, - [in] IWineD3DSurface *back - ); HRESULT SetSamplerState( [in] DWORD sampler_idx, [in] WINED3DSAMPLERSTATETYPE state,

1 0

Henri Verbeet : wined3d: Set the depth/ stencil buffer to NULL before releasing it.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: e1b96eb3475d298fb1e4f7b137a6c73bb6dc16df URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b96eb3475d298fb1e4f7b13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 5 14:32:36 2010 +0200 wined3d: Set the depth/stencil buffer to NULL before releasing it. To prevent device_resource_released() from detecting it as still in use. --- dlls/wined3d/device.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1e42409..7b2b8ce 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2107,13 +2107,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, This->onscreen_depth_stencil = NULL; } - TRACE("Releasing the depth stencil buffer at %p\n", This->depth_stencil); - if (This->depth_stencil && IWineD3DSurface_Release((IWineD3DSurface *)This->depth_stencil)) + if (This->depth_stencil) { - if (This->auto_depth_stencil != This->depth_stencil) - FIXME("(%p) Something is still holding the depth/stencil buffer.\n",This); + IWineD3DSurfaceImpl *ds = This->depth_stencil; + + TRACE("Releasing depth/stencil buffer %p.\n", ds); + + This->depth_stencil = NULL; + if (IWineD3DSurface_Release((IWineD3DSurface *)ds) + && ds != This->auto_depth_stencil) + { + ERR("Something is still holding a reference to depth/stencil buffer %p.\n", ds); + } } - This->depth_stencil = NULL; TRACE("Releasing the render target at %p\n", This->render_targets[0]); IWineD3DSurface_Release((IWineD3DSurface *)This->render_targets[0]);

1 0

Aric Stewart : strmbase: Initial creation of static strmbase library for Quartz and Quartz filters.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 961921060c9b63beaf80043d7ee0f4f3f74df413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961921060c9b63beaf80043d7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 4 09:48:25 2010 -0500 strmbase: Initial creation of static strmbase library for Quartz and Quartz filters. Move the Media Type Functions. --- configure | 1 + configure.ac | 1 + dlls/qcap/Makefile.in | 2 +- dlls/qcap/enummedia.c | 29 +--------------- dlls/qcap/qcap_main.h | 4 +- dlls/quartz/Makefile.in | 2 +- dlls/quartz/enummedia.c | 49 -------------------------- dlls/quartz/quartz_private.h | 4 +-- dlls/strmbase/Makefile.in | 6 +++ dlls/strmbase/mediatype.c | 78 ++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 25 +++++++++++++ 11 files changed, 117 insertions(+), 84 deletions(-) diff --git a/configure b/configure index 025eda3..a735091 100755 --- a/configure +++ b/configure @@ -14884,6 +14884,7 @@ wine_fn_config_dll sti enable_sti sti wine_fn_config_test dlls/sti/tests sti_test wine_fn_config_dll storage.dll16 enable_win16 wine_fn_config_dll stress.dll16 enable_win16 +wine_fn_config_lib strmbase wine_fn_config_lib strmiids wine_fn_config_dll svrapi enable_svrapi wine_fn_config_dll sxs enable_sxs diff --git a/configure.ac b/configure.ac index 52fee51..1a502db 100644 --- a/configure.ac +++ b/configure.ac @@ -2662,6 +2662,7 @@ WINE_CONFIG_DLL(sti,,[sti]) WINE_CONFIG_TEST(dlls/sti/tests) WINE_CONFIG_DLL(storage.dll16,enable_win16) WINE_CONFIG_DLL(stress.dll16,enable_win16) +WINE_CONFIG_LIB(strmbase) WINE_CONFIG_LIB(strmiids) WINE_CONFIG_DLL(svrapi) WINE_CONFIG_DLL(sxs) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index f3b61ab..a8675e2 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,5 +1,5 @@ MODULE = qcap.dll -IMPORTS = strmiids uuid ole32 gdi32 advapi32 +IMPORTS = strmiids strmbase uuid ole32 gdi32 advapi32 C_SRCS = \ capturegraph.c \ diff --git a/dlls/qcap/enummedia.c b/dlls/qcap/enummedia.c index a4d84b0..94b2907 100644 --- a/dlls/qcap/enummedia.c +++ b/dlls/qcap/enummedia.c @@ -32,37 +32,10 @@ #include "qcap_main.h" #include "wine/debug.h" +#include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); -HRESULT CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc) -{ - *pDest = *pSrc; - if (!pSrc->pbFormat) return S_OK; - if (!(pDest->pbFormat = CoTaskMemAlloc(pSrc->cbFormat))) - return E_OUTOFMEMORY; - memcpy(pDest->pbFormat, pSrc->pbFormat, pSrc->cbFormat); - return S_OK; -} - -static void FreeMediaType(AM_MEDIA_TYPE * pMediaType) -{ - CoTaskMemFree(pMediaType->pbFormat); - pMediaType->pbFormat = NULL; - - if (pMediaType->pUnk) - { - IUnknown_Release(pMediaType->pUnk); - pMediaType->pUnk = NULL; - } -} - -void DeleteMediaType(AM_MEDIA_TYPE * pMediaType) -{ - FreeMediaType(pMediaType); - CoTaskMemFree(pMediaType); -} - BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards) { diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h index 2b75830..59a172f 100644 --- a/dlls/qcap/qcap_main.h +++ b/dlls/qcap/qcap_main.h @@ -20,6 +20,8 @@ #ifndef _QCAP_MAIN_H_DEFINED #define _QCAP_MAIN_H_DEFINED +#include "wine/strmbase.h" + extern DWORD ObjectRefCount(BOOL increment); extern IUnknown * WINAPI QCAP_createAudioCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr); @@ -50,8 +52,6 @@ typedef struct tagENUMEDIADETAILS HRESULT IEnumPinsImpl_Construct(const ENUMPINDETAILS * pDetails, IEnumPins ** ppEnum); HRESULT IEnumMediaTypesImpl_Construct(const ENUMMEDIADETAILS * pDetails, IEnumMediaTypes ** ppEnum); -HRESULT CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); -void DeleteMediaType(AM_MEDIA_TYPE * pmt); BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards); void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 4ccc08c..fe61eae 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,6 +1,6 @@ MODULE = quartz.dll IMPORTLIB = quartz -IMPORTS = strmiids uuid dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 +IMPORTS = strmiids strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 EXTRADEFS = -DENTRY_PREFIX=QUARTZ_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL C_SRCS = \ diff --git a/dlls/quartz/enummedia.c b/dlls/quartz/enummedia.c index 60ff13a..db78965 100644 --- a/dlls/quartz/enummedia.c +++ b/dlls/quartz/enummedia.c @@ -24,55 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -HRESULT CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc) -{ - *pDest = *pSrc; - if (!pSrc->pbFormat) return S_OK; - if (!(pDest->pbFormat = CoTaskMemAlloc(pSrc->cbFormat))) - return E_OUTOFMEMORY; - memcpy(pDest->pbFormat, pSrc->pbFormat, pSrc->cbFormat); - if (pDest->pUnk) - IUnknown_AddRef(pDest->pUnk); - return S_OK; -} - -void FreeMediaType(AM_MEDIA_TYPE * pMediaType) -{ - if (pMediaType->pbFormat) - { - CoTaskMemFree(pMediaType->pbFormat); - pMediaType->pbFormat = NULL; - } - if (pMediaType->pUnk) - { - IUnknown_Release(pMediaType->pUnk); - pMediaType->pUnk = NULL; - } -} - -static AM_MEDIA_TYPE * CreateMediaType(AM_MEDIA_TYPE const * pSrc) -{ - AM_MEDIA_TYPE * pDest; - - pDest = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - if (!pDest) - return NULL; - - if (FAILED(CopyMediaType(pDest, pSrc))) - { - CoTaskMemFree(pDest); - return NULL; - } - - return pDest; -} - -void DeleteMediaType(AM_MEDIA_TYPE * pMediaType) -{ - FreeMediaType(pMediaType); - CoTaskMemFree(pMediaType); -} - BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards) { TRACE("pmt1: "); diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 3e0dfe1..b6dfcfa 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -33,6 +33,7 @@ #include "wingdi.h" #include "winuser.h" #include "dshow.h" +#include "wine/strmbase.h" #include "wine/list.h" #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) @@ -77,9 +78,6 @@ HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEn extern const char * qzdebugstr_guid(const GUID * id); -HRESULT CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); -void FreeMediaType(AM_MEDIA_TYPE * pmt); -void DeleteMediaType(AM_MEDIA_TYPE * pmt); BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards); void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); HRESULT updatehres( HRESULT original, HRESULT new ); diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in new file mode 100644 index 0000000..105b5b6 --- /dev/null +++ b/dlls/strmbase/Makefile.in @@ -0,0 +1,6 @@ +MODULE = strmbase + +C_SRCS = \ + mediatype.c + +(a)MAKE_IMPLIB_RULES@ diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c new file mode 100644 index 0000000..6de3e7a --- /dev/null +++ b/dlls/strmbase/mediatype.c @@ -0,0 +1,78 @@ +/* + * Implementation of MedaType utility functions + * + * Copyright 2003 Robert Shearman + * Copyright 2010 Aric Stewart, 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 + */ +#include <stdarg.h> + +#define COBJMACROS +#include "dshow.h" + +#include "wine/strmbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc) +{ + *pDest = *pSrc; + if (!pSrc->pbFormat) return S_OK; + if (!(pDest->pbFormat = CoTaskMemAlloc(pSrc->cbFormat))) + return E_OUTOFMEMORY; + memcpy(pDest->pbFormat, pSrc->pbFormat, pSrc->cbFormat); + if (pDest->pUnk) + IUnknown_AddRef(pDest->pUnk); + return S_OK; +} + +void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType) +{ + if (pMediaType->pbFormat) + { + CoTaskMemFree(pMediaType->pbFormat); + pMediaType->pbFormat = NULL; + } + if (pMediaType->pUnk) + { + IUnknown_Release(pMediaType->pUnk); + pMediaType->pUnk = NULL; + } +} + +AM_MEDIA_TYPE * WINAPI CreateMediaType(AM_MEDIA_TYPE const * pSrc) +{ + AM_MEDIA_TYPE * pDest; + + pDest = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + if (!pDest) + return NULL; + + if (FAILED(CopyMediaType(pDest, pSrc))) + { + CoTaskMemFree(pDest); + return NULL; + } + + return pDest; +} + +void WINAPI DeleteMediaType(AM_MEDIA_TYPE * pMediaType) +{ + FreeMediaType(pMediaType); + CoTaskMemFree(pMediaType); +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h new file mode 100644 index 0000000..885a976 --- /dev/null +++ b/include/wine/strmbase.h @@ -0,0 +1,25 @@ +/* + * Header file for Wine's strmbase implementation + * + * Copyright 2003 Robert Shearman + * Copyright 2010 Aric Stewart, 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 + */ + +HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); +void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType); +AM_MEDIA_TYPE * WINAPI CreateMediaType(AM_MEDIA_TYPE const * pSrc); +void WINAPI DeleteMediaType(AM_MEDIA_TYPE * pMediaType);

1 0

Alexandre Julliard : winefile: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: d1f8eb49fef515a1a532b1e98a0200121c3b3758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f8eb49fef515a1a532b1e98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:02:41 2010 +0200 winefile: Fix incorrect use of the ScreenToClient function. --- programs/winefile/winefile.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index c150c9a..aed4d14 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2019,8 +2019,7 @@ static BOOL toggle_fullscreen(HWND hwnd) g_fullscreen.wasZoomed = IsZoomed(hwnd); Frame_CalcFrameClient(hwnd, &rt); - ClientToScreen(hwnd, (LPPOINT)&rt.left); - ClientToScreen(hwnd, (LPPOINT)&rt.right); + MapWindowPoints( hwnd, 0, (POINT *)&rt, 2 ); rt.left = g_fullscreen.orgPos.left-rt.left; rt.top = g_fullscreen.orgPos.top-rt.top; @@ -2046,8 +2045,7 @@ static void fullscreen_move(HWND hwnd) GetWindowRect(hwnd, &pos); Frame_CalcFrameClient(hwnd, &rt); - ClientToScreen(hwnd, (LPPOINT)&rt.left); - ClientToScreen(hwnd, (LPPOINT)&rt.right); + MapWindowPoints( hwnd, 0, (POINT *)&rt, 2 ); rt.left = pos.left-rt.left; rt.top = pos.top-rt.top;

1 0

Alexandre Julliard : comctl32/comboex: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 4b4c1a0060dcfa17d1a8876dd8cf8cd49cfef53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4c1a0060dcfa17d1a8876dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:03:25 2010 +0200 comctl32/comboex: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/comboex.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 6e90751..e516ea8 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -431,18 +431,13 @@ static void COMBOEX_ReSize (const COMBOEX_INFO *infoPtr) if (infoPtr->hwndCombo) { SendMessageW (infoPtr->hwndCombo, CB_SETITEMHEIGHT, 0, cy); if ( !(infoPtr->flags & CBES_EX_NOSIZELIMIT)) { - RECT comboRect; - if (GetWindowRect(infoPtr->hwndCombo, &comboRect)) { - RECT ourRect; - if (GetWindowRect(infoPtr->hwndSelf, &ourRect)) { - if (comboRect.bottom > ourRect.bottom) { - POINT pt = { ourRect.left, ourRect.top }; - if (ScreenToClient(infoPtr->hwndSelf, &pt)) - MoveWindow( infoPtr->hwndSelf, pt.x, pt.y, ourRect.right - ourRect.left, - comboRect.bottom - comboRect.top, FALSE); - } - } - } + RECT comboRect, ourRect; + GetWindowRect(infoPtr->hwndCombo, &comboRect); + GetWindowRect(infoPtr->hwndSelf, &ourRect); + if (comboRect.bottom > ourRect.bottom) + SetWindowPos( infoPtr->hwndSelf, 0, 0, 0, ourRect.right - ourRect.left, + comboRect.bottom - comboRect.top, + SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW ); } } }

1 0

Alexandre Julliard : comctl32/datetime: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 96ed854d3553ef3917e2521fa68d5059dc54973e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ed854d3553ef3917e2521fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:03:33 2010 +0200 comctl32/datetime: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/datetime.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 6204cd1..1ac6ba7 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -787,6 +787,7 @@ DATETIME_LButtonDown (DATETIME_INFO *infoPtr, INT x, INT y) if (infoPtr->select == DTHT_MCPOPUP) { RECT rcMonthCal; + POINT pos; SendMessageW(infoPtr->hMonthCal, MCM_GETMINREQRECT, 0, (LPARAM)&rcMonthCal); /* FIXME: button actually is only depressed during dropdown of the */ @@ -795,17 +796,16 @@ DATETIME_LButtonDown (DATETIME_INFO *infoPtr, INT x, INT y) /* recalculate the position of the monthcal popup */ if(infoPtr->dwStyle & DTS_RIGHTALIGN) - infoPtr->monthcal_pos.x = infoPtr->calbutton.left - - (rcMonthCal.right - rcMonthCal.left); + pos.x = infoPtr->calbutton.left - (rcMonthCal.right - rcMonthCal.left); else /* FIXME: this should be after the area reserved for the checkbox */ - infoPtr->monthcal_pos.x = infoPtr->rcDraw.left; + pos.x = infoPtr->rcDraw.left; - infoPtr->monthcal_pos.y = infoPtr->rcClient.bottom; - ClientToScreen (infoPtr->hwndSelf, &(infoPtr->monthcal_pos)); - SetWindowPos(infoPtr->hMonthCal, 0, infoPtr->monthcal_pos.x, - infoPtr->monthcal_pos.y, rcMonthCal.right - rcMonthCal.left, - rcMonthCal.bottom - rcMonthCal.top, 0); + pos.y = infoPtr->rcClient.bottom; + OffsetRect( &rcMonthCal, pos.x, pos.y ); + MapWindowPoints( infoPtr->hwndSelf, 0, (POINT *)&rcMonthCal, 2 ); + SetWindowPos(infoPtr->hMonthCal, 0, rcMonthCal.left, rcMonthCal.top, + rcMonthCal.right - rcMonthCal.left, rcMonthCal.bottom - rcMonthCal.top, 0); if(IsWindowVisible(infoPtr->hMonthCal)) { ShowWindow(infoPtr->hMonthCal, SW_HIDE);

1 0

Alexandre Julliard : comctl32/ipaddress: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: a10441d67aa45943f24cee035570cbdccd593890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a10441d67aa45943f24cee035… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:03:41 2010 +0200 comctl32/ipaddress: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/ipaddress.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 03b8d1c..1f41f91 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -149,7 +149,6 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) { static const WCHAR dotW[] = { '.', 0 }; RECT rect, rcPart; - POINT pt; COLORREF bgCol, fgCol; int i; @@ -173,13 +172,11 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) for (i = 0; i < 3; i++) { GetWindowRect (infoPtr->Part[i].EditHwnd, &rcPart); - pt.x = rcPart.right; - ScreenToClient(infoPtr->Self, &pt); - rect.left = pt.x; + MapWindowPoints( 0, infoPtr->Self, (POINT *)&rcPart, 2 ); + rect.left = rcPart.right; GetWindowRect (infoPtr->Part[i+1].EditHwnd, &rcPart); - pt.x = rcPart.left; - ScreenToClient(infoPtr->Self, &pt); - rect.right = pt.x; + MapWindowPoints( 0, infoPtr->Self, (POINT *)&rcPart, 2 ); + rect.right = rcPart.left; DrawTextW(hdc, dotW, 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); }

1 0

Alexandre Julliard : comctl32/pager: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 5434d069ea7d12c9cdc317e81c9f32a205b3e981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5434d069ea7d12c9cdc317e81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:03:48 2010 +0200 comctl32/pager: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/pager.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index f3461fd..e1420e0 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -99,11 +99,7 @@ PAGER_GetButtonRects(const PAGER_INFO* infoPtr, RECT* prcTopLeft, RECT* prcBotto GetWindowRect (infoPtr->hwndSelf, &rcWindow); if (bClientCoords) - { - POINT pt = {rcWindow.left, rcWindow.top}; - ScreenToClient(infoPtr->hwndSelf, &pt); - OffsetRect(&rcWindow, -(rcWindow.left-pt.x), -(rcWindow.top-pt.y)); - } + MapWindowPoints( 0, infoPtr->hwndSelf, (POINT *)&rcWindow, 2 ); else OffsetRect(&rcWindow, -rcWindow.left, -rcWindow.top);

1 0

Alexandre Julliard : comctl32/progress: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 87b359c48a9966f4125bba9dbb7124e6c969f962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b359c48a9966f4125bba9db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:03:54 2010 +0200 comctl32/progress: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/progress.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index c44b816..5f2f166 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -380,8 +380,7 @@ static LRESULT PROGRESS_Draw (PROGRESS_INFO *infoPtr, HDC hdc) if (pdi.theme) { GetWindowRect( infoPtr->Self, &pdi.bgRect ); - ScreenToClient( infoPtr->Self, (POINT*)&pdi.bgRect ); - ScreenToClient( infoPtr->Self, (POINT*)&pdi.bgRect.right ); + MapWindowPoints( infoPtr->Self, 0, (POINT*)&pdi.bgRect, 2 ); } if (!barSmooth)

1 0