June 2007 - Wine-commits - list.winehq.org

Phil Costin : wined3d: Add support for loading gamma corrected textures.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: e7578dca3612ebf8c549718ae659284e64797749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7578dca3612ebf8c549718ae… Author: Phil Costin <philcostin(a)hotmail.com> Date: Wed Jun 6 23:08:26 2007 +0000 wined3d: Add support for loading gamma corrected textures. --- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/surface.c | 27 +++++++++++++++------------ dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- include/wine/wined3d_interface.h | 8 ++++---- 7 files changed, 24 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7578dca3612ebf8c5497…

1 0

Phil Costin : wined3d: Enable the loading and reloading of gamma corrected textures.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 622f62d3526833cc9b2e45117ce4699221f36956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=622f62d3526833cc9b2e45117… Author: Phil Costin <philcostin(a)hotmail.com> Date: Wed Jun 6 23:13:16 2007 +0000 wined3d: Enable the loading and reloading of gamma corrected textures. --- dlls/wined3d/cubetexture.c | 33 +++++++++++++++++++++++++++++---- dlls/wined3d/device.c | 4 ++++ dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/texture.c | 28 ++++++++++++++++++++++------ dlls/wined3d/volumetexture.c | 29 +++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 2 ++ 6 files changed, 81 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=622f62d3526833cc9b2e4…

1 0

Phil Costin : wined3d: Extend the D3DFMT table to include gamma corrected formats.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 08ae3d6f67bd818a3395450a0c656859a18fe829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08ae3d6f67bd818a3395450a0… Author: Phil Costin <philcostin(a)hotmail.com> Date: Wed Jun 6 23:05:24 2007 +0000 wined3d: Extend the D3DFMT table to include gamma corrected formats. --- dlls/wined3d/utils.c | 124 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 63 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08ae3d6f67bd818a33954…

1 0

Phil Costin : wined3d: Add GL_EXT_texture_sRGB constants and corresponding CheckDeviceFormat query .
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 3650e31e85d547b43aa181d9e0be5a21e72c66ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=3650e31e85d547b43aa181d9e… Author: Phil Costin <philcostin(a)hotmail.com> Date: Wed Jun 6 23:03:47 2007 +0000 wined3d: Add GL_EXT_texture_sRGB constants and corresponding CheckDeviceFormat query. --- dlls/wined3d/directx.c | 24 ++++++++++++++++++++++++ include/wine/wined3d_gl.h | 21 +++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0832b90..0446179 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -718,6 +718,9 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { } else if (strcmp(ThisExtn, "GL_EXT_texture_env_dot3") == 0) { TRACE_(d3d_caps)(" FOUND: EXT Dot3 support\n"); gl_info->supported[EXT_TEXTURE_ENV_DOT3] = TRUE; + } else if (strcmp(ThisExtn, "GL_EXT_texture_sRGB") == 0) { + TRACE_(d3d_caps)(" FOUND: EXT sRGB support\n"); + gl_info->supported[EXT_TEXTURE_SRGB] = TRUE; } else if (strcmp(ThisExtn, "GL_EXT_texture_filter_anisotropic") == 0) { gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC] = TRUE; glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &gl_max); @@ -1726,6 +1729,27 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Check for supported sRGB formats (Texture loading and framebuffer) */ + if (GL_SUPPORT(EXT_TEXTURE_SRGB) && (Usage & WINED3DUSAGE_QUERY_SRGBREAD)) { + switch (CheckFormat) { + case WINED3DFMT_A8R8G8B8: + case WINED3DFMT_X8R8G8B8: + case WINED3DFMT_L8: + case WINED3DFMT_A8L8: + case WINED3DFMT_DXT1: + case WINED3DFMT_DXT2: + case WINED3DFMT_DXT3: + case WINED3DFMT_DXT4: + case WINED3DFMT_DXT5: + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; + + default: + TRACE_(d3d_caps)("[FAILED] Gamma texture format %s not supported.\n", debug_d3dformat(CheckFormat)); + return WINED3DERR_NOTAVAILABLE; + } + } + if (GL_SUPPORT(ARB_TEXTURE_FLOAT)) { BOOL half_pixel_support = GL_SUPPORT(ARB_HALF_FLOAT_PIXEL); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index b8a0715..bcaf666 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -520,6 +520,26 @@ typedef void (APIENTRY * PGLFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint leve #define GL_DOT3_RGB_EXT 0x8740 #define GL_DOT3_RGBA_EXT 0x8741 #endif +/* GL_EXT_texture_sRGB */ +#ifndef GL_EXT_texture_sRGB +#define GL_EXT_texture_sRGB 1 +#define GL_SRGB_EXT 0x8C40 +#define GL_SRGB8_EXT 0x8C41 +#define GL_SRGB_ALPHA_EXT 0x8C42 +#define GL_SRGB8_ALPHA8_EXT 0x8C43 +#define GL_SLUMINANCE_ALPHA_EXT 0x8C44 +#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45 +#define GL_SLUMINANCE_EXT 0x8C46 +#define GL_SLUMINANCE8_EXT 0x8C47 +#define GL_COMPRESSED_SRGB_EXT 0x8C48 +#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49 +#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A +#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B +#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F +#endif /* GL_ARB_texture_float */ #ifndef GL_ARB_texture_float #define GL_ARB_texture_float 1 @@ -1541,6 +1561,7 @@ typedef enum _GL_SupportedExt { EXT_TEXTURE_ENV_ADD, EXT_TEXTURE_ENV_COMBINE, EXT_TEXTURE_ENV_DOT3, + EXT_TEXTURE_SRGB, EXT_VERTEX_WEIGHTING, /* NVIDIA */ NV_FOG_DISTANCE,

1 0

Misha Koshelev : oleaut32: Add support for vararg functions in ITypeInfo:: Invoke.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 428ed94fa9f75c2036953352b50c217aa925479a URL: http://source.winehq.org/git/wine.git/?a=commit;h=428ed94fa9f75c2036953352b… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Jun 6 15:50:32 2007 -0500 oleaut32: Add support for vararg functions in ITypeInfo::Invoke. --- dlls/oleaut32/tests/tmarshal.c | 4 +- dlls/oleaut32/typelib.c | 71 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 67 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 05624e9..cc2632f 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1007,14 +1007,14 @@ static void test_typelibmarshal(void) dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = vararg; hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); - todo_wine ok_ole_success(hr, ITypeInfo_Invoke); + ok_ole_success(hr, ITypeInfo_Invoke); /* call VarArg, even one (non-optional, non-safearray) named argument is not allowed */ dispidNamed = 0; dispparams.cNamedArgs = 1; dispparams.rgdispidNamedArgs = &dispidNamed; hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); - todo_wine ok(hr == DISP_E_NONAMEDARGS, "IDispatch_Invoke should have returned DISP_E_NONAMEDARGS instead of 0x%08x\n", hr); + ok(hr == DISP_E_NONAMEDARGS, "IDispatch_Invoke should have returned DISP_E_NONAMEDARGS instead of 0x%08x\n", hr); dispidNamed = DISPID_PROPERTYPUT; /* call Error */ diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6bf9dfd..1558593 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5594,6 +5594,13 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( rgdispidNamedArgs++; } + if (func_desc->cParamsOpt < 0 && cNamedArgs) + { + ERR("functions with the vararg attribute do not support named arguments\n"); + hres = DISP_E_NONAMEDARGS; + goto func_fail; + } + for (i = 0; i < func_desc->cParams; i++) { TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc; @@ -5674,6 +5681,36 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } V_VT(&rgvarg[i]) = rgvt[i]; } + else if (rgvt[i] == (VT_VARIANT | VT_ARRAY) && func_desc->cParamsOpt < 0 && i == func_desc->cParams-1) + { + SAFEARRAY *a; + SAFEARRAYBOUND bound; + VARIANT *v; + LONG j; + bound.lLbound = 0; + bound.cElements = pDispParams->cArgs-i; + if (!(a = SafeArrayCreate(VT_VARIANT, 1, &bound))) + { + ERR("SafeArrayCreate failed\n"); + break; + } + hres = SafeArrayAccessData(a, (LPVOID)&v); + if (hres != S_OK) + { + ERR("SafeArrayAccessData failed with %x\n", hres); + break; + } + for (j = 0; j < bound.cElements; j++) + VariantCopy(&v[j], &pDispParams->rgvarg[pDispParams->cArgs - 1 - i - j]); + hres = SafeArrayUnaccessData(a); + if (hres != S_OK) + { + ERR("SafeArrayUnaccessData failed with %x\n", hres); + break; + } + V_ARRAY(&rgvarg[i]) = a; + V_VT(&rgvarg[i]) = rgvt[i]; + } else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) { VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); @@ -5740,12 +5777,6 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } } if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */ - if (func_desc->cParamsOpt < 0) - { - FIXME("Does not support safearray optional parameters\n"); - hres = DISP_E_BADPARAMCOUNT; - goto func_fail; /* FIXME: we don't free changed types here */ - } /* VT_VOID is a special case for return types, so it is not * handled in the general function */ @@ -5809,6 +5840,34 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( break; } } + else if (V_VT(prgpvarg[i]) == (VT_VARIANT | VT_ARRAY) && + func_desc->cParamsOpt < 0 && + i == func_desc->cParams-1) + { + SAFEARRAY *a = V_ARRAY(prgpvarg[i]); + LONG j, ubound; + VARIANT *v; + hres = SafeArrayGetUBound(a, 1, &ubound); + if (hres != S_OK) + { + ERR("SafeArrayGetUBound failed with %x\n", hres); + break; + } + hres = SafeArrayAccessData(a, (LPVOID)&v); + if (hres != S_OK) + { + ERR("SafeArrayAccessData failed with %x\n", hres); + break; + } + for (j = 0; j <= ubound; j++) + VariantClear(&v[j]); + hres = SafeArrayUnaccessData(a); + if (hres != S_OK) + { + ERR("SafeArrayUnaccessData failed with %x\n", hres); + break; + } + } VariantClear(&rgvarg[i]); } else if (wParamFlags & PARAMFLAG_FOPT)

1 0

Alexandre Julliard : widl: Get rid of the SIGSEGV handler, this only makes things harder to debug.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 56c6dbee9be6ac299a811145fa99b297feddff65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c6dbee9be6ac299a811145f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 7 12:59:24 2007 +0200 widl: Get rid of the SIGSEGV handler, this only makes things harder to debug. --- tools/widl/widl.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index ed09b32..21657b6 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -144,7 +144,6 @@ static struct option long_options[] = { }; static void rm_tempfile(void); -static void segvhandler(int sig); static char *make_token(const char *name) { @@ -186,7 +185,6 @@ int main(int argc,char *argv[]) int ret = 0; int opti = 0; - signal(SIGSEGV, segvhandler); signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); #ifdef SIGHUP @@ -455,11 +453,3 @@ static void rm_tempfile(void) if (server_name) unlink(server_name); } - -static void segvhandler(int sig) -{ - fprintf(stderr, "\n%s:%d: Oops, segment violation\n", input_name, line_number); - fflush(stdout); - fflush(stderr); - abort(); -}

1 0

Lei Zhang : include: Add missing definitions to shlobj.h.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 00bc8fa184f2df997ffab28e307b9ddbd6e94181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bc8fa184f2df997ffab28e3… Author: Lei Zhang <thestig(a)google.com> Date: Mon May 21 21:50:19 2007 -0700 include: Add missing definitions to shlobj.h. --- include/shlobj.h | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index 84d7845..414f452 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -401,6 +401,11 @@ typedef struct tagBROWSEINFOW { #define BIF_EDITBOX 0x0010 #define BIF_VALIDATE 0x0020 #define BIF_NEWDIALOGSTYLE 0x0040 +#define BIF_USENEWUI (BIF_NEWDIALOGSTYLE | BIF_EDITBOX) +#define BIF_BROWSEINCLUDEURLS 0x0080 +#define BIF_UAHINT 0x0100 +#define BIF_NONEWFOLDERBUTTON 0x0200 +#define BIF_NOTRANSLATETARGETS 0x0400 #define BIF_BROWSEFORCOMPUTER 0x1000 #define BIF_BROWSEFORPRINTER 0x2000 @@ -409,8 +414,9 @@ typedef struct tagBROWSEINFOW { /* message from browser */ #define BFFM_INITIALIZED 1 #define BFFM_SELCHANGED 2 -#define BFFM_VALIDATEFAILEDA 3 /* lParam:szPath ret:1(cont),0(EndDialog) */ -#define BFFM_VALIDATEFAILEDW 4 /* lParam:wzPath ret:1(cont),0(EndDialog) */ +#define BFFM_VALIDATEFAILEDA 3 +#define BFFM_VALIDATEFAILEDW 4 +#define BFFM_IUNKNOWN 5 /* messages to browser */ #define BFFM_SETSTATUSTEXTA (WM_USER+100)

1 0

Misha Koshelev : widl: Add support for vararg attribute.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 21fcb00af84b72341506a67644fecca63aed23f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21fcb00af84b72341506a6764… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Jun 6 15:50:24 2007 -0500 widl: Add support for vararg attribute. --- tools/widl/write_msft.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index df6ea9e..358d1db 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1248,7 +1248,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int int *typedata, typedata_size; int i, id, next_idx; int decoded_size, extra_attr = 0; - int num_params = 0, num_defaults = 0; + int num_params = 0, num_optional = 0, num_defaults = 0; var_t *arg; char *namedata; const attr_t *attr; @@ -1283,10 +1283,10 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int { num_params++; if (arg->attrs) LIST_FOR_EACH_ENTRY( attr, arg->attrs, const attr_t, entry ) { - if(attr->type == ATTR_DEFAULTVALUE_EXPR || attr->type == ATTR_DEFAULTVALUE_STRING) { + if(attr->type == ATTR_DEFAULTVALUE_EXPR || attr->type == ATTR_DEFAULTVALUE_STRING) num_defaults++; - break; - } + else if(attr->type == ATTR_OPTIONAL) + num_optional++; } } @@ -1341,6 +1341,12 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int case ATTR_BINDABLE: funcflags |= 0x4; /* FUNCFLAG_BINDABLE */ break; + case ATTR_VARARG: + if (num_optional || num_defaults) + warning("add_func_desc: ignoring vararg in function with optional or defaultvalue params\n"); + else + num_optional = -1; + break; default: warning("add_func_desc: ignoring attr %d\n", attr->type); break; @@ -1394,7 +1400,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int typedata[4] = (next_idx << 16) | (callconv << 8) | (invokekind << 3) | funckind; if(num_defaults) typedata[4] |= 0x1000; if(entry_is_ord) typedata[4] |= 0x2000; - typedata[5] = num_params; + typedata[5] = (num_optional << 16) | num_params; /* NOTE: High word of typedata[3] is total size of FUNCDESC + size of all ELEMDESCs for params + TYPEDESCs for pointer params and return types. */ /* That is, total memory allocation required to reconstitute the FUNCDESC in its entirety. */

1 0

Misha Koshelev : oleaut32/tests: Add tests for IDispatch:: Invoke of vararg function.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 127385e7186370b0068553cb97f055c387b8aa19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=127385e7186370b0068553cb9… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Jun 6 15:50:29 2007 -0500 oleaut32/tests: Add tests for IDispatch::Invoke of vararg function. --- dlls/oleaut32/tests/tmarshal.c | 61 ++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 3 ++ dlls/oleaut32/tests/tmarshal_dispids.h | 3 +- 3 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 22d2245..05624e9 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -476,6 +476,38 @@ void WINAPI Widget_Variant( ok(S(V_CY(&var)).Lo == 0xdeadbeef, "V_CY(&var).Lo was 0x%x\n", S(V_CY(&var)).Lo); } +void WINAPI Widget_VarArg( + IWidget * iface, + int numexpect, + SAFEARRAY * values) +{ + LONG lbound, ubound, i; + VARIANT * data; + HRESULT hr; + + trace("VarArg(%p)\n", values); + + hr = SafeArrayGetLBound(values, 1, &lbound); + ok(hr == S_OK, "SafeArrayGetLBound failed with %x\n", hr); + ok(lbound == 0, "SafeArrayGetLBound returned %d\n", lbound); + + hr = SafeArrayGetUBound(values, 1, &ubound); + ok(hr == S_OK, "SafeArrayGetUBound failed with %x\n", hr); + ok(ubound == numexpect-1, "SafeArrayGetUBound returned %d, but expected %d\n", ubound, numexpect-1); + + hr = SafeArrayAccessData(values, (LPVOID)&data); + ok(hr == S_OK, "SafeArrayAccessData failed with %x\n", hr); + + for (i=0; i<=ubound-lbound; i++) + { + ok(V_VT(&data[i]) == VT_I4, "V_VT(&data[%d]) was %d\n", i, V_VT(&data[i])); + ok(V_I4(&data[i]) == i, "V_I4(&data[%d]) was %d\n", i, V_I4(&data[i])); + } + + hr = SafeArrayUnaccessData(values); + ok(hr == S_OK, "SafeArrayUnaccessData failed with %x\n", hr); +} + HRESULT WINAPI Widget_Error( IWidget __RPC_FAR * iface) { @@ -507,6 +539,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_Array, Widget_VariantArrayPtr, Widget_Variant, + Widget_VarArg, Widget_Error }; @@ -956,6 +989,34 @@ static void test_typelibmarshal(void) ok_ole_success(hr, IDispatch_Invoke); VariantClear(&varresult); + /* call VarArg */ + VariantInit(&vararg[3]); + V_VT(&vararg[3]) = VT_I4; + V_I4(&vararg[3]) = 3; + VariantInit(&vararg[2]); + V_VT(&vararg[2]) = VT_I4; + V_I4(&vararg[2]) = 0; + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_I4; + V_I4(&vararg[1]) = 1; + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = 2; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 4; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + todo_wine ok_ole_success(hr, ITypeInfo_Invoke); + + /* call VarArg, even one (non-optional, non-safearray) named argument is not allowed */ + dispidNamed = 0; + dispparams.cNamedArgs = 1; + dispparams.rgdispidNamedArgs = &dispidNamed; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + todo_wine ok(hr == DISP_E_NONAMEDARGS, "IDispatch_Invoke should have returned DISP_E_NONAMEDARGS instead of 0x%08x\n", hr); + dispidNamed = DISPID_PROPERTYPUT; + /* call Error */ dispparams.cNamedArgs = 0; dispparams.cArgs = 0; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 2d1a9bc..ff7a00a 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -88,6 +88,9 @@ library TestTypelib [id(DISPID_TM_VARIANT)] void Variant([in] VARIANT var); + [vararg, id(DISPID_TM_VARARG)] + void VarArg([in] int numexpect, [in] SAFEARRAY(VARIANT) values); + [id(DISPID_TM_ERROR)] HRESULT Error(); } diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 46523c7..bfeca29 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -29,6 +29,7 @@ #define DISPID_TM_ARRAY 10 #define DISPID_TM_VARARRAYPTR 11 #define DISPID_TM_VARIANT 12 -#define DISPID_TM_ERROR 13 +#define DISPID_TM_VARARG 13 +#define DISPID_TM_ERROR 14 #define DISPID_NOA_BSTRRET 1

1 0

Andrew Talbot : wined3d: Void functions should not return a value.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 2e16552327a0d373a99c0cdc1fca6852cb452dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e16552327a0d373a99c0cdc1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jun 6 22:40:30 2007 +0100 wined3d: Void functions should not return a value. --- dlls/wined3d/basetexture.c | 2 +- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/indexbuffer.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 3faac87..8e18362 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -137,7 +137,7 @@ DWORD WINAPI IWineD3DBaseTextureImpl_GetPriority(IWineD3DBaseTexture * } void WINAPI IWineD3DBaseTextureImpl_PreLoad(IWineD3DBaseTexture *iface) { - return IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface); + IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface); } WINED3DRESOURCETYPE WINAPI IWineD3DBaseTextureImpl_GetType(IWineD3DBaseTexture *iface) { diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index d9b0c47..163d00a 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -172,7 +172,7 @@ static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DCubeTextureImpl_GetAutoGenFilterT } static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeTexture *iface) { - return IWineD3DBaseTextureImpl_GenerateMipSubLevels((IWineD3DBaseTexture *)iface); + IWineD3DBaseTextureImpl_GenerateMipSubLevels((IWineD3DBaseTexture *)iface); } /* Internal function, No d3d mapping */ diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c index 18cfce7..2d29563 100644 --- a/dlls/wined3d/indexbuffer.c +++ b/dlls/wined3d/indexbuffer.c @@ -107,7 +107,7 @@ static DWORD WINAPI IWineD3DIndexBufferImpl_GetPriority(IWineD3DIndexBuffer *ifa } static void WINAPI IWineD3DIndexBufferImpl_PreLoad(IWineD3DIndexBuffer *iface) { - return IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface); + IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface); } static WINED3DRESOURCETYPE WINAPI IWineD3DIndexBufferImpl_GetType(IWineD3DIndexBuffer *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cc8a83a..9fe040c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -165,7 +165,7 @@ static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DTextureImpl_GetAutoGenFilterType( } static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DTexture *iface) { - return IWineD3DBaseTextureImpl_GenerateMipSubLevels((IWineD3DBaseTexture *)iface); + IWineD3DBaseTextureImpl_GenerateMipSubLevels((IWineD3DBaseTexture *)iface); } /* Internal function, No d3d mapping */ diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index f0ea113..8d8a182 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -94,7 +94,7 @@ static DWORD WINAPI IWineD3DVolumeImpl_GetPriority(IWineD3DVolume *iface) { } static void WINAPI IWineD3DVolumeImpl_PreLoad(IWineD3DVolume *iface) { - return IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface); + IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface); } static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *iface) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 2b26eb3..c1b2e45 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -150,7 +150,7 @@ static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DVolumeTextureImpl_GetAutoGenFilte } static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DVolumeTexture *iface) { - return IWineD3DBaseTextureImpl_GenerateMipSubLevels((IWineD3DBaseTexture *)iface); + IWineD3DBaseTextureImpl_GenerateMipSubLevels((IWineD3DBaseTexture *)iface); } /* Internal function, No d3d mapping */

1 0