wine-commits September 2014

wine-commits@winehq.org

2 participants
301 discussions

Henri Verbeet : d2d1: Get rid of a FIXME in d2d_d3d_render_target_BeginDraw().
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 5981ddab4da893e1bac49017ff357a3c9a5360fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5981ddab4da893e1bac49017f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 07:48:21 2014 +0200 d2d1: Get rid of a FIXME in d2d_d3d_render_target_BeginDraw(). --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index a7a822d..d6db977 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -434,7 +434,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa static void STDMETHODCALLTYPE d2d_d3d_render_target_BeginDraw(ID2D1RenderTarget *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d3d10_1: Forward stateblock functions to d3d10.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 8fbdf4bcd9fd8a8978df7c6c974f2896510b7e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fbdf4bcd9fd8a8978df7c6c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 07:48:20 2014 +0200 d3d10_1: Forward stateblock functions to d3d10. --- dlls/d3d10_1/d3d10_1.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1.spec b/dlls/d3d10_1/d3d10_1.spec index 4ca69ec..b3d2da7 100644 --- a/dlls/d3d10_1/d3d10_1.spec +++ b/dlls/d3d10_1/d3d10_1.spec @@ -6,7 +6,7 @@ @ stub D3D10CreateDeviceAndSwapChain1 @ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) d3d10.D3D10CreateEffectFromMemory @ stub D3D10CreateEffectPoolFromMemory -@ stub D3D10CreateStateBlock +@ stdcall D3D10CreateStateBlock(ptr ptr ptr) d3d10.D3D10CreateStateBlock @ stub D3D10DisassembleEffect @ stub D3D10DisassembleShader @ stub D3D10GetGeometryShaderProfile @@ -20,11 +20,11 @@ @ stub D3D10PreprocessShader @ stub D3D10ReflectShader @ stub D3D10RegisterLayers -@ stub D3D10StateBlockMaskDifference -@ stub D3D10StateBlockMaskDisableAll -@ stub D3D10StateBlockMaskDisableCapture -@ stub D3D10StateBlockMaskEnableAll -@ stub D3D10StateBlockMaskEnableCapture -@ stub D3D10StateBlockMaskGetSetting -@ stub D3D10StateBlockMaskIntersect -@ stub D3D10StateBlockMaskUnion +@ stdcall D3D10StateBlockMaskDifference(ptr ptr ptr) d3d10.D3D10StateBlockMaskDifference +@ stdcall D3D10StateBlockMaskDisableAll(ptr) d3d10.D3D10StateBlockMaskDisableAll +@ stdcall D3D10StateBlockMaskDisableCapture(ptr long long long) d3d10.D3D10StateBlockMaskDisableCapture +@ stdcall D3D10StateBlockMaskEnableAll(ptr) d3d10.D3D10StateBlockMaskEnableAll +@ stdcall D3D10StateBlockMaskEnableCapture(ptr long long long) d3d10.D3D10StateBlockMaskEnableCapture +@ stdcall D3D10StateBlockMaskGetSetting(ptr long long) d3d10.D3D10StateBlockMaskGetSetting +@ stdcall D3D10StateBlockMaskIntersect(ptr ptr ptr) d3d10.D3D10StateBlockMaskIntersect +@ stdcall D3D10StateBlockMaskUnion(ptr ptr ptr) d3d10.D3D10StateBlockMaskUnion

1 0

Henri Verbeet : d3d10: Implement d3d10_stateblock_Apply().
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 92c420d449dba9f6024aec678a6c39a73d7b7479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c420d449dba9f6024aec678… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 07:48:19 2014 +0200 d3d10: Implement d3d10_stateblock_Apply(). --- dlls/d3d10/stateblock.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index 11ebbdf..73d4b1b 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -378,9 +378,103 @@ static HRESULT STDMETHODCALLTYPE d3d10_stateblock_Capture(ID3D10StateBlock *ifac static HRESULT STDMETHODCALLTYPE d3d10_stateblock_Apply(ID3D10StateBlock *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_stateblock *stateblock = impl_from_ID3D10StateBlock(iface); + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + if (stateblock->mask.VS) + ID3D10Device_VSSetShader(stateblock->device, stateblock->vs); + for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + if (stateblock->mask.VSSamplers[i >> 3] & (1 << (i & 7))) + ID3D10Device_VSSetSamplers(stateblock->device, i, 1, &stateblock->vs_samplers[i]); + } + for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + if (stateblock->mask.VSShaderResources[i >> 3] & (1 << (i & 7))) + ID3D10Device_VSSetShaderResources(stateblock->device, i, 1, &stateblock->vs_resources[i]); + } + for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + if (stateblock->mask.VSConstantBuffers[i >> 3] & (1 << (i & 7))) + ID3D10Device_VSSetConstantBuffers(stateblock->device, i, 1, &stateblock->vs_cbs[i]); + } + + if (stateblock->mask.GS) + ID3D10Device_GSSetShader(stateblock->device, stateblock->gs); + for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + if (stateblock->mask.GSSamplers[i >> 3] & (1 << (i & 7))) + ID3D10Device_GSSetSamplers(stateblock->device, i, 1, &stateblock->gs_samplers[i]); + } + for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + if (stateblock->mask.GSShaderResources[i >> 3] & (1 << (i & 7))) + ID3D10Device_GSSetShaderResources(stateblock->device, i, 1, &stateblock->gs_resources[i]); + } + for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + if (stateblock->mask.GSConstantBuffers[i >> 3] & (1 << (i & 7))) + ID3D10Device_GSSetConstantBuffers(stateblock->device, i, 1, &stateblock->gs_cbs[i]); + } + + if (stateblock->mask.PS) + ID3D10Device_PSSetShader(stateblock->device, stateblock->ps); + for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + if (stateblock->mask.PSSamplers[i >> 3] & (1 << (i & 7))) + ID3D10Device_PSSetSamplers(stateblock->device, i, 1, &stateblock->ps_samplers[i]); + } + for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + if (stateblock->mask.PSShaderResources[i >> 3] & (1 << (i & 7))) + ID3D10Device_PSSetShaderResources(stateblock->device, i, 1, &stateblock->ps_resources[i]); + } + for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + if (stateblock->mask.PSConstantBuffers[i >> 3] & (1 << (i & 7))) + ID3D10Device_PSSetConstantBuffers(stateblock->device, i, 1, &stateblock->ps_cbs[i]); + } + + for (i = 0; i < D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + if (stateblock->mask.IAVertexBuffers[i >> 3] & (1 << (i & 7))) + ID3D10Device_IASetVertexBuffers(stateblock->device, i, 1, &stateblock->vbs[i], + &stateblock->vb_strides[i], &stateblock->vb_offsets[i]); + } + if (stateblock->mask.IAIndexBuffer) + ID3D10Device_IASetIndexBuffer(stateblock->device, stateblock->ib, + stateblock->ib_format, stateblock->ib_offset); + if (stateblock->mask.IAInputLayout) + ID3D10Device_IASetInputLayout(stateblock->device, stateblock->il); + if (stateblock->mask.IAPrimitiveTopology) + ID3D10Device_IASetPrimitiveTopology(stateblock->device, stateblock->topology); + + if (stateblock->mask.OMRenderTargets) + ID3D10Device_OMSetRenderTargets(stateblock->device, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT, + stateblock->rtvs, stateblock->dsv); + if (stateblock->mask.OMBlendState) + ID3D10Device_OMSetBlendState(stateblock->device, stateblock->bs, + stateblock->blend_factor, stateblock->sample_mask); + + if (stateblock->mask.RSViewports) + ID3D10Device_RSSetViewports(stateblock->device, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, + stateblock->vps); + if (stateblock->mask.RSScissorRects) + ID3D10Device_RSSetScissorRects(stateblock->device, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, + stateblock->scissor_rects); + if (stateblock->mask.RSRasterizerState) + ID3D10Device_RSSetState(stateblock->device, stateblock->rs); + + if (stateblock->mask.SOBuffers) + ID3D10Device_SOSetTargets(stateblock->device, D3D10_SO_BUFFER_SLOT_COUNT, + stateblock->so_buffers, stateblock->so_offsets); + + if (stateblock->mask.Predication) + ID3D10Device_SetPredication(stateblock->device, stateblock->predicate, stateblock->predicate_value); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_stateblock_ReleaseAllDeviceObjects(ID3D10StateBlock *iface)

1 0

Nikolay Sivov : devenum: Use V_* macros to access variant data.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: df5f835e686337b5f33679f107f64be60c052931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5f835e686337b5f33679f10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 3 01:17:37 2014 +0400 devenum: Use V_* macros to access variant data. --- dlls/devenum/createdevenum.c | 10 +++++----- dlls/devenum/mediacatenum.c | 36 ++++++++++++++++++------------------ dlls/devenum/tests/devenum.c | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index e9f9606..828d661 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -761,7 +761,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) VARIANT var; V_VT(&var) = VT_I4; - V_UNION(&var, ulVal) = i; + V_I4(&var) = i; res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); if (SUCCEEDED(res)) res = IPropertyBag_Write(pPropBag, wszWaveOutID, &var); @@ -769,7 +769,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) pPropBag = NULL; V_VT(&var) = VT_LPWSTR; - V_UNION(&var, bstrVal) = wocaps.szPname; + V_BSTR(&var) = wocaps.szPname; if (SUCCEEDED(res)) res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); if (pPropBag) @@ -842,7 +842,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) VARIANT var; V_VT(&var) = VT_I4; - V_UNION(&var, ulVal) = i; + V_I4(&var) = i; res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); if (SUCCEEDED(res)) res = IPropertyBag_Write(pPropBag, wszWaveInID, &var); @@ -850,7 +850,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) pPropBag = NULL; V_VT(&var) = VT_LPWSTR; - V_UNION(&var, bstrVal) = wicaps.szPname; + V_BSTR(&var) = wicaps.szPname; if (SUCCEEDED(res)) res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); @@ -952,7 +952,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) OLECHAR wszVfwIndex[] = { 'V','F','W','I','n','d','e','x',0 }; VARIANT var; V_VT(&var) = VT_I4; - V_UNION(&var, ulVal) = i; + V_I4(&var) = i; res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); if (SUCCEEDED(res)) { res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var); diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index ce66711..21c9db3 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -149,15 +149,15 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read( switch (V_VT(pVar)) { case VT_LPWSTR: - V_UNION(pVar, bstrVal) = CoTaskMemAlloc(received); - memcpy(V_UNION(pVar, bstrVal), pData, received); + V_BSTR(pVar) = CoTaskMemAlloc(received); + memcpy(V_BSTR(pVar), pData, received); res = S_OK; break; case VT_EMPTY: V_VT(pVar) = VT_BSTR; /* fall through */ case VT_BSTR: - V_UNION(pVar, bstrVal) = SysAllocStringLen(pData, received/sizeof(WCHAR) - 1); + V_BSTR(pVar) = SysAllocStringLen(pData, received/sizeof(WCHAR) - 1); res = S_OK; break; } @@ -171,7 +171,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read( /* fall through */ case VT_I4: case VT_UI4: - V_UNION(pVar, ulVal) = *(DWORD *)pData; + V_I4(pVar) = *(DWORD *)pData; res = S_OK; break; } @@ -189,7 +189,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read( V_VT(pVar) = VT_ARRAY | VT_UI1; /* fall through */ case VT_ARRAY | VT_UI1: - if (!(V_UNION(pVar, parray) = SafeArrayCreate(VT_UI1, 1, &bound))) + if (!(V_ARRAY(pVar) = SafeArrayCreate(VT_UI1, 1, &bound))) res = E_OUTOFMEMORY; else res = S_OK; @@ -199,12 +199,12 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read( if (res == E_INVALIDARG) break; - res = SafeArrayAccessData(V_UNION(pVar, parray), &pArrayElements); + res = SafeArrayAccessData(V_ARRAY(pVar), &pArrayElements); if (FAILED(res)) break; CopyMemory(pArrayElements, pData, received); - res = SafeArrayUnaccessData(V_UNION(pVar, parray)); + res = SafeArrayUnaccessData(V_ARRAY(pVar)); break; } } @@ -235,15 +235,15 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write( { case VT_BSTR: case VT_LPWSTR: - TRACE("writing %s\n", debugstr_w(V_UNION(pVar, bstrVal))); - lpData = V_UNION(pVar, bstrVal); + TRACE("writing %s\n", debugstr_w(V_BSTR(pVar))); + lpData = V_BSTR(pVar); dwType = REG_SZ; - cbData = (lstrlenW(V_UNION(pVar, bstrVal)) + 1) * sizeof(WCHAR); + cbData = (lstrlenW(V_BSTR(pVar)) + 1) * sizeof(WCHAR); break; case VT_I4: case VT_UI4: - TRACE("writing %u\n", V_UNION(pVar, ulVal)); - lpData = &V_UNION(pVar, ulVal); + TRACE("writing %u\n", V_UI4(pVar)); + lpData = &V_UI4(pVar); dwType = REG_DWORD; cbData = sizeof(DWORD); break; @@ -252,11 +252,11 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write( LONG lUbound = 0; LONG lLbound = 0; dwType = REG_BINARY; - res = SafeArrayGetLBound(V_UNION(pVar, parray), 1, &lLbound); - res = SafeArrayGetUBound(V_UNION(pVar, parray), 1, &lUbound); + res = SafeArrayGetLBound(V_ARRAY(pVar), 1, &lLbound); + res = SafeArrayGetUBound(V_ARRAY(pVar), 1, &lUbound); cbData = (lUbound - lLbound + 1) /* * sizeof(BYTE)*/; TRACE("cbData: %d\n", cbData); - res = SafeArrayAccessData(V_UNION(pVar, parray), &lpData); + res = SafeArrayAccessData(V_ARRAY(pVar), &lpData); break; } default: @@ -270,7 +270,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write( res = E_FAIL; if (V_VT(pVar) & VT_ARRAY) - res = SafeArrayUnaccessData(V_UNION(pVar, parray)); + res = SafeArrayUnaccessData(V_ARRAY(pVar)); return res; } @@ -421,8 +421,8 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToObject(IMoniker *iface, IBi } if (SUCCEEDED(res)) { - res = CLSIDFromString(V_UNION(&var,bstrVal), &clsID); - CoTaskMemFree(V_UNION(&var, bstrVal)); + res = CLSIDFromString(V_BSTR(&var), &clsID); + CoTaskMemFree(V_BSTR(&var)); } if (SUCCEEDED(res)) { diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index b6158d6..8cc4dfd 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -92,7 +92,7 @@ static void test_devenum(IBindCtx *bind_ctx) if (SUCCEEDED(hr)) { if (winetest_debug > 1) - trace(" %s\n", wine_dbgstr_w(V_UNION(&var, bstrVal))); + trace(" %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); } else

1 0

Nikolay Sivov : quartz: Use V_* macros to access variant members.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: b5cd4775230be313174efba95e51cc85401175ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5cd4775230be313174efba95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 2 20:22:48 2014 +0400 quartz: Use V_* macros to access variant members. --- dlls/quartz/filtergraph.c | 10 +++++----- dlls/quartz/filtermapper.c | 24 ++++++++++++------------ dlls/quartz/tests/filtermapper.c | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 771a330..3d495db 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -822,7 +822,7 @@ static HRESULT GetFilterInfo(IMoniker* pMoniker, VARIANT* pvar) hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL); if (SUCCEEDED(hr)) - TRACE("Moniker = %s\n", debugstr_w(V_UNION(pvar, bstrVal))); + TRACE("Moniker = %s\n", debugstr_w(V_BSTR(pvar))); if (pPropBagCat) IPropertyBag_Release(pPropBagCat); @@ -1071,7 +1071,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, } } - hr = IFilterGraph2_AddFilter(iface, pfilter, V_UNION(&var, bstrVal)); + hr = IFilterGraph2_AddFilter(iface, pfilter, V_BSTR(&var)); if (FAILED(hr)) { WARN("Unable to add filter (%x)\n", hr); IBaseFilter_Release(pfilter); @@ -1405,7 +1405,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) goto error; } - hr = IFilterGraph2_AddFilter(iface, pfilter, V_UNION(&var, bstrVal)); + hr = IFilterGraph2_AddFilter(iface, pfilter, V_BSTR(&var)); if (FAILED(hr)) { WARN("Unable to add filter (%x)\n", hr); IBaseFilter_Release(pfilter); @@ -1445,10 +1445,10 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) IPin_Release(ppinfilter); if (FAILED(hr)) { - WARN("Unable to connect %s to renderer (%x)\n", debugstr_w(V_UNION(&var, bstrVal)), hr); + WARN("Unable to connect %s to renderer (%x)\n", debugstr_w(V_BSTR(&var)), hr); goto error; } - TRACE("Connected, recursing %s\n", debugstr_w(V_UNION(&var, bstrVal))); + TRACE("Connected, recursing %s\n", debugstr_w(V_BSTR(&var))); VariantClear(&var); diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 6d02a7a..a462fbc 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -366,7 +366,7 @@ static HRESULT FM2_WriteFriendlyName(IPropertyBag * pPropBag, LPCWSTR szName) BSTR value; V_VT(&var) = VT_BSTR; - V_UNION(&var, bstrVal) = value = SysAllocString(szName); + V_BSTR(&var) = value = SysAllocString(szName); ret = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); SysFreeString(value); @@ -385,7 +385,7 @@ static HRESULT FM2_WriteClsid(IPropertyBag * pPropBag, REFCLSID clsid) if (SUCCEEDED(hr)) { V_VT(&var) = VT_BSTR; - V_UNION(&var, bstrVal) = wszClsid; + V_BSTR(&var) = wszClsid; hr = IPropertyBag_Write(pPropBag, wszClsidName, &var); } CoTaskMemFree(wszClsid); @@ -797,7 +797,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter( } V_VT(&var) = VT_ARRAY | VT_UI1; - V_UNION(&var, parray) = psa; + V_ARRAY(&var) = psa; if (SUCCEEDED(hr)) hr = IPropertyBag_Write(pPropBag, wszFilterDataName, &var); @@ -946,7 +946,7 @@ static HRESULT WINAPI FilterMapper3_EnumMatchingFilters( if (SUCCEEDED(hrSub)) hrSub = IPropertyBag_Read(pPropBagCat, wszMeritName, &var, NULL); - if (SUCCEEDED(hrSub) && (V_UNION(&var, ulVal) >= dwMerit)) + if (SUCCEEDED(hrSub) && (V_UI4(&var) >= dwMerit)) { CLSID clsidCat; IEnumMoniker * pEnum; @@ -959,14 +959,14 @@ static HRESULT WINAPI FilterMapper3_EnumMatchingFilters( VARIANT temp; V_VT(&temp) = VT_EMPTY; IPropertyBag_Read(pPropBagCat, wszFriendlyName, &temp, NULL); - TRACE("Considering category %s\n", debugstr_w(V_UNION(&temp, bstrVal))); + TRACE("Considering category %s\n", debugstr_w(V_BSTR(&temp))); VariantClear(&temp); } hrSub = IPropertyBag_Read(pPropBagCat, wszClsidName, &var, NULL); if (SUCCEEDED(hrSub)) - hrSub = CLSIDFromString(V_UNION(&var, bstrVal), &clsidCat); + hrSub = CLSIDFromString(V_BSTR(&var), &clsidCat); if (SUCCEEDED(hrSub)) hrSub = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &clsidCat, &pEnum, 0); @@ -993,7 +993,7 @@ static HRESULT WINAPI FilterMapper3_EnumMatchingFilters( VARIANT temp; V_VT(&temp) = VT_EMPTY; IPropertyBag_Read(pPropBag, wszFriendlyName, &temp, NULL); - TRACE("Considering filter %s\n", debugstr_w(V_UNION(&temp, bstrVal))); + TRACE("Considering filter %s\n", debugstr_w(V_BSTR(&temp))); VariantClear(&temp); } @@ -1003,13 +1003,13 @@ static HRESULT WINAPI FilterMapper3_EnumMatchingFilters( } if (SUCCEEDED(hrSub)) - hrSub = SafeArrayAccessData(V_UNION(&var, parray), (LPVOID*)&pData); + hrSub = SafeArrayAccessData(V_ARRAY(&var), (LPVOID*)&pData); if (SUCCEEDED(hrSub)) hrSub = FM2_ReadFilterData(pData, &rf2); if (pData) - SafeArrayUnaccessData(V_UNION(&var, parray)); + SafeArrayUnaccessData(V_ARRAY(&var)); VariantClear(&var); @@ -1221,7 +1221,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( hrSub = IPropertyBag_Read(pPropBagCat, wszClsidName, &var, NULL); if (SUCCEEDED(hrSub)) - hrSub = CLSIDFromString(V_UNION(&var, bstrVal), &clsid); + hrSub = CLSIDFromString(V_BSTR(&var), &clsid); VariantClear(&var); @@ -1230,14 +1230,14 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( if (SUCCEEDED(hrSub)) { - len = (strlenW(V_UNION(&var, bstrVal))+1) * sizeof(WCHAR); + len = (strlenW(V_BSTR(&var))+1) * sizeof(WCHAR); if (!(regfilters[idx].Name = CoTaskMemAlloc(len*2))) hr = E_OUTOFMEMORY; } if (SUCCEEDED(hrSub) && regfilters[idx].Name) { - memcpy(regfilters[idx].Name, V_UNION(&var, bstrVal), len); + memcpy(regfilters[idx].Name, V_BSTR(&var), len); regfilters[idx].Clsid = clsid; idx++; } diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index d21509d..bf1839a 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -62,7 +62,7 @@ static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum) { CHAR val1[512], val2[512]; - WideCharToMultiByte(CP_ACP, 0, V_UNION(&var, bstrVal), -1, val1, sizeof(val1), 0, 0); + WideCharToMultiByte(CP_ACP, 0, V_BSTR(&var), -1, val1, sizeof(val1), 0, 0); WideCharToMultiByte(CP_ACP, 0, wszFilterName, -1, val2, sizeof(val2), 0, 0); if (!lstrcmpA(val1, val2)) found = TRUE; }

1 0

Nikolay Sivov : qedit: Use V_BSTR() to access BSTR data.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 3c716499ccf2501fdb5089127fa0a31b6496592e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c716499ccf2501fdb5089127… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 2 20:12:52 2014 +0400 qedit: Use V_BSTR() to access BSTR data. --- dlls/qedit/mediadet.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 7e90c31..3d79107 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -357,7 +357,7 @@ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar) if (SUCCEEDED(hr)) { - hr = CLSIDFromString(V_UNION(pvar, bstrVal), pclsid); + hr = CLSIDFromString(V_BSTR(pvar), pclsid); VariantClear(pvar); V_VT(pvar) = VT_BSTR; } @@ -366,8 +366,7 @@ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar) hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL); if (SUCCEEDED(hr)) - TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), - debugstr_w(V_UNION(pvar, bstrVal))); + TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), debugstr_w(V_BSTR(pvar))); if (pPropBagCat) IPropertyBag_Release(pPropBagCat); @@ -440,8 +439,7 @@ static HRESULT GetSplitter(MediaDetImpl *This) continue; } - hr = IGraphBuilder_AddFilter(This->graph, splitter, - V_UNION(&var, bstrVal)); + hr = IGraphBuilder_AddFilter(This->graph, splitter, V_BSTR(&var)); VariantClear(&var); This->splitter = splitter; if (FAILED(hr))

1 0

Jacek Caban : gzip.php: Added a file for compressed connection tests.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: tools Branch: master Commit: 63271ccb5a4852edf566ac9a3f73733ada472b95 URL: http://source.winehq.org/git/tools.git/?a=commit;h=63271ccb5a4852edf566ac9a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 3 13:36:49 2014 +0200 gzip.php: Added a file for compressed connection tests. --- winetest/tests/.htaccess | 5 +++++ winetest/tests/gzip.php | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess index df1bd34..73bab30 100644 --- a/winetest/tests/.htaccess +++ b/winetest/tests/.htaccess @@ -10,6 +10,11 @@ AddType application/winetest .winetest SetHandler cgi-script </Files> +<Files gzip.php> + SetOutputFilter DEFLATE + UnsetEnv no-gzip +</Files> + <FilesMatch "\.php$"> FileETag None <ifModule mod_headers.c> diff --git a/winetest/tests/gzip.php b/winetest/tests/gzip.php new file mode 100644 index 0000000..3c42734 --- /dev/null +++ b/winetest/tests/gzip.php @@ -0,0 +1,15 @@ +<?php +header("Cache-Control: no-store"); +?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title>Page for winetest tests purposes</title> +</head> +<body> +<?php +echo str_repeat("test ", 10000); +?> +</body> +</html>

1 0

Alexandre Julliard : lxr: Run genxref from a cron job to avoid delaying the release process.
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: tools Branch: master Commit: 4ad638aee8208a76f4e329461f52eddf71f5e259 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4ad638aee8208a76f4e32946… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 22 21:22:48 2014 +0200 lxr: Run genxref from a cron job to avoid delaying the release process. --- lxr/update-version | 28 ++++++++++++++++++++-------- wine_release | 3 --- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/lxr/update-version b/lxr/update-version index bed9714..be0a0e6 100755 --- a/lxr/update-version +++ b/lxr/update-version @@ -1,23 +1,35 @@ #!/bin/sh # # Update the LXR index after a new release of Wine. +# This should normally be run from a cron job. # -# usage: update-version <version> +# usage: update-version [<version>] # set -e umask 002 -if [ $# -lt 1 ] +gitdir=/home/winehq/opt/source/git/wine.git + +if test -z "$1" then - echo "Usage: $0 version" - exit 1 + version=$(git --git-dir=$gitdir tag --contains HEAD) + if test -z "$version" + then + exit 0 # not a release tag + fi +else + version="wine-$1" fi -version=$1 - cd /home/winehq/opt/source -(echo "wine-$version"; cat wine-versions) | uniq > wine-versions.new && mv -f wine-versions.new wine-versions +(echo "$version"; cat wine-versions) | uniq > wine-versions.new +if cmp wine-versions wine-versions.new >/dev/null +then + rm -f wine-versions.new + exit 0 # already updated +fi -./genxref --url=http://source.winehq.org --version=wine-$version +mv -f wine-versions.new wine-versions +./genxref --url=http://source.winehq.org --version="$version" diff --git a/wine_release b/wine_release index af9e5a7..f6991cb 100755 --- a/wine_release +++ b/wine_release @@ -85,7 +85,4 @@ fi # add version to bugzilla table echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1)" | mysql -# make cross reference database for LXR -$tools_dir/lxr/update-version $version & - # end

1 0

Francois Gouget : winewrapper: In 64 bit trees the loader is called wine64.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 12aa347e129b431001a2c5318db6bf50acb36179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12aa347e129b431001a2c5318… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 2 16:52:37 2014 +0200 winewrapper: In 64 bit trees the loader is called wine64. --- tools/winewrapper | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winewrapper b/tools/winewrapper index b324daa..2206d7c 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -88,6 +88,8 @@ if [ -x "$topdir/loader/$name" ] then WINELOADER="$topdir/loader/$name" elif [ -x "$topdir/loader/wine" ] then WINELOADER="$topdir/loader/wine" +elif [ -x "$topdir/loader/wine64" ] +then WINELOADER="$topdir/loader/wine64" else echo "$name: could not find the Wine loader in $topdir" exit 1

1 0

Piotr Caban : msvcr80: Throw bad_alloc exception when operator new fails.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 43be238331ba8cebd4c8bf93eb2d7be0e1339184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43be238331ba8cebd4c8bf93e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 2 17:06:06 2014 +0200 msvcr80: Throw bad_alloc exception when operator new fails. --- dlls/msvcrt/cpp.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/heap.c | 3 +++ dlls/msvcrt/msvcrt.h | 5 ++++- 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index db48dcb..de9a9b4 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -696,6 +696,47 @@ DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ) DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL ) DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info ) +#if _MSVCR_VER >= 80 +typedef exception bad_alloc; +extern const vtable_ptr MSVCRT_bad_alloc_vtable; + +static void bad_alloc_ctor(bad_alloc *this, const char **name) +{ + MSVCRT_exception_ctor(this, name); + this->vtable = &MSVCRT_bad_alloc_vtable; +} + +/* bad_alloc class implementation */ +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_copy_ctor,8) +bad_alloc * __thiscall MSVCRT_bad_alloc_copy_ctor(bad_alloc * _this, const bad_alloc * rhs) +{ + TRACE("(%p %p)\n", _this, rhs); + MSVCRT_exception_copy_ctor(_this, rhs); + _this->vtable = &MSVCRT_bad_alloc_vtable; + return _this; +} + +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_dtor,4) +void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc * _this) +{ + TRACE("(%p)\n", _this); + MSVCRT_exception_dtor(_this); +} + +__ASM_VTABLE(bad_alloc, + VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) + VTABLE_ADD_FUNC(MSVCRT_what_exception)); +DEFINE_RTTI_DATA1( bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc@std@@" ) +DEFINE_EXCEPTION_TYPE_INFO( bad_alloc, 1, &exception_cxx_type_info, NULL ) + +void throw_bad_alloc(const char *str) +{ + bad_alloc e; + bad_alloc_ctor(&e, &str); + _CxxThrowException(&e, &bad_alloc_exception_type); +} +#endif + void msvcrt_init_exception(void *base) { #ifdef __x86_64__ @@ -703,6 +744,7 @@ void msvcrt_init_exception(void *base) init_exception_rtti(base); #if _MSVCR_VER >= 80 init_exception_old_rtti(base); + init_bad_alloc_rtti(base); #endif init_bad_typeid_rtti(base); init_bad_cast_rtti(base); @@ -712,6 +754,9 @@ void msvcrt_init_exception(void *base) init_bad_typeid_cxx(base); init_bad_cast_cxx(base); init___non_rtti_object_cxx(base); +#if _MSVCR_VER >= 80 + init_bad_alloc_cxx(base); +#endif #endif } diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 432df86..bb265bf 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -150,6 +150,9 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) } while(freed); TRACE("(%ld) out of memory\n", size); +#if _MSVCR_VER >= 80 + throw_bad_alloc("bad allocation"); +#endif return NULL; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6c4e763..54cd11a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -234,7 +234,10 @@ extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257]; -void msvcrt_set_errno(int) DECLSPEC_HIDDEN; +void msvcrt_set_errno(int) DECLSPEC_HIDDEN; +#if _MSVCR_VER >= 80 +void throw_bad_alloc(const char*) DECLSPEC_HIDDEN; +#endif void __cdecl _purecall(void); void __cdecl _amsg_exit(int errnum);

1 0

← Newer
1
...
23
24
25
26
27
28
29
30
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2014