January 2013 - Wine-commits

Henri Verbeet : d3drm: Avoid LPD3DRMQUATERNION.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: e84e2e8c9acfdfc665e84bb3bf49376320cf3530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84e2e8c9acfdfc665e84bb3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 24 11:37:37 2013 +0100 d3drm: Avoid LPD3DRMQUATERNION. --- dlls/d3drm/math.c | 7 ++++--- dlls/d3drm/tests/vector.c | 5 +++-- include/d3drmdef.h | 9 +++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 2b23c8f..a1ad727 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -75,7 +75,7 @@ D3DVALUE WINAPI D3DRMColorGetRed(D3DCOLOR color) } /* Product of 2 quaternions */ -LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION q, LPD3DRMQUATERNION a, LPD3DRMQUATERNION b) +D3DRMQUATERNION * WINAPI D3DRMQuaternionMultiply(D3DRMQUATERNION *q, D3DRMQUATERNION *a, D3DRMQUATERNION *b) { D3DRMQUATERNION temp; D3DVECTOR cross_product; @@ -91,7 +91,7 @@ LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION q, LPD3DRMQUA } /* Matrix for the Rotation that a unit quaternion represents */ -void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D m, LPD3DRMQUATERNION q) +void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D m, D3DRMQUATERNION *q) { D3DVALUE w,x,y,z; w = q->s; @@ -125,7 +125,8 @@ D3DRMQUATERNION * WINAPI D3DRMQuaternionFromRotation(D3DRMQUATERNION *q, D3DVECT } /* Interpolation between two quaternions */ -LPD3DRMQUATERNION WINAPI D3DRMQuaternionSlerp(LPD3DRMQUATERNION q, LPD3DRMQUATERNION a, LPD3DRMQUATERNION b, D3DVALUE alpha) +D3DRMQUATERNION * WINAPI D3DRMQuaternionSlerp(D3DRMQUATERNION *q, + D3DRMQUATERNION *a, D3DRMQUATERNION *b, D3DVALUE alpha) { D3DVALUE dot, epsilon, temp, theta, u; D3DVECTOR v1, v2; diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 5be6369..c9e40fe 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -67,7 +67,7 @@ static HMODULE d3drm_handle = 0; -static void (WINAPI * pD3DRMMatrixFromQuaternion)(D3DRMMATRIX4D, LPD3DRMQUATERNION); +static void (WINAPI * pD3DRMMatrixFromQuaternion)(D3DRMMATRIX4D, D3DRMQUATERNION *); static D3DVECTOR *(WINAPI *pD3DRMVectorAdd)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *); static D3DVECTOR *(WINAPI *pD3DRMVectorCrossProduct)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *); static D3DVALUE (WINAPI *pD3DRMVectorDotProduct)(D3DVECTOR *, D3DVECTOR *); @@ -78,7 +78,8 @@ static D3DVECTOR *(WINAPI *pD3DRMVectorRotate)(D3DVECTOR *, D3DVECTOR *, D3DVECT static D3DVECTOR *(WINAPI *pD3DRMVectorScale)(D3DVECTOR *, D3DVECTOR *, D3DVALUE); static D3DVECTOR *(WINAPI *pD3DRMVectorSubtract)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *); static D3DRMQUATERNION *(WINAPI *pD3DRMQuaternionFromRotation)(D3DRMQUATERNION*, D3DVECTOR *, D3DVALUE); -static LPD3DRMQUATERNION (WINAPI * pD3DRMQuaternionSlerp)(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION, D3DVALUE); +static D3DRMQUATERNION *(WINAPI * pD3DRMQuaternionSlerp)(D3DRMQUATERNION *, + D3DRMQUATERNION *, D3DRMQUATERNION *, D3DVALUE); static D3DCOLOR (WINAPI * pD3DRMCreateColorRGB)(D3DVALUE, D3DVALUE, D3DVALUE); static D3DCOLOR (WINAPI * pD3DRMCreateColorRGBA)(D3DVALUE, D3DVALUE, D3DVALUE, D3DVALUE); static D3DVALUE (WINAPI * pD3DRMColorGetAlpha)(D3DCOLOR); diff --git a/include/d3drmdef.h b/include/d3drmdef.h index f763cf3..89d2db9 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -429,11 +429,12 @@ typedef struct _D3DRMVERTEX { typedef LONG D3DRMGROUPINDEX; static const D3DRMGROUPINDEX D3DRMGROUP_ALLGROUPS = -1; -void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D, LPD3DRMQUATERNION); +void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D m, D3DRMQUATERNION *q); -LPD3DRMQUATERNION WINAPI D3DRMQuaternionFromRotation(D3DRMQUATERNION *x, D3DVECTOR *axis, D3DVALUE theta); -LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION); -LPD3DRMQUATERNION WINAPI D3DRMQuaternionSlerp(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION, D3DVALUE); +D3DRMQUATERNION * WINAPI D3DRMQuaternionFromRotation(D3DRMQUATERNION *x, D3DVECTOR *axis, D3DVALUE theta); +D3DRMQUATERNION * WINAPI D3DRMQuaternionMultiply(D3DRMQUATERNION *ret, D3DRMQUATERNION *x, D3DRMQUATERNION *y); +D3DRMQUATERNION * WINAPI D3DRMQuaternionSlerp(D3DRMQUATERNION *ret, + D3DRMQUATERNION *x, D3DRMQUATERNION *y, D3DVALUE alpha); D3DVECTOR * WINAPI D3DRMVectorAdd(D3DVECTOR *ret, D3DVECTOR *x, D3DVECTOR *y); D3DVECTOR * WINAPI D3DRMVectorCrossProduct(D3DVECTOR *ret, D3DVECTOR *x, D3DVECTOR *y);

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMRAY.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 5114cbd23cf95146cc6999fac61cb30b5f636cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5114cbd23cf95146cc6999fac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 24 11:37:38 2013 +0100 d3drm: Avoid LPD3DRMRAY. --- dlls/d3drm/frame.c | 6 ++---- include/d3drmobj.h | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 3f814bf..09dfea4 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2452,10 +2452,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetQuaternion(IDirect3DRMFrame3* ifa return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_RayPick(IDirect3DRMFrame3* iface, - LPDIRECT3DRMFRAME3 reference, LPD3DRMRAY ray, - DWORD flags, - LPDIRECT3DRMPICKED2ARRAY *return_visuals) +static HRESULT WINAPI IDirect3DRMFrame3Impl_RayPick(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *reference, + D3DRMRAY *ray, DWORD flags, IDirect3DRMPicked2Array **return_visuals) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 9569046..71bc005 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1401,8 +1401,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(SetInheritAxes)(THIS_ BOOL inherit_from_parent); STDMETHOD(SetMaterial)(THIS_ LPDIRECT3DRMMATERIAL) PURE; STDMETHOD(SetQuaternion)(THIS_ LPDIRECT3DRMFRAME reference, D3DRMQUATERNION *q) PURE; - STDMETHOD(RayPick)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DRMRAY ray, DWORD flags, - LPDIRECT3DRMPICKED2ARRAY *return_visuals) PURE; + STDMETHOD(RayPick)(THIS_ IDirect3DRMFrame *reference, D3DRMRAY *ray, DWORD flags, + struct IDirect3DRMPicked2Array **return_visuals) PURE; STDMETHOD(Save)(THIS_ LPCSTR filename, D3DRMXOFFORMAT d3dFormat, D3DRMSAVEOPTIONS d3dSaveFlags); }; #undef INTERFACE @@ -1680,8 +1680,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(SetInheritAxes)(THIS_ BOOL inherit_from_parent); STDMETHOD(SetMaterial)(THIS_ LPDIRECT3DRMMATERIAL2) PURE; STDMETHOD(SetQuaternion)(THIS_ LPDIRECT3DRMFRAME3 reference, D3DRMQUATERNION *q) PURE; - STDMETHOD(RayPick)(THIS_ LPDIRECT3DRMFRAME3 reference, LPD3DRMRAY ray, DWORD flags, - LPDIRECT3DRMPICKED2ARRAY *return_visuals) PURE; + STDMETHOD(RayPick)(THIS_ IDirect3DRMFrame3 *reference, D3DRMRAY *ray, DWORD flags, + struct IDirect3DRMPicked2Array **return_visuals) PURE; STDMETHOD(Save)(THIS_ LPCSTR filename, D3DRMXOFFORMAT d3dFormat, D3DRMSAVEOPTIONS d3dSaveFlags); STDMETHOD(TransformVectors)(THIS_ IDirect3DRMFrame3 *reference, DWORD vector_count, D3DVECTOR *dst_vectors, D3DVECTOR *src_vectors) PURE;

1 0

Henri Verbeet : wined3d: Properly set WINED3DFMT_FLAG_VTF in init_format_texture_info().
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: b882a70282a766dd51ac68d5c88d5198c0d942a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b882a70282a766dd51ac68d5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 24 11:37:39 2013 +0100 wined3d: Properly set WINED3DFMT_FLAG_VTF in init_format_texture_info(). --- dlls/wined3d/directx.c | 24 +++--------------------- dlls/wined3d/utils.c | 5 +++++ 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5b3de2e..33871c6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3877,24 +3877,6 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckVertexTextureCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *format) -{ - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - - if (!gl_info->limits.vertex_samplers || !(format->flags & WINED3DFMT_FLAG_VTF)) - return FALSE; - - switch (format->id) - { - case WINED3DFMT_R32G32B32A32_FLOAT: - case WINED3DFMT_R32_FLOAT: - return TRUE; - default: - return !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING); - } -} - HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, DWORD usage, enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id) @@ -4014,7 +3996,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { - if (!CheckVertexTextureCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_VTF)) { TRACE("[FAILED] - No vertex texture support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4180,7 +4162,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { - if (!CheckVertexTextureCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_VTF)) { TRACE("[FAILED] - No vertex texture support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4348,7 +4330,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { - if (!CheckVertexTextureCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_VTF)) { TRACE("[FAILED] - No vertex texture support.\n"); return WINED3DERR_NOTAVAILABLE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 39309ae..c1f6125 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1287,8 +1287,13 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->height_scale.numerator = 1; format->height_scale.denominator = 1; + if (!gl_info->limits.vertex_samplers) + format->flags &= ~WINED3DFMT_FLAG_VTF; + if (!(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) format->flags |= WINED3DFMT_FLAG_FILTERING; + else if (format->id != WINED3DFMT_R32G32B32A32_FLOAT && format->id != WINED3DFMT_R32_FLOAT) + format->flags &= ~WINED3DFMT_FLAG_VTF; if (format->glGammaInternal != format->glInternal) {

1 0

Henri Verbeet : wined3d: Get rid of CheckPostPixelShaderBlendingCapability( ).
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 63902bfd5cc5061e156274b47dfab667e6827317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63902bfd5cc5061e156274b47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 24 11:37:40 2013 +0100 wined3d: Get rid of CheckPostPixelShaderBlendingCapability(). --- dlls/wined3d/directx.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 33871c6..0af31ad 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3528,16 +3528,6 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; } -/* Check if a format support blending in combination with pixel shaders */ -static BOOL CheckPostPixelShaderBlendingCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *format) -{ - /* The flags entry of a format contains the post pixel shader blending capability */ - if (format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) return TRUE; - - return FALSE; -} - static BOOL CheckWrapAndMipCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { /* OpenGL supports mipmapping on all formats basically. Wrapping is unsupported, @@ -3966,7 +3956,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) { - if (!CheckPostPixelShaderBlendingCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) { TRACE("[FAILED] - No post pixelshader blending support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4049,7 +4039,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) { - if (!CheckPostPixelShaderBlendingCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) { TRACE("[FAILED] - No post pixelshader blending support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4132,7 +4122,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) { - if (!CheckPostPixelShaderBlendingCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) { TRACE("[FAILED] - No post pixelshader blending support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4300,7 +4290,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) { - if (!CheckPostPixelShaderBlendingCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) { TRACE("[FAILED] - No post pixelshader blending support.\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Henri Verbeet : wined3d: Get rid of CheckWrapAndMipCapability().
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 8347c67c69639ebc5ba21471fdcd22a9f53a7fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8347c67c69639ebc5ba21471f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 24 11:37:41 2013 +0100 wined3d: Get rid of CheckWrapAndMipCapability(). --- dlls/wined3d/directx.c | 46 +++++++++++----------------------------------- 1 files changed, 11 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0af31ad..d5d1025 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3528,20 +3528,6 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckWrapAndMipCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - /* OpenGL supports mipmapping on all formats basically. Wrapping is unsupported, - * but we have to report mipmapping so we cannot reject this flag. Tests show that - * windows reports WRAPANDMIP on unfilterable surfaces as well, apparently to show - * that wrapping is supported. The lack of filtering will sort out the mipmapping - * capability anyway. - * - * For now lets report this on all formats, but in the future we may want to - * restrict it to some should games need that - */ - return TRUE; -} - /* Check if a texture format is supported on the given adapter */ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { @@ -3994,15 +3980,18 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad usage_caps |= WINED3DUSAGE_QUERY_VERTEXTEXTURE; } + /* OpenGL supports mipmapping on all formats. Wrapping is + * unsupported, but we have to report mipmapping so we cannot + * reject this flag. Tests show that Windows reports WRAPANDMIP on + * unfilterable surfaces as well, apparently to show that wrapping + * is supported. The lack of filtering will sort out the + * mipmapping capability anyway. + * + * For now lets report this on all formats, but in the future we + * may want to restrict it to some should applications need that. */ if (usage & WINED3DUSAGE_QUERY_WRAPANDMIP) - { - if (!CheckWrapAndMipCapability(adapter, format)) - { - TRACE("[FAILED] - No wrapping and mipmapping support.\n"); - return WINED3DERR_NOTAVAILABLE; - } usage_caps |= WINED3DUSAGE_QUERY_WRAPANDMIP; - } + break; case WINED3D_RTYPE_SURFACE: @@ -4161,14 +4150,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if (usage & WINED3DUSAGE_QUERY_WRAPANDMIP) - { - if (!CheckWrapAndMipCapability(adapter, format)) - { - TRACE("[FAILED] - No wrapping and mipmapping support.\n"); - return WINED3DERR_NOTAVAILABLE; - } usage_caps |= WINED3DUSAGE_QUERY_WRAPANDMIP; - } if (usage & WINED3DUSAGE_DEPTHSTENCIL) { @@ -4329,14 +4311,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if (usage & WINED3DUSAGE_QUERY_WRAPANDMIP) - { - if (!CheckWrapAndMipCapability(adapter, format)) - { - TRACE("[FAILED] - No wrapping and mipmapping support.\n"); - return WINED3DERR_NOTAVAILABLE; - } usage_caps |= WINED3DUSAGE_QUERY_WRAPANDMIP; - } + break; default:

1 0

Jacek Caban : vbscript: Added GetObject implementation.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 3a87b4c1c5c642ad3ee7093afafac5f46d294070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a87b4c1c5c642ad3ee7093af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 24 12:26:54 2013 +0100 vbscript: Added GetObject implementation. --- dlls/vbscript/global.c | 97 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 79 insertions(+), 18 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 6886ff7..39b75ab 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #define VB_E_CANNOT_CREATE_OBJ 0x800a01ad +#define VB_E_MK_PARSE_ERROR 0x800a01b0 /* Defined as extern in urlmon.idl, but not exported by uuid.lib */ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = @@ -216,10 +217,29 @@ static HRESULT to_string(VARIANT *v, BSTR *ret) return S_OK; } +static HRESULT set_object_site(script_ctx_t *ctx, IUnknown *obj) +{ + IObjectWithSite *obj_site; + IUnknown *ax_site; + HRESULT hres; + + hres = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void**)&obj_site); + if(FAILED(hres)) + return S_OK; + + ax_site = create_ax_site(ctx); + if(ax_site) + hres = IObjectWithSite_SetSite(obj_site, ax_site); + else + hres = E_OUTOFMEMORY; + IUnknown_Release(ax_site); + IObjectWithSite_Release(obj_site); + return hres; +} + static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr = NULL; - IObjectWithSite *obj_site; struct CONFIRMSAFETY cs; IClassFactoryEx *cfex; IClassFactory *cf; @@ -279,20 +299,10 @@ static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) } } - hres = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void**)&obj_site); - if(SUCCEEDED(hres)) { - IUnknown *ax_site; - - ax_site = create_ax_site(ctx); - if(ax_site) { - hres = IObjectWithSite_SetSite(obj_site, ax_site); - IUnknown_Release(ax_site); - } - IObjectWithSite_Release(obj_site); - if(!ax_site || FAILED(hres)) { - IUnknown_Release(obj); - return NULL; - } + hres = set_object_site(ctx, obj); + if(FAILED(hres)) { + IUnknown_Release(obj); + return NULL; } return obj; @@ -1275,10 +1285,61 @@ static HRESULT Global_CreateObject(vbdisp_t *This, VARIANT *arg, unsigned args_c return S_OK; } -static HRESULT Global_GetObject(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_GetObject(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + IBindCtx *bind_ctx; + IUnknown *obj_unk; + IDispatch *disp; + ULONG eaten = 0; + IMoniker *mon; + HRESULT hres; + + TRACE("%s %s\n", args_cnt ? debugstr_variant(args) : "", args_cnt > 1 ? debugstr_variant(args+1) : ""); + + if(args_cnt != 1 || V_VT(args) != VT_BSTR) { + FIXME("unsupported args\n"); + return E_NOTIMPL; + } + + if(This->desc->ctx->safeopt & (INTERFACE_USES_SECURITY_MANAGER|INTERFACESAFE_FOR_UNTRUSTED_DATA)) { + WARN("blocked in current safety mode\n"); + return VB_E_CANNOT_CREATE_OBJ; + } + + hres = CreateBindCtx(0, &bind_ctx); + if(FAILED(hres)) + return hres; + + hres = MkParseDisplayName(bind_ctx, V_BSTR(args), &eaten, &mon); + if(SUCCEEDED(hres)) { + hres = IMoniker_BindToObject(mon, bind_ctx, NULL, &IID_IUnknown, (void**)&obj_unk); + IMoniker_Release(mon); + }else { + hres = MK_E_SYNTAX; + } + IBindCtx_Release(bind_ctx); + if(FAILED(hres)) + return hres; + + hres = set_object_site(This->desc->ctx, obj_unk); + if(FAILED(hres)) { + IUnknown_Release(obj_unk); + return hres; + } + + hres = IUnknown_QueryInterface(obj_unk, &IID_IDispatch, (void**)&disp); + if(SUCCEEDED(hres)) { + if(res) { + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = disp; + }else { + IDispatch_Release(disp); + } + }else { + FIXME("object does not support IDispatch\n"); + } + + return hres; } static HRESULT Global_DateAdd(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)

1 0

Jacek Caban : vbscript: Added GetObject tests.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: c751389df48b874a6ece45db98d733e8b215449d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c751389df48b874a6ece45db9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 24 12:27:25 2013 +0100 vbscript: Added GetObject tests. --- dlls/vbscript/tests/createobj.c | 96 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 92 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 9dafe1c..4ae4208 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -36,6 +36,7 @@ #define IActiveScriptParse_Release IActiveScriptParse64_Release #define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_64_Release #else @@ -43,6 +44,7 @@ #define IActiveScriptParse_Release IActiveScriptParse32_Release #define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_32_Release #endif @@ -72,6 +74,9 @@ extern const CLSID CLSID_VBScript; expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(ProcessUrlAction); DEFINE_EXPECT(QueryCustomPolicy); @@ -91,12 +96,16 @@ static HRESULT QueryCustomPolicy_hres; static DWORD QueryCustomPolicy_psize; static DWORD QueryCustomPolicy_policy; static HRESULT QI_IDispatch_hres; +static HRESULT QI_IObjectWithSite_hres; static HRESULT SetSite_hres; -#define TESTOBJ_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" +#define TESTOBJ_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" +#define TESTOBJINST_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80647}" static const GUID CLSID_TestObj = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}}; +static const GUID CLSID_TestObjInst = + {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x47}}; /* Defined as extern in urlmon.idl, but not exported by uuid.lib */ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = @@ -201,6 +210,8 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, *ppv = iface; }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { CHECK_EXPECT(QI_IObjectWithSite); + if(FAILED(QI_IObjectWithSite_hres)) + return QI_IObjectWithSite_hres; *ppv = object_with_site; }else if(IsEqualGUID(&IID_IObjectSafety, riid)) { ok(0, "Unexpected IID_IObjectSafety query\n"); @@ -740,6 +751,7 @@ static IActiveScriptParse *create_script(BOOL use_sec_mgr) QueryCustomPolicy_psize = sizeof(DWORD); QueryCustomPolicy_policy = URLPOLICY_ALLOW; QI_IDispatch_hres = S_OK; + QI_IObjectWithSite_hres = S_OK; SetSite_hres = S_OK; hres = CoCreateInstance(&CLSID_VBScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -971,6 +983,59 @@ static void test_CreateObject(void) IActiveScriptParse_Release(parser); } +static void test_GetObject(void) +{ + IActiveScriptParse *parser; + HRESULT hres; + + /* Never allowed with security manager */ + parser = create_script(TRUE); + hres = parse_script_ae(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); + ok(hres == VB_E_CANNOT_CREATE_OBJ, "hres = %08x\n", hres); + IActiveScriptParse_Release(parser); + + parser = create_script(FALSE); + + SET_EXPECT(QI_IObjectWithSite); + SET_EXPECT(SetSite); + SET_EXPECT(reportSuccess); + hres = parse_script_ae(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); + if(hres == 0x8007007e) { /* Workaround for broken win2k */ + win_skip("got unexpected error %08x\n", hres); + CLEAR_CALLED(QI_IObjectWithSite); + CLEAR_CALLED(SetSite); + CLEAR_CALLED(reportSuccess); + IActiveScriptParse_Release(parser); + return; + } + CHECK_CALLED(QI_IObjectWithSite); + CHECK_CALLED(SetSite); + CHECK_CALLED(reportSuccess); + + SetSite_hres = E_FAIL; + SET_EXPECT(QI_IObjectWithSite); + SET_EXPECT(SetSite); + hres = parse_script_ae(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); + ok(hres == E_FAIL, "hres = %08x\n", hres); + CHECK_CALLED(QI_IObjectWithSite); + CHECK_CALLED(SetSite); + + QI_IObjectWithSite_hres = E_NOINTERFACE; + SET_EXPECT(QI_IObjectWithSite); + SET_EXPECT(reportSuccess); + parse_script_a(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); + CHECK_CALLED(QI_IObjectWithSite); + CHECK_CALLED(reportSuccess); + + IActiveScriptParse_Release(parser); + + /* Invalid moniker */ + parser = create_script(FALSE); + hres = parse_script_ae(parser, "Call GetObject(\"nonexistent:test\").reportSuccess()"); + ok(hres == MK_E_SYNTAX, "hres = %08x\n", hres); + IActiveScriptParse_Release(parser); +} + static BOOL init_key(const char *key_name, const char *def_value, BOOL init) { HKEY hkey; @@ -1012,18 +1077,41 @@ static BOOL register_activex(void) CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid); ok(hres == S_OK, "Could not register script engine: %08x\n", hres); + hres = CoRegisterClassObject(&CLSID_TestObjInst, (IUnknown *)&testObj, + CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid); + ok(hres == S_OK, "Could not register script engine: %08x\n", hres); + return TRUE; } +static BOOL check_vbscript(void) +{ + IActiveScriptParseProcedure2 *vbscript; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_VBScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IActiveScriptParseProcedure2, (void**)&vbscript); + if(SUCCEEDED(hres)) + IActiveScriptParseProcedure2_Release(vbscript); + + return hres == S_OK; +} + + START_TEST(createobj) { CoInitialize(NULL); - register_activex(); + if(check_vbscript()) { + register_activex(); - test_CreateObject(); + test_CreateObject(); + test_GetObject(); - init_registry(FALSE); + init_registry(FALSE); + }else { + win_skip("Broken engine, probably too old\n"); + } CoUninitialize(); }

1 0

Michael Stefaniuc : ws2_32: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: f21d45417f99f113549945be1e4f474375f89e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21d45417f99f113549945be1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 14:21:53 2013 +0100 ws2_32: Use assignment instead of memcpy to copy structs. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c390828..6fd1e34 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2183,7 +2183,7 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) if (setsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex)) != 0) goto cleanup; /* Failed to suggest egress interface */ - memcpy(&specific_interface_filter, &generic_interface_filter, sizeof(generic_interface_filter)); + specific_interface_filter = generic_interface_filter; specific_interface_filter.iface_rule.k = adapter->Index; filter_prog.len = sizeof(generic_interface_filter)/sizeof(struct sock_filter); filter_prog.filter = (struct sock_filter *) &specific_interface_filter; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 56a64bc..4b4b99a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2725,7 +2725,7 @@ static void test_getsockname(void) return; } - memcpy(&sa_get, &sa_set, sizeof(sa_set)); + sa_get = sa_set; if (getsockname(sock, (struct sockaddr*) &sa_get, &sa_get_len) == 0) ok(0, "getsockname on unbound socket should fail\n"); else {

1 0

Piotr Caban : msvcp90: Added complex::real and complex::imag implementation .
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: e4525224b056feed6086293f5d9cae26ce94831c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4525224b056feed6086293f5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:27:43 2013 +0100 msvcp90: Added complex::real and complex::imag implementation. --- dlls/msvcp90/math.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 72 +++++++++++++++--------------- 2 files changed, 140 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4525224b056feed60862…

1 0

Piotr Caban : msvcp90: Added std::abs(complex) implementation.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 3e9db55b09174db2b601c1bb19f5abb7f5cadcdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9db55b09174db2b601c1bb1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:27:57 2013 +0100 msvcp90: Added std::abs(complex) implementation. --- dlls/msvcp90/math.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 24 +++++++++--------- 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 8d25e76..37dc3f7 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1276,6 +1276,33 @@ float __thiscall complex_float_real_get(const complex_float *this) return this->real; } +/* ??$_Fabs(a)M@std@@YAMABV?$complex(a)M@0(a)PAH@Z */ +/* ??$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@0(a)PEAH@Z */ +float __cdecl complex_float__Fabs(const complex_float *c, int *scale) +{ + float ret; + + ret = hypotf(c->real, c->imag); + if(_isnan(ret) || ret==0) { + *scale = 0; + }else if(ret >= 1) { + *scale = 2; + ret /= 4; + }else { + *scale = -2; + ret *= 4; + } + + return ret; +} + +/* ??$abs(a)M@std@@YAMABV?$complex(a)M@0@@Z */ +/* ??$abs(a)M@std@@YAMAEBV?$complex(a)M@0@@Z */ +float __cdecl complex_float_abs(const complex_float *c) +{ + return hypotf(c->real, c->imag); +} + /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z */ /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QEAA(a)AEBN0@Z */ /* ??0?$_Complex_base(a)OU_C_ldouble_complex@@@std@@QAE(a)ABO0@Z */ @@ -1742,3 +1769,34 @@ double __thiscall complex_double_real_get(const complex_double *this) { return this->real; } + +/* ??$_Fabs(a)N@std@@YANABV?$complex(a)N@0(a)PAH@Z */ +/* ??$_Fabs(a)N@std@@YANAEBV?$complex(a)N@0(a)PEAH@Z */ +/* ??$_Fabs(a)O@std@@YAOABV?$complex(a)O@0(a)PAH@Z */ +/* ??$_Fabs(a)O@std@@YAOAEBV?$complex(a)O@0(a)PEAH@Z */ +double __cdecl complex_double__Fabs(const complex_double *c, int *scale) +{ + double ret; + + ret = hypot(c->real, c->imag); + if(_isnan(ret) || ret==0) { + *scale = 0; + }else if(ret >= 1) { + *scale = 2; + ret /= 4; + }else { + *scale = -2; + ret *= 4; + } + + return ret; +} + +/* ??$abs(a)N@std@@YANABV?$complex(a)N@0@@Z */ +/* ??$abs(a)N@std@@YANAEBV?$complex(a)N@0@@Z */ +/* ??$abs(a)O@std@@YAOABV?$complex(a)O@0@@Z */ +/* ??$abs(a)O@std@@YAOAEBV?$complex(a)O@0@@Z */ +double __cdecl complex_double_abs(const complex_double *c) +{ + return hypot(c->real, c->imag); +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 14540b4..ef4726d 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -344,18 +344,18 @@ @ cdecl -arch=win64 ??$?P_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PEB_W@Z(ptr wstr) MSVCP_basic_string_wchar_geq_bstr_cstr @ cdecl -arch=win32 ??$?P_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPB_WABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(wstr ptr) MSVCP_basic_string_wchar_geq_cstr_bstr @ cdecl -arch=win64 ??$?P_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPEB_WAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(wstr ptr) MSVCP_basic_string_wchar_geq_cstr_bstr -@ stub -arch=win32 ??$_Fabs(a)M@std@@YAMABV?$complex(a)M@0(a)PAH@Z -@ stub -arch=win64 ??$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@0(a)PEAH@Z -@ stub -arch=win32 ??$_Fabs(a)N@std@@YANABV?$complex(a)N@0(a)PAH@Z -@ stub -arch=win64 ??$_Fabs(a)N@std@@YANAEBV?$complex(a)N@0(a)PEAH@Z -@ stub -arch=win32 ??$_Fabs(a)O@std@@YAOABV?$complex(a)O@0(a)PAH@Z -@ stub -arch=win64 ??$_Fabs(a)O@std@@YAOAEBV?$complex(a)O@0(a)PEAH@Z -@ stub -arch=win32 ??$abs(a)M@std@@YAMABV?$complex(a)M@0@@Z -@ stub -arch=win64 ??$abs(a)M@std@@YAMAEBV?$complex(a)M@0@@Z -@ stub -arch=win32 ??$abs(a)N@std@@YANABV?$complex(a)N@0@@Z -@ stub -arch=win64 ??$abs(a)N@std@@YANAEBV?$complex(a)N@0@@Z -@ stub -arch=win32 ??$abs(a)O@std@@YAOABV?$complex(a)O@0@@Z -@ stub -arch=win64 ??$abs(a)O@std@@YAOAEBV?$complex(a)O@0@@Z +@ cdecl -arch=win32 ??$_Fabs(a)M@std@@YAMABV?$complex(a)M@0(a)PAH@Z(ptr ptr) complex_float__Fabs +@ cdecl -arch=win64 ??$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@0(a)PEAH@Z(ptr ptr) complex_float__Fabs +@ cdecl -arch=win32 ??$_Fabs(a)N@std@@YANABV?$complex(a)N@0(a)PAH@Z(ptr ptr) complex_double__Fabs +@ cdecl -arch=win64 ??$_Fabs(a)N@std@@YANAEBV?$complex(a)N@0(a)PEAH@Z(ptr ptr) complex_double__Fabs +@ cdecl -arch=win32 ??$_Fabs(a)O@std@@YAOABV?$complex(a)O@0(a)PAH@Z(ptr ptr) complex_double__Fabs +@ cdecl -arch=win64 ??$_Fabs(a)O@std@@YAOAEBV?$complex(a)O@0(a)PEAH@Z(ptr ptr) complex_double__Fabs +@ cdecl -arch=win32 ??$abs(a)M@std@@YAMABV?$complex(a)M@0@@Z(ptr) complex_float_abs +@ cdecl -arch=win64 ??$abs(a)M@std@@YAMAEBV?$complex(a)M@0@@Z(ptr) complex_float_abs +@ cdecl -arch=win32 ??$abs(a)N@std@@YANABV?$complex(a)N@0@@Z(ptr) complex_double_abs +@ cdecl -arch=win64 ??$abs(a)N@std@@YANAEBV?$complex(a)N@0@@Z(ptr) complex_double_abs +@ cdecl -arch=win32 ??$abs(a)O@std@@YAOABV?$complex(a)O@0@@Z(ptr) complex_double_abs +@ cdecl -arch=win64 ??$abs(a)O@std@@YAOAEBV?$complex(a)O@0@@Z(ptr) complex_double_abs @ cdecl -arch=win32 ??$arg(a)M@std@@YAMABV?$complex(a)M@0@@Z(ptr) complex_float_arg @ cdecl -arch=win64 ??$arg(a)M@std@@YAMAEBV?$complex(a)M@0@@Z(ptr) complex_float_arg @ cdecl -arch=win32 ??$arg(a)N@std@@YANABV?$complex(a)N@0@@Z(ptr) complex_double_arg

1 0