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

Michael Stefaniuc : winefile: Avoid a TRUE:FALSE conditional expression.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: f6cd3e874b6d975cf2fdc93edc90bc4ed9f48ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6cd3e874b6d975cf2fdc93ed… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 14 23:43:24 2012 +0200 winefile: Avoid a TRUE:FALSE conditional expression. --- programs/winefile/winefile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 2537f62..366aa9c 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -3675,7 +3675,7 @@ static BOOL is_directory(LPCWSTR target) if (target_attr == INVALID_FILE_ATTRIBUTES) return FALSE; - return target_attr&FILE_ATTRIBUTE_DIRECTORY? TRUE: FALSE; + return (target_attr & FILE_ATTRIBUTE_DIRECTORY) != 0; } static BOOL prompt_target(Pane* pane, LPWSTR source, LPWSTR target)

1 0

Matteo Bruni : wined3d: Use GL_FRAMEBUFFER_SRGB when possible.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 152a09ce75b97b1139e358428cea2c371a8b6804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152a09ce75b97b1139e358428… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 15 00:38:23 2012 +0200 wined3d: Use GL_FRAMEBUFFER_SRGB when possible. --- dlls/wined3d/arb_program_shader.c | 15 +++++++++++++++ dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/shader.c | 13 +++++++++++-- dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d_gl.h | 7 +++++++ include/wine/wined3d.h | 1 + 6 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 744b6af..c8799df 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6495,6 +6495,20 @@ static void textransform(struct wined3d_context *context, const struct wined3d_s fragment_prog_arbfp(context, state, state_id); } +static void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_surface *rt = state->fb->render_targets[0]; + + TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + + if (state->render_states[WINED3D_RS_SRGBWRITEENABLE] + && rt->resource.format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); + else + gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); +} + static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), { STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), state_texfactor_arbfp }, WINED3D_GL_EXT_NONE }, @@ -6624,6 +6638,7 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), { STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGSTART), { STATE_RENDER(WINED3D_RS_FOGSTART), state_fogstartend }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGEND), { STATE_RENDER(WINED3D_RS_FOGSTART), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), state_srgbwrite }, ARB_FRAMEBUFFER_SRGB }, {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGCOLOR), { STATE_RENDER(WINED3D_RS_FOGCOLOR), state_fogcolor }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGDENSITY), { STATE_RENDER(WINED3D_RS_FOGDENSITY), state_fogdensity }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e47b4e1..58397e9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -100,6 +100,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER }, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, + {"GL_ARB_framebuffer_sRGB", ARB_FRAMEBUFFER_SRGB }, {"GL_ARB_geometry_shader4", ARB_GEOMETRY_SHADER4 }, {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL }, {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX }, @@ -2731,6 +2732,13 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) /* GL_ARB_half_float_vertex is a subset of GL_NV_half_float. */ gl_info->supported[ARB_HALF_FLOAT_VERTEX] = TRUE; } + if (gl_info->supported[ARB_FRAMEBUFFER_SRGB] && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + { + /* Current wined3d sRGB infrastructure requires EXT_texture_sRGB_decode + * for GL_ARB_framebuffer_sRGB support (without EXT_texture_sRGB_decode + * we never render to sRGB surfaces). */ + gl_info->supported[ARB_FRAMEBUFFER_SRGB] = FALSE; + } ENTER_GL(); @@ -4608,6 +4616,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_SEPARATEALPHABLEND; if (gl_info->supported[EXT_DRAW_BUFFERS2]) caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS; + if (gl_info->supported[ARB_FRAMEBUFFER_SRGB]) + caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_POSTBLENDSRGBCONVERT; caps->RasterCaps = WINED3DPRASTERCAPS_DITHER | WINED3DPRASTERCAPS_PAT | diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1abafbb..2244ccd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1901,14 +1901,23 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct ps_compile_args *args) { struct wined3d_device *device = shader->device; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_texture *texture; UINT i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ - if (state->render_states[WINED3D_RS_SRGBWRITEENABLE]) + if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE]) { const struct wined3d_surface *rt = state->fb->render_targets[0]; - if (rt->resource.format->flags & WINED3DFMT_FLAG_SRGB_WRITE) args->srgb_correction = 1; + if (rt->resource.format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + { + static unsigned int warned = 0; + + args->srgb_correction = 1; + if (state->render_states[WINED3D_RS_ALPHABLENDENABLE] && !warned++) + WARN("Blending into a sRGB render target with no GL_ARB_framebuffer_sRGB " + "support, expect rendering artifacts.\n"); + } } if (shader->reg_maps.shader_version.major == 1 diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0be3972..0dcb431 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3138,7 +3138,8 @@ void gen_ffp_frag_op(const struct wined3d_device *device, const struct wined3d_s break; } } - if (state->render_states[WINED3D_RS_SRGBWRITEENABLE] + if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] + && state->render_states[WINED3D_RS_SRGBWRITEENABLE] && rt->resource.format->flags & WINED3DFMT_FLAG_SRGB_WRITE) { settings->sRGB_write = 1; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b87bc63..128937a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -933,6 +933,7 @@ enum wined3d_gl_extension ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_FRAMEBUFFER_OBJECT, + ARB_FRAMEBUFFER_SRGB, ARB_GEOMETRY_SHADER4, ARB_HALF_FLOAT_PIXEL, ARB_HALF_FLOAT_VERTEX, @@ -1255,6 +1256,12 @@ enum wined3d_gl_extension #define GL_TEXTURE_STENCIL_SIZE 0x88f1 #endif +/* GL_ARB_framebuffer_sRGB */ +#ifndef GL_ARB_framebuffer_sRGB +#define GL_ARB_framebuffer_sRGB 1 +#define GL_FRAMEBUFFER_SRGB 0x8db9 +#endif + /* GL_ARB_geometry_shader4 */ #ifndef GL_ARB_geometry_shader4 #define GL_ARB_geometry_shader4 1 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5208a79..4a11ff2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1015,6 +1015,7 @@ enum wined3d_display_rotation #define WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS 0x00040000 #define WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING 0x00080000 #define WINED3DPMISCCAPS_FOGVERTEXCLAMPED 0x00100000 +#define WINED3DPMISCCAPS_POSTBLENDSRGBCONVERT 0x00200000 #define WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH 24 #define WINED3DPS20_MIN_DYNAMICFLOWCONTROLDEPTH 0

1 0

Nikolay Sivov : quartz: Use proper method macros.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 17450f0be05fc331ed026d61f7ea9678a1e356c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17450f0be05fc331ed026d61f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 15 08:24:18 2012 +0400 quartz: Use proper method macros. --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/filtergraph.c | 14 +++++++------- dlls/quartz/vmr9.c | 30 +++++++++++++++--------------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 0b5463e..0a498b0 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -656,7 +656,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) hr = IDirectSound_CreateSoundBuffer(pDSoundRender->dsound, &buf_desc, &buf, NULL); if (SUCCEEDED(hr)) { IDirectSoundBuffer_Play(buf, 0, 0, DSBPLAY_LOOPING); - IUnknown_Release(buf); + IDirectSoundBuffer_Release(buf); } hr = S_OK; } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 375ce04..e5a5d3c 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -517,7 +517,7 @@ static HRESULT WINAPI AsyncReader_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin } *ppPin = This->pOutputPin; - IUnknown_AddRef(*ppPin); + IPin_AddRef(*ppPin); return S_OK; } diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6b0085d..1cc1df9 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -772,13 +772,13 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) { DWORD miscflags; IAMFilterMiscFlags *flags = NULL; - IUnknown_QueryInterface(This->ppFiltersInGraph[i], &IID_IAMFilterMiscFlags, (void**)&flags); + IBaseFilter_QueryInterface(This->ppFiltersInGraph[i], &IID_IAMFilterMiscFlags, (void**)&flags); if (!flags) continue; miscflags = IAMFilterMiscFlags_GetMiscFlags(flags); - IUnknown_Release(flags); + IAMFilterMiscFlags_Release(flags); if (miscflags == AM_FILTER_MISC_FLAGS_IS_RENDERER) - IUnknown_QueryInterface(This->ppFiltersInGraph[i], &IID_IReferenceClock, (void**)&pClock); + IBaseFilter_QueryInterface(This->ppFiltersInGraph[i], &IID_IReferenceClock, (void**)&pClock); if (pClock) break; } @@ -1039,7 +1039,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, if (FAILED(rc)) { TRACE("Filter rejected by IAMGraphBuilderCallback_SelectedFilter\n"); - IUnknown_Release(callback); + IAMGraphBuilderCallback_Release(callback); goto error; } } @@ -1055,7 +1055,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, { HRESULT rc; rc = IAMGraphBuilderCallback_CreatedFilter(callback, pfilter); - IUnknown_Release(callback); + IAMGraphBuilderCallback_Release(callback); if (FAILED(rc)) { IBaseFilter_Release(pfilter); @@ -2200,11 +2200,11 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, IBaseFilter* pfilter = This->ppFiltersInGraph[i]; IAMFilterMiscFlags *flags = NULL; ULONG filterflags; - IUnknown_QueryInterface(pfilter, &IID_IAMFilterMiscFlags, (void**)&flags); + IBaseFilter_QueryInterface(pfilter, &IID_IAMFilterMiscFlags, (void**)&flags); if (!flags) continue; filterflags = IAMFilterMiscFlags_GetMiscFlags(flags); - IUnknown_Release(flags); + IAMFilterMiscFlags_Release(flags); if (filterflags != AM_FILTER_MISC_FLAGS_IS_RENDERER) continue; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index f197878..847b460 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -293,7 +293,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pS info.szAspectRatio.cx = This->bmiheader.biWidth; info.szAspectRatio.cy = This->bmiheader.biHeight; - hr = IVMRSurfaceAllocator9_GetSurface(This->allocator, This->cookie, (++This->cur_surface)%This->num_surfaces, 0, &info.lpSurf); + hr = IVMRSurfaceAllocatorEx9_GetSurface(This->allocator, This->cookie, (++This->cur_surface)%This->num_surfaces, 0, &info.lpSurf); if (FAILED(hr)) return hr; @@ -794,14 +794,14 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) CloseHandle(This->hD3d9); if (This->allocator) - IVMRSurfaceAllocator9_Release(This->allocator); + IVMRSurfaceAllocatorEx9_Release(This->allocator); if (This->presenter) IVMRImagePresenter9_Release(This->presenter); This->num_surfaces = 0; if (This->allocator_d3d9_dev) { - IUnknown_Release(This->allocator_d3d9_dev); + IDirect3DDevice9_Release(This->allocator_d3d9_dev); This->allocator_d3d9_dev = NULL; } @@ -1146,7 +1146,7 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface } if (This->allocator) - IVMRSurfaceAllocator9_Release(This->allocator); + IVMRSurfaceAllocatorEx9_Release(This->allocator); if (This->presenter) IVMRImagePresenter9_Release(This->presenter); @@ -1166,12 +1166,12 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface if (FAILED(hr)) { ERR("Unable to find Presenter interface\n"); - IVMRSurfaceAllocatorEx9_Release(This->presenter); + IVMRImagePresenter9_Release(This->presenter); This->allocator = NULL; This->presenter = NULL; } else - hr = IVMRSurfaceAllocator9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); + hr = IVMRSurfaceAllocatorEx9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); break; case VMR9Mode_Renderless: break; @@ -1449,15 +1449,15 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator(IVMRSurf if (This->presenter) return VFW_E_WRONG_STATE; - if (FAILED(IUnknown_QueryInterface(alloc, &IID_IVMRImagePresenter9, (void **)&This->presenter))) + if (FAILED(IVMRSurfaceAllocator9_QueryInterface(alloc, &IID_IVMRImagePresenter9, (void **)&This->presenter))) return E_NOINTERFACE; - if (SUCCEEDED(IUnknown_QueryInterface(alloc, &IID_IVMRSurfaceAllocatorEx9, (void **)&This->allocator))) + if (SUCCEEDED(IVMRSurfaceAllocator9_QueryInterface(alloc, &IID_IVMRSurfaceAllocatorEx9, (void **)&This->allocator))) This->allocator_is_ex = 1; else { This->allocator = (IVMRSurfaceAllocatorEx9 *)alloc; - IUnknown_AddRef(alloc); + IVMRSurfaceAllocator9_AddRef(alloc); This->allocator_is_ex = 0; } @@ -1694,7 +1694,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) int i; TRACE("Destroying\n"); CloseHandle(This->ack); - IUnknown_Release(This->d3d9_ptr); + IDirect3D9_Release(This->d3d9_ptr); TRACE("Number of surfaces: %u\n", This->num_surfaces); for (i = 0; i < This->num_surfaces; ++i) @@ -1702,7 +1702,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) IDirect3DSurface9 *surface = This->d3d9_surfaces[i]; TRACE("Releasing surface %p\n", surface); if (surface) - IUnknown_Release(surface); + IDirect3DSurface9_Release(surface); } CoTaskMemFree(This->d3d9_surfaces); @@ -1710,7 +1710,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) This->num_surfaces = 0; if (This->d3d9_vertex) { - IUnknown_Release(This->d3d9_vertex); + IDirect3DVertexBuffer9_Release(This->d3d9_vertex); This->d3d9_vertex = NULL; } CoTaskMemFree(This); @@ -2118,7 +2118,7 @@ static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(VMR9DefaultAllocatorPrese IDirect3DSurface9 *surface = This->d3d9_surfaces[i]; TRACE("Releasing surface %p\n", surface); if (surface) - IUnknown_Release(surface); + IDirect3DSurface9_Release(surface); } ZeroMemory(This->d3d9_surfaces, sizeof(IDirect3DSurface9 *) * This->num_surfaces); @@ -2215,7 +2215,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 * return E_FAIL; } *surface = This->d3d9_surfaces[surfaceindex]; - IUnknown_AddRef(*surface); + IDirect3DSurface9_AddRef(*surface); return S_OK; } @@ -2283,7 +2283,7 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(VMR9Impl *parent, LPVOID if (hr == D3DERR_NOTAVAILABLE) { ERR("Format not supported\n"); - IUnknown_Release(This->d3d9_ptr); + IDirect3D9_Release(This->d3d9_ptr); CoTaskMemFree(This); return VFW_E_DDRAW_CAPS_NOT_SUITABLE; }

1 0

Jacek Caban : rpcrt4: Added cancelling support for all HTTP requests.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

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

Matteo Bruni : wined3d: Dump postblend color.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 0a37a86f356e84b14187165a5cf67042ae8a7d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a37a86f356e84b14187165a5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 15 00:38:24 2012 +0200 wined3d: Dump postblend color. --- dlls/wined3d/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0dcb431..92a8b48 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1158,6 +1158,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined else { TRACE("Format supports post-pixelshader blending.\n"); + TRACE("Color output: %#x\n", color); format->flags |= WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; }

1 0

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

Aug. 15, 2012

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

Matteo Bruni : wined3d: Improve post-pixelshader blending test.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: a488e574497d674631b4036d4b179ce349ddb764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a488e574497d674631b4036d4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 15 00:38:26 2012 +0200 wined3d: Improve post-pixelshader blending test. --- dlls/wined3d/utils.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 03c5b59..4f8108f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1067,10 +1067,11 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined if (status == GL_FRAMEBUFFER_COMPLETE && ((format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) || !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) && format->id != WINED3DFMT_NULL && format->id != WINED3DFMT_P8_UINT - && format->glFormat != GL_LUMINANCE && format->glFormat != GL_LUMINANCE_ALPHA) + && format->glFormat != GL_LUMINANCE && format->glFormat != GL_LUMINANCE_ALPHA + && (format->red_size || format->alpha_size)) { GLuint rb, tex2; - DWORD readback[16 * 16], color; + DWORD readback[16 * 16], color, r_range, a_range; BYTE r, a; BOOL match = TRUE; @@ -1096,6 +1097,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined } else { + gl_info->gl_ops.gl.p_glDisable(GL_BLEND); gl_info->gl_ops.gl.p_glViewport(0, 0, 16, 16); gl_info->gl_ops.gl.p_glDisable(GL_LIGHTING); gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); @@ -1107,28 +1109,24 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined /* Draw a full-black quad */ gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - gl_info->gl_ops.gl.p_glColor4ub(0x00, 0x00, 0x00, 0xff); + gl_info->gl_ops.gl.p_glColor4f(0.0f, 0.0f, 0.0f, 1.0f); gl_info->gl_ops.gl.p_glVertex3f(-1.0f, -1.0f, 0.0f); - gl_info->gl_ops.gl.p_glColor4ub(0x00, 0x00, 0x00, 0xff); gl_info->gl_ops.gl.p_glVertex3f(1.0f, -1.0f, 0.0f); - gl_info->gl_ops.gl.p_glColor4ub(0x00, 0x00, 0x00, 0xff); gl_info->gl_ops.gl.p_glVertex3f(-1.0f, 1.0f, 0.0f); - gl_info->gl_ops.gl.p_glColor4ub(0x00, 0x00, 0x00, 0xff); gl_info->gl_ops.gl.p_glVertex3f(1.0f, 1.0f, 0.0f); gl_info->gl_ops.gl.p_glEnd(); + gl_info->gl_ops.gl.p_glEnable(GL_BLEND); /* Draw a half-transparent red quad */ gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - gl_info->gl_ops.gl.p_glColor4ub(0xff, 0x00, 0x00, 0x80); + gl_info->gl_ops.gl.p_glColor4f(1.0f, 0.0f, 0.0f, 0.5f); gl_info->gl_ops.gl.p_glVertex3f(-1.0f, -1.0f, 0.0f); - gl_info->gl_ops.gl.p_glColor4ub(0xff, 0x00, 0x00, 0x80); gl_info->gl_ops.gl.p_glVertex3f(1.0f, -1.0f, 0.0f); - gl_info->gl_ops.gl.p_glColor4ub(0xff, 0x00, 0x00, 0x80); gl_info->gl_ops.gl.p_glVertex3f(-1.0f, 1.0f, 0.0f); - gl_info->gl_ops.gl.p_glColor4ub(0xff, 0x00, 0x00, 0x80); gl_info->gl_ops.gl.p_glVertex3f(1.0f, 1.0f, 0.0f); gl_info->gl_ops.gl.p_glEnd(); + gl_info->gl_ops.gl.p_glDisable(GL_BLEND); gl_info->gl_ops.gl.p_glGenTextures(1, &tex2); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex2); @@ -1140,9 +1138,11 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined a = color >> 24; r = (color & 0x00ff0000) >> 16; - if (format->red_size && (r < 0x7b || r > 0x84)) + r_range = format->red_size < 8 ? 1 << (8 - format->red_size - 1) : 1; + a_range = format->alpha_size < 8 ? 1 << (8 - format->alpha_size - 1) : 1; + if (format->red_size && (r < 0x80 - r_range || r > 0x80 + r_range)) match = FALSE; - else if (format->alpha_size > 1 && (a < 0x9f || a > 0xdf)) + else if (format->alpha_size > 1 && (a < 0xbf - a_range || a > 0xbf + a_range)) match = FALSE; if (!match) {

1 0

Michael Stefaniuc : dbghelp: Remove a superfluous TRUE: FALSE conditional expression.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 31fdb976328d5740d6bfd9b836f87d925350e4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fdb976328d5740d6bfd9b83… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 14 23:08:03 2012 +0200 dbghelp: Remove a superfluous TRUE:FALSE conditional expression. --- dlls/dbghelp/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 136ec4e..6bea436 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -206,7 +206,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->reloc_delta = 0; module->type = type; - module->is_virtual = virtual ? TRUE : FALSE; + module->is_virtual = virtual; for (i = 0; i < DFI_LAST; i++) module->format_info[i] = NULL; module->sortlist_valid = FALSE; module->sorttab_size = 0;

1 0

Michael Stefaniuc : winspool.drv: Drop a superfluous TRUE: FALSE conditional expression.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: aae2602eba401fc98d1082daaa18f99d6f03bfec URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae2602eba401fc98d1082daa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 14 23:28:13 2012 +0200 winspool.drv: Drop a superfluous TRUE:FALSE conditional expression. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8027a1a..38266c9 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5258,7 +5258,7 @@ BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment, (LPSTR)pDriverDirectory, cbBuf, NULL, NULL); if(pcbNeeded) *pcbNeeded = needed; - ret = (needed <= cbBuf) ? TRUE : FALSE; + ret = needed <= cbBuf; } else if(pcbNeeded) *pcbNeeded = pcbNeededW * sizeof(CHAR)/sizeof(WCHAR);

1 0

Michael Stefaniuc : setupx.dll16: Avoid a FALSE:TRUE conditional expression .
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: b37902765cc04e079976c7aa36eed91f8e9e663e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37902765cc04e079976c7aa3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 14 23:09:19 2012 +0200 setupx.dll16: Avoid a FALSE:TRUE conditional expression. --- dlls/setupx.dll16/virtcopy.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index 141fbd2..d6bcab6 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -454,8 +454,7 @@ static RETERR16 VCP_CopyFiles(void) /* FIXME: need to do the file copy in small chunks for notifications */ TRACE("copying '%s' to '%s'\n", fn_src, fn_dst); /* perform the file copy */ - if (!(CopyFileA(fn_src, fn_dst, - (lpvn->fl & VNLP_COPYIFEXISTS) ? FALSE : TRUE ))) + if (!CopyFileA(fn_src, fn_dst, !(lpvn->fl & VNLP_COPYIFEXISTS))) { ERR("error copying, src: %s -> dst: %s\n", fn_src, fn_dst); res = ERR_VCP_IOFAIL;

1 0