wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Juan Lang : crypt32: Trace policy error status in CertVerifyCertificateChainPolicy.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: 9750d0f7f58fcf2475cb21022c1dcfa1e56a01dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9750d0f7f58fcf2475cb21022… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 29 17:54:51 2009 -0700 crypt32: Trace policy error status in CertVerifyCertificateChainPolicy. --- dlls/crypt32/chain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 90093ae..c583812 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2605,5 +2605,6 @@ BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, pPolicyStatus); if (hFunc) CryptFreeOIDFunctionAddress(hFunc, 0); + TRACE("returning %d (%08x)\n", ret, pPolicyStatus->dwError); return ret; }

1 0

Juan Lang : crypt32: Create a V1 certificate if it doesn't have extensions.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: c4ce06293c78345a7bfb9bde92b5df10dca6e47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ce06293c78345a7bfb9bde9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 28 10:48:02 2009 -0700 crypt32: Create a V1 certificate if it doesn't have extensions. --- dlls/crypt32/cert.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2115913..f88cf95 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2807,7 +2807,10 @@ static void CRYPT_MakeCertInfo(PCERT_INFO info, const CRYPT_DATA_BLOB *pSerialNu assert(pSubjectIssuerBlob); assert(pubKey); - info->dwVersion = CERT_V3; + if (pExtensions && pExtensions->cExtension) + info->dwVersion = CERT_V3; + else + info->dwVersion = CERT_V1; info->SerialNumber.cbData = pSerialNumber->cbData; info->SerialNumber.pbData = pSerialNumber->pbData; if (pSignatureAlgorithm)

1 0

Jacek Caban : jscript: Pass global object as this if 'this' argument is null or undefined in Function.apply.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: 710219a53d4944a642b9cb4d2e2448d3ced96c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=710219a53d4944a642b9cb4d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 30 00:02:13 2009 +0100 jscript: Pass global object as this if 'this' argument is null or undefined in Function.apply. --- dlls/jscript/function.c | 14 +++++++++----- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 7d8e812..60f2e43 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -403,9 +403,13 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI argc = arg_cnt(dp); if(argc) { - hres = to_object(ctx, get_arg(dp,0), &this_obj); - if(FAILED(hres)) - return hres; + VARIANT *v = get_arg(dp,0); + + if(V_VT(v) != VT_EMPTY && V_VT(v) != VT_NULL) { + hres = to_object(ctx, v, &this_obj); + if(FAILED(hres)) + return hres; + } } if(argc >= 2) { @@ -413,8 +417,8 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI if(V_VT(get_arg(dp,1)) == VT_DISPATCH) { arg_array = iface_to_jsdisp((IUnknown*)V_DISPATCH(get_arg(dp,1))); - if(arg_array && ( - !is_class(arg_array, JSCLASS_ARRAY) && !is_class(arg_array, JSCLASS_ARGUMENTS) )) { + if(arg_array && + (!is_class(arg_array, JSCLASS_ARRAY) && !is_class(arg_array, JSCLASS_ARGUMENTS) )) { jsdisp_release(arg_array); arg_array = NULL; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 9a9481e..d9d8ee8 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1402,6 +1402,9 @@ function callTest3() { callTest3.call(); callTest3.call(undefined); callTest3.call(null); +callTest3.apply(); +callTest3.apply(undefined); +callTest3.apply(null); tmp = Number.prototype.toString.call(3); ok(tmp === "3", "Number.prototype.toString.call(3) = " + tmp);

1 0

Jacek Caban : jscript: Pass global object as this if 'this' argument is null or undefined in Function.call.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: 0e2132faf76eedb5166119a7ec3a0feb77986d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2132faf76eedb5166119a7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 30 00:01:49 2009 +0100 jscript: Pass global object as this if 'this' argument is null or undefined in Function.call. --- dlls/jscript/function.c | 11 ++++++++--- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index faf2daa..7d8e812 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -455,9 +455,14 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS argc = arg_cnt(dp); if(argc) { - hres = to_object(ctx, get_arg(dp,0), &this_obj); - if(FAILED(hres)) - return hres; + VARIANT *v = get_arg(dp,0); + + if(V_VT(v) != VT_EMPTY && V_VT(v) != VT_NULL) { + hres = to_object(ctx, v, &this_obj); + if(FAILED(hres)) + return hres; + } + args.cArgs = argc-1; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index da32da4..9a9481e 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1395,10 +1395,13 @@ callTest2.apply(tmp); (function () { callTest2.apply(tmp, arguments); })(); function callTest3() { + testThis(this); ok(arguments.length === 0, "arguments.length = " + arguments.length + " expected 0"); } callTest3.call(); +callTest3.call(undefined); +callTest3.call(null); tmp = Number.prototype.toString.call(3); ok(tmp === "3", "Number.prototype.toString.call(3) = " + tmp);

1 0

Henri Verbeet : d3d10core: Fix a small whitespace error.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: c214022eca26e75a67aa283820f7c5b5195af0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c214022eca26e75a67aa28382… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 18:56:24 2009 +0100 d3d10core: Fix a small whitespace error. --- dlls/d3d10core/view.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 2284289..d1d24eb 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -287,7 +287,7 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTa /* ID3D10RenderTargetView methods */ -static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDesc(ID3D10RenderTargetView* iface, +static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDesc(ID3D10RenderTargetView *iface, D3D10_RENDER_TARGET_VIEW_DESC *desc) { struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface;

1 0

Henri Verbeet : d3d10core: Add a separate function for d3d10_rendertarget_view initialization.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: 3333b12487d60d4fde7ca8a769679b947166d9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3333b12487d60d4fde7ca8a76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 18:56:23 2009 +0100 d3d10core: Add a separate function for d3d10_rendertarget_view initialization. --- dlls/d3d10core/d3d10core_private.h | 4 +- dlls/d3d10core/device.c | 171 +--------------------------------- dlls/d3d10core/view.c | 179 +++++++++++++++++++++++++++++++++++- 3 files changed, 187 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3333b12487d60d4fde7ca…

1 0

Henri Verbeet : d3d10core: Add a separate function for d3d10_geometry_shader initialization.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: 39d6f64885cc46143ed6b043f0657f7c3852483a URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d6f64885cc46143ed6b043f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 18:56:22 2009 +0100 d3d10core: Add a separate function for d3d10_geometry_shader initialization. --- dlls/d3d10core/d3d10core_private.h | 3 ++- dlls/d3d10core/device.c | 10 ++++++++-- dlls/d3d10core/shader.c | 10 +++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index a698bf0..9e9d802 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -145,13 +145,14 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; /* ID3D10GeometryShader */ -extern const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl DECLSPEC_HIDDEN; struct d3d10_geometry_shader { const struct ID3D10GeometryShaderVtbl *vtbl; LONG refcount; }; +HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader); + /* ID3D10PixelShader */ struct d3d10_pixel_shader { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 8e44bcc..4439f1f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -965,6 +965,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device const void *byte_code, SIZE_T byte_code_length, ID3D10GeometryShader **shader) { struct d3d10_geometry_shader *object; + HRESULT hr; FIXME("iface %p, byte_code %p, byte_code_length %lu, shader %p stub!\n", iface, byte_code, byte_code_length, shader); @@ -976,9 +977,14 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device return E_OUTOFMEMORY; } - object->vtbl = &d3d10_geometry_shader_vtbl; - object->refcount = 1; + hr = d3d10_geometry_shader_init(object); + if (FAILED(hr)) + { + WARN("Failed to initialize geometry shader, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + } + TRACE("Created geometry shader %p.\n", object); *shader = (ID3D10GeometryShader *)object; return S_OK; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index bf7a6ab..e8602b5 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -352,7 +352,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateDataInterface(I return E_NOTIMPL; } -const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = +static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = { /* IUnknown methods */ d3d10_geometry_shader_QueryInterface, @@ -365,6 +365,14 @@ const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = d3d10_geometry_shader_SetPrivateDataInterface, }; +HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader) +{ + shader->vtbl = &d3d10_geometry_shader_vtbl; + shader->refcount = 1; + + return S_OK; +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_QueryInterface(ID3D10PixelShader *iface,

1 0

Henri Verbeet : wined3d: Map D3DFMT_D24S8 to WINED3DFMT_D24_UNORM_S8_UINT.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: bf10dbe8a6f319116885547fc9465210fd494833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf10dbe8a6f319116885547fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 18:56:21 2009 +0100 wined3d: Map D3DFMT_D24S8 to WINED3DFMT_D24_UNORM_S8_UINT. The internal order of the depth and stencil bits is unspecified since the format isn't lockable. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d9/device.c | 4 ++-- dlls/ddraw/direct3d.c | 2 +- dlls/ddraw/utils.c | 6 +++--- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/utils.c | 11 +++++------ include/wine/wined3d.idl | 1 - 9 files changed, 17 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf10dbe8a6f3191168855…

1 0

Henri Verbeet : wined3d: It's not an error to request multisampling.
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: fbae08672b060b7ea3550cca9b87e37c08239d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbae08672b060b7ea3550cca9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 18:56:20 2009 +0100 wined3d: It's not an error to request multisampling. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8190a0a..f15d9cb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1258,7 +1258,7 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface ERR("The program is requesting multisampling without support!\n"); else { - ERR("Requesting MultiSampleType=%d\n", pPresentParms->MultiSampleType); + TRACE("Requesting multisample type %#x.\n", pPresentParms->MultiSampleType); numSamples = pPresentParms->MultiSampleType; } }

1 0

Vincent Povirk : ole32: Rename StorageImpl_CopyTo to StorageBaseImpl_CopyTo .
by Alexandre Julliard 30 Oct '09

30 Oct '09

Module: wine Branch: master Commit: a5f87a4731ea33c2bcf39fbdd527101a505dfcbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f87a4731ea33c2bcf39fbdd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 14:48:39 2009 -0500 ole32: Rename StorageImpl_CopyTo to StorageBaseImpl_CopyTo. --- dlls/ole32/storage32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 23b3049..1a4a315 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1498,7 +1498,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry, /************************************************************************* * CopyTo (IStorage) */ -static HRESULT WINAPI StorageImpl_CopyTo( +static HRESULT WINAPI StorageBaseImpl_CopyTo( IStorage* iface, DWORD ciidExclude, /* [in] */ const IID* rgiidExclude, /* [size_is][unique][in] */ @@ -2141,7 +2141,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = StorageBaseImpl_OpenStream, StorageBaseImpl_CreateStorage, StorageBaseImpl_OpenStorage, - StorageImpl_CopyTo, + StorageBaseImpl_CopyTo, StorageImpl_MoveElementTo, StorageImpl_Commit, StorageImpl_Revert, @@ -3949,7 +3949,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = StorageBaseImpl_OpenStream, StorageBaseImpl_CreateStorage, StorageBaseImpl_OpenStorage, - StorageImpl_CopyTo, + StorageBaseImpl_CopyTo, StorageImpl_MoveElementTo, StorageInternalImpl_Commit, StorageInternalImpl_Revert,

1 0

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 October 2009