July 2006 - Wine-commits - list.winehq.org

Stefan Leichter : msi: Make the version information of DllGetVersion same as in version resource.
by Alexandre Julliard 28 Jul '06

28 Jul '06

Module: wine Branch: refs/heads/master Commit: 93bbd00be79d1dd48735e9b54f2d787dcfbf064a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93bbd00be79d1dd48735e9b… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Jul 28 00:26:41 2006 +0200 msi: Make the version information of DllGetVersion same as in version resource. --- dlls/msi/msipriv.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 3fa8466..27655ae 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -252,9 +252,9 @@ #define MSIHANDLETYPE_RECORD 4 #define MSIHANDLETYPE_PACKAGE 5 #define MSIHANDLETYPE_PREVIEW 6 -#define MSI_MAJORVERSION 2 -#define MSI_MINORVERSION 0 -#define MSI_BUILDNUMBER 2600 +#define MSI_MAJORVERSION 3 +#define MSI_MINORVERSION 1 +#define MSI_BUILDNUMBER 4000 #define GUID_SIZE 39

1 0

Juan Lang : rsaenh: More tests and some fixes.
by Alexandre Julliard 28 Jul '06

28 Jul '06

Module: wine Branch: refs/heads/master Commit: b6d5972190a4a5301b9996adfa07b2539f715fe3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b6d5972190a4a5301b9996a… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Jul 27 17:11:10 2006 -0700 rsaenh: More tests and some fixes. - correct deleting the default container - imported keys should be stored in their container, not just given to the caller - tests for these changes --- dlls/rsaenh/rsaenh.c | 51 ++++++- dlls/rsaenh/tests/rsaenh.c | 313 +++++++++++++++++++++++++++++++++----------- 2 files changed, 278 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b6d5972190a4a5301b9…

1 0

Benjamin Arai : oleaut32: VarMonthName - Update error codes and helper functions.
by Alexandre Julliard 28 Jul '06

28 Jul '06

Module: wine Branch: refs/heads/master Commit: 0eed4603c506b1c0495b592489c5a4e6282ad0e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0eed4603c506b1c0495b592… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Thu Jul 27 18:10:20 2006 -0700 oleaut32: VarMonthName - Update error codes and helper functions. --- dlls/oleaut32/varformat.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 77d1196..d515bc3 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2486,17 +2486,17 @@ HRESULT WINAPI VarMonthName(INT iMonth, size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, NULL, 0); if (!size) { - FIXME("GetLocaleInfo 0x%lx failed.\n", localeValue); - return E_INVALIDARG; + ERR("GetLocaleInfo 0x%lx failed.\n", localeValue); + return HRESULT_FROM_WIN32(GetLastError()); } str = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*size); if (!str) return E_OUTOFMEMORY; size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, str, size); if (!size) { - FIXME("GetLocaleInfo of 0x%lx failed in 2nd stage?!\n", localeValue); + ERR("GetLocaleInfo of 0x%lx failed in 2nd stage?!\n", localeValue); HeapFree(GetProcessHeap(),0,str); - return E_INVALIDARG; + return HRESULT_FROM_WIN32(GetLastError()); } *pbstrOut = SysAllocString(str); HeapFree(GetProcessHeap(),0,str);

1 0

Benjamin Arai : oleaut32: VarSub: Conformance test.
by Alexandre Julliard 28 Jul '06

28 Jul '06

Module: wine Branch: refs/heads/master Commit: f10ed1f16eaac58e04bed943f608833269840f54 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f10ed1f16eaac58e04bed94… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Thu Jul 27 17:19:59 2006 -0700 oleaut32: VarSub: Conformance test. --- dlls/oleaut32/tests/vartest.c | 242 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 231 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f10ed1f16eaac58e04b…

1 0

Benjamin Arai : oleaut32: VarSub: Fixes several data types and corrects error codes.
by Alexandre Julliard 28 Jul '06

28 Jul '06

Module: wine Branch: refs/heads/master Commit: 9634ffa7dca3f42a7aeae9a9bb62c2bddf84e289 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9634ffa7dca3f42a7aeae9a… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Thu Jul 27 17:19:52 2006 -0700 oleaut32: VarSub: Fixes several data types and corrects error codes. --- dlls/oleaut32/variant.c | 213 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 167 insertions(+), 46 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index ae3043a..46d31e9 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3404,65 +3404,186 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LP */ HRESULT WINAPI VarSub(LPVARIANT left, LPVARIANT right, LPVARIANT result) { - HRESULT rc = E_FAIL; - VARTYPE lvt,rvt,resvt; + HRESULT hres = S_OK; + VARTYPE resvt = VT_EMPTY; + VARTYPE leftvt,rightvt; + VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; VARIANT lv,rv; - BOOL found; TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); - VariantInit(&lv);VariantInit(&rv); - lvt = V_VT(left)&VT_TYPEMASK; - rvt = V_VT(right)&VT_TYPEMASK; - found = FALSE;resvt = VT_VOID; - if (((1<<lvt) | (1<<rvt)) & (VTBIT_DATE|VTBIT_R4|VTBIT_R8)) { - found = TRUE; - resvt = VT_R8; - } - if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_DECIMAL))) { - found = TRUE; - resvt = VT_DECIMAL; - } - if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|VTBIT_INT|VTBIT_UINT))) { - found = TRUE; - resvt = VT_I4; - } - if (!found) { - FIXME("can't expand vt %d vs %d to a target type.\n",lvt,rvt); - return E_FAIL; + leftvt = V_VT(left)&VT_TYPEMASK; + rightvt = V_VT(right)&VT_TYPEMASK; + leftExtraFlags = V_VT(left)&(~VT_TYPEMASK); + rightExtraFlags = V_VT(right)&(~VT_TYPEMASK); + + if (leftExtraFlags != rightExtraFlags) + return DISP_E_BADVARTYPE; + ExtraFlags = leftExtraFlags; + + /* determine return type and return code */ + /* All extra flags produce errors */ + if (ExtraFlags == (VT_VECTOR|VT_BYREF|VT_RESERVED) || + ExtraFlags == (VT_VECTOR|VT_RESERVED) || + ExtraFlags == (VT_VECTOR|VT_BYREF) || + ExtraFlags == (VT_BYREF|VT_RESERVED) || + ExtraFlags == VT_VECTOR || + ExtraFlags == VT_BYREF || + ExtraFlags == VT_RESERVED) + return DISP_E_BADVARTYPE; + else if (ExtraFlags >= VT_ARRAY) + return DISP_E_TYPEMISMATCH; + /* Native VarSub cannot handle: VT_I1, VT_UI2, VT_UI4, + VT_INT, VT_UINT and VT_UI8. Tested with WinXP */ + else if (leftvt == VT_CLSID || rightvt == VT_CLSID || + leftvt == VT_VARIANT || rightvt == VT_VARIANT || + leftvt == VT_I1 || rightvt == VT_I1 || + leftvt == VT_UI2 || rightvt == VT_UI2 || + leftvt == VT_UI4 || rightvt == VT_UI4 || + leftvt == VT_UI8 || rightvt == VT_UI8 || + leftvt == VT_INT || rightvt == VT_INT || + leftvt == VT_UINT || rightvt == VT_UINT || + leftvt == VT_UNKNOWN || rightvt == VT_UNKNOWN || + leftvt == VT_RECORD || rightvt == VT_RECORD) + { + if (leftvt == VT_RECORD && rightvt == VT_I8) + return DISP_E_TYPEMISMATCH; + else if (leftvt < VT_UI1 && rightvt == VT_RECORD) + return DISP_E_TYPEMISMATCH; + else if (leftvt >= VT_UI1 && rightvt == VT_RECORD) + return DISP_E_TYPEMISMATCH; + else if (leftvt == VT_RECORD && rightvt <= VT_UI1) + return DISP_E_TYPEMISMATCH; + else if (leftvt == VT_RECORD && rightvt > VT_UI1) + return DISP_E_BADVARTYPE; + else + return DISP_E_BADVARTYPE; } - rc = VariantChangeType(&lv, left, 0, resvt); - if (FAILED(rc)) { - FIXME("Could not convert 0x%x to %d?\n",V_VT(left),resvt); - return rc; + /* The following flags/types are invalid for left variant */ + else if (!((leftvt <= VT_LPWSTR || leftvt == VT_RECORD || + leftvt == VT_CLSID) && leftvt != (VARTYPE)15 /* undefined vt */ && + (leftvt < VT_VOID || leftvt > VT_LPWSTR))) + return DISP_E_BADVARTYPE; + /* The following flags/types are invalid for right variant */ + else if (!((rightvt <= VT_LPWSTR || rightvt == VT_RECORD || + rightvt == VT_CLSID) && rightvt != (VARTYPE)15 /* undefined vt */ && + (rightvt < VT_VOID || rightvt > VT_LPWSTR))) + return DISP_E_BADVARTYPE; + else if ((leftvt == VT_NULL && rightvt == VT_DISPATCH) || + (leftvt == VT_DISPATCH && rightvt == VT_NULL)) + resvt = VT_NULL; + else if (leftvt == VT_DISPATCH || rightvt == VT_DISPATCH || + leftvt == VT_ERROR || rightvt == VT_ERROR) + return DISP_E_TYPEMISMATCH; + else if (leftvt == VT_NULL || rightvt == VT_NULL) + resvt = VT_NULL; + else if ((leftvt == VT_EMPTY && rightvt == VT_BSTR) || + (leftvt == VT_DATE && rightvt == VT_DATE) || + (leftvt == VT_BSTR && rightvt == VT_EMPTY) || + (leftvt == VT_BSTR && rightvt == VT_BSTR)) + resvt = VT_R8; + else if (leftvt == VT_DECIMAL || rightvt == VT_DECIMAL) + resvt = VT_DECIMAL; + else if (leftvt == VT_DATE || rightvt == VT_DATE) + resvt = VT_DATE; + else if (leftvt == VT_CY || rightvt == VT_CY) + resvt = VT_CY; + else if (leftvt == VT_R8 || rightvt == VT_R8) + resvt = VT_R8; + else if (leftvt == VT_BSTR || rightvt == VT_BSTR) + resvt = VT_R8; + else if (leftvt == VT_R4 || rightvt == VT_R4) + { + if (leftvt == VT_I4 || rightvt == VT_I4 || + leftvt == VT_I8 || rightvt == VT_I8) + resvt = VT_R8; + else + resvt = VT_R4; + } + else if (leftvt == VT_I8 || rightvt == VT_I8) + resvt = VT_I8; + else if (leftvt == VT_I4 || rightvt == VT_I4) + resvt = VT_I4; + else if (leftvt == VT_I2 || rightvt == VT_I2 || + leftvt == VT_BOOL || rightvt == VT_BOOL || + (leftvt == VT_EMPTY && rightvt == VT_EMPTY)) + resvt = VT_I2; + else if (leftvt == VT_UI1 || rightvt == VT_UI1) + resvt = VT_UI1; + else + return DISP_E_TYPEMISMATCH; + + VariantInit(&lv); + VariantInit(&rv); + + /* coerce to the result type */ + if (leftvt == VT_BSTR && rightvt == VT_DATE) + hres = VariantChangeType(&lv, left, 0, VT_R8); + else + hres = VariantChangeType(&lv, left, 0, resvt); + if (hres != S_OK) + { + VariantClear(&lv); + VariantClear(&rv); + return hres; } - rc = VariantChangeType(&rv, right, 0, resvt); - if (FAILED(rc)) { - FIXME("Could not convert 0x%x to %d?\n",V_VT(right),resvt); - return rc; + if (leftvt == VT_DATE && rightvt == VT_BSTR) + hres = VariantChangeType(&rv, right, 0, VT_R8); + else + hres = VariantChangeType(&rv, right, 0, resvt); + if (hres != S_OK) + { + VariantClear(&lv); + VariantClear(&rv); + return hres; } - switch (resvt) { + + /* do the math */ + V_VT(result) = resvt; + switch (resvt) + { + case VT_NULL: + break; + case VT_DATE: + V_DATE(result) = V_DATE(&lv) - V_DATE(&rv); + break; + case VT_CY: + hres = VarCySub(V_CY(&lv), V_CY(&rv), &(V_CY(result))); + break; + case VT_R4: + V_R4(result) = V_R4(&lv) - V_R4(&rv); + break; + case VT_I8: + V_I8(result) = V_I8(&lv) - V_I8(&rv); + break; + case VT_I4: + V_I4(result) = V_I4(&lv) - V_I4(&rv); + break; + case VT_I2: + V_I2(result) = V_I2(&lv) - V_I2(&rv); + break; + case VT_I1: + V_I1(result) = V_I1(&lv) - V_I1(&rv); + break; + case VT_UI1: + V_UI1(result) = V_UI2(&lv) - V_UI1(&rv); + break; case VT_R8: - V_VT(result) = resvt; - V_R8(result) = V_R8(&lv) - V_R8(&rv); - rc = S_OK; - break; + V_R8(result) = V_R8(&lv) - V_R8(&rv); + break; case VT_DECIMAL: - rc = VarDecSub(&(V_DECIMAL(&lv)), &(V_DECIMAL(&rv)), &(V_DECIMAL(result))); - V_VT(result) = resvt; - break; - case VT_I4: - V_VT(result) = resvt; - V_I4(result) = V_I4(&lv) - V_I4(&rv); - rc = S_OK; - break; + hres = VarDecSub(&(V_DECIMAL(&lv)), &(V_DECIMAL(&rv)), &(V_DECIMAL(result))); + break; } - TRACE("returning 0x%8lx (%s%s),%g\n", rc, debugstr_VT(result), - debugstr_VF(result), V_VT(result) == VT_R8 ? V_R8(result) : (double)V_I4(result)); - return rc; + + VariantClear(&lv); + VariantClear(&rv); + + return hres; } + /********************************************************************** * VarOr [OLEAUT32.157] *

1 0

Robert Shearman : oleaut32: Implement GetTypeInfoCount and GetTypeInfo for standard pictures.
by Alexandre Julliard 28 Jul '06

28 Jul '06

Module: wine Branch: refs/heads/master Commit: d82d37443020fb22e40b54dae75b8f2ba5fc3d41 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d82d37443020fb22e40b54d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 28 01:26:13 2006 +0100 oleaut32: Implement GetTypeInfoCount and GetTypeInfo for standard pictures. --- dlls/oleaut32/olepicture.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index e1ab8ec..927c85c 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1992,9 +1992,11 @@ static HRESULT WINAPI OLEPictureImpl_Get IDispatch* iface, unsigned int* pctinfo) { - FIXME("():Stub\n"); + TRACE("(%p)", pctinfo); - return E_NOTIMPL; + *pctinfo = 1; + + return S_OK; } /************************************************************************ @@ -2008,9 +2010,27 @@ static HRESULT WINAPI OLEPictureImpl_Get LCID lcid, ITypeInfo** ppTInfo) { - FIXME("():Stub\n"); + static const WCHAR stdole2tlb[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; + ITypeLib *tl; + HRESULT hres; - return E_NOTIMPL; + TRACE("(iTInfo=%d, lcid=%04x, %p)\n", iTInfo, (int)lcid, ppTInfo); + + if (iTInfo != 0) + return E_FAIL; + + hres = LoadTypeLib(stdole2tlb, &tl); + if (FAILED(hres)) + { + ERR("Could not load stdole2.tlb\n"); + return hres; + } + + hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IPictureDisp, ppTInfo); + if (FAILED(hres)) + ERR("Did not get IPictureDisp typeinfo from typelib, hres %lx\n", hres); + + return hres; } /************************************************************************

1 0

Robert Shearman : oleaut32: Implement GetTypeInfoCount for standard fonts.
by Alexandre Julliard 28 Jul '06

28 Jul '06

Module: wine Branch: refs/heads/master Commit: 3435560317671e72ac1ff3a171ff079a2aab8304 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3435560317671e72ac1ff3a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 28 01:26:01 2006 +0100 oleaut32: Implement GetTypeInfoCount for standard fonts. --- dlls/oleaut32/olefont.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 880e740..bdde164 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1299,9 +1299,10 @@ static HRESULT WINAPI OLEFontImpl_GetTyp unsigned int* pctinfo) { OLEFontImpl *this = impl_from_IDispatch(iface); - FIXME("(%p)->(%p): Stub\n", this, pctinfo); + TRACE("(%p)->(%p)\n", this, pctinfo); + *pctinfo = 1; - return E_NOTIMPL; + return S_OK; } /************************************************************************

1 0

Robert Shearman : oleaut32: Implement setting of the hPal property in IPictureDisp::Invoke.
by Alexandre Julliard 28 Jul '06

28 Jul '06

Module: wine Branch: refs/heads/master Commit: 9648b824a1fdfdc37e35e20cbcd6bb9535a3ec44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9648b824a1fdfdc37e35e20… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 28 01:25:23 2006 +0100 oleaut32: Implement setting of the hPal property in IPictureDisp::Invoke. Remove some validation code that is already handled by a more generic case at the end of the function. --- dlls/oleaut32/olepicture.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index f937c2f..e1ab8ec 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2084,11 +2084,6 @@ static HRESULT WINAPI OLEPictureImpl_Inv return DISP_E_BADPARAMCOUNT; } } - else - { - ERR("one of DISPATCH_PROPERTYGET or DISPATCH_PROPERTYPUT must be specified\n"); - return DISP_E_MEMBERNOTFOUND; - } switch (dispIdMember) { @@ -2107,6 +2102,22 @@ static HRESULT WINAPI OLEPictureImpl_Inv V_VT(pVarResult) = VT_I4; return IPicture_get_hPal((IPicture *)&This->lpVtbl, &V_UINT(pVarResult)); } + else if (wFlags & DISPATCH_PROPERTYPUT) + { + VARIANTARG vararg; + HRESULT hr; + TRACE("DISPID_PICT_HPAL\n"); + + VariantInit(&vararg); + hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_I4); + if (FAILED(hr)) + return hr; + + hr = IPicture_set_hPal((IPicture *)&This->lpVtbl, V_I4(&vararg)); + + VariantClear(&vararg); + return hr; + } break; case DISPID_PICT_TYPE: if (wFlags & DISPATCH_PROPERTYGET)

1 0

Robert Shearman : oleaut32: Implement getting of all properties in IPictureDisp::Invoke.
by Alexandre Julliard 28 Jul '06

28 Jul '06

Module: wine Branch: refs/heads/master Commit: e0e7d96ee6e94978a1214ee76ce11dff0da3edd5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0e7d96ee6e94978a1214ee… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 28 01:24:10 2006 +0100 oleaut32: Implement getting of all properties in IPictureDisp::Invoke. --- dlls/oleaut32/olepicture.c | 65 +++++++++++++++++++++++++++----------- dlls/oleaut32/tests/olepicture.c | 13 ++++++-- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index b2d9cf0..f937c2f 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2065,6 +2065,11 @@ static HRESULT WINAPI OLEPictureImpl_Inv if (wFlags & DISPATCH_PROPERTYGET) { + if (pDispParams->cArgs != 0) + { + ERR("param count for DISPATCH_PROPERTYGET was %d instead of 0\n", pDispParams->cArgs); + return DISP_E_BADPARAMCOUNT; + } if (!pVarResult) { ERR("null pVarResult not allowed when DISPATCH_PROPERTYGET specified\n"); @@ -2085,30 +2090,52 @@ static HRESULT WINAPI OLEPictureImpl_Inv return DISP_E_MEMBERNOTFOUND; } - if (dispIdMember == DISPID_PICT_TYPE) + switch (dispIdMember) { - TRACE("DISPID_PICT_TYPE\n"); - if (!(wFlags & INVOKE_PROPERTYGET)) - return DISP_E_PARAMNOTFOUND; - if (pDispParams->cArgs != 0) - return DISP_E_BADPARAMCOUNT; - if (pVarResult) + case DISPID_PICT_HANDLE: + if (wFlags & DISPATCH_PROPERTYGET) { - VariantInit(pVarResult); - V_VT(pVarResult) = VT_I2; - return OLEPictureImpl_get_Type((IPicture *)&This->lpVtbl, &V_I2(pVarResult)); + TRACE("DISPID_PICT_HANDLE\n"); + V_VT(pVarResult) = VT_I4; + return IPicture_get_Handle((IPicture *)&This->lpVtbl, &V_UINT(pVarResult)); } - return S_OK; + break; + case DISPID_PICT_HPAL: + if (wFlags & DISPATCH_PROPERTYGET) + { + TRACE("DISPID_PICT_HPAL\n"); + V_VT(pVarResult) = VT_I4; + return IPicture_get_hPal((IPicture *)&This->lpVtbl, &V_UINT(pVarResult)); + } + break; + case DISPID_PICT_TYPE: + if (wFlags & DISPATCH_PROPERTYGET) + { + TRACE("DISPID_PICT_TYPE\n"); + V_VT(pVarResult) = VT_I2; + return OLEPictureImpl_get_Type((IPicture *)&This->lpVtbl, &V_I2(pVarResult)); + } + break; + case DISPID_PICT_WIDTH: + if (wFlags & DISPATCH_PROPERTYGET) + { + TRACE("DISPID_PICT_WIDTH\n"); + V_VT(pVarResult) = VT_I4; + return IPicture_get_Width((IPicture *)&This->lpVtbl, &V_I4(pVarResult)); + } + break; + case DISPID_PICT_HEIGHT: + if (wFlags & DISPATCH_PROPERTYGET) + { + TRACE("DISPID_PICT_HEIGHT\n"); + V_VT(pVarResult) = VT_I4; + return IPicture_get_Height((IPicture *)&This->lpVtbl, &V_I4(pVarResult)); + } + break; } - else - { - FIXME("(dispid: %ld):Stub\n",dispIdMember); - VariantInit(pVarResult); - V_VT(pVarResult) = VT_BOOL; - V_BOOL(pVarResult) = FALSE; - return S_OK; - } + ERR("invalid dispid 0x%lx or wFlags 0x%x\n", dispIdMember, wFlags); + return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index b4a5697..b5f7c40 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -337,14 +337,23 @@ static void test_Invoke(void) hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &varresult, NULL, NULL); ok_ole_success(hr, "IPictureDisp_Invoke"); + ok(V_VT(&varresult) == VT_I4, "V_VT(&varresult) should have been VT_UINT instead of %d\n", V_VT(&varresult)); hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &varresult, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "IPictureDisp_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); hr = IPictureDisp_Invoke(picdisp, 0xdeadbeef, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &varresult, NULL, NULL); - todo_wine { ok(hr == DISP_E_MEMBERNOTFOUND, "IPictureDisp_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); - } + + dispparams.cArgs = 1; + dispparams.rgvarg = &vararg; + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &varresult, NULL, NULL); + ok(hr == DISP_E_BADPARAMCOUNT, "IPictureDisp_Invoke should have returned DISP_E_BADPARAMCOUNT instead of 0x%08lx\n", hr); + + dispparams.cArgs = 1; + dispparams.rgvarg = &vararg; + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &varresult, NULL, NULL); + ok(hr == DISP_E_BADPARAMCOUNT, "IPictureDisp_Invoke should have returned DISP_E_BADPARAMCOUNT instead of 0x%08lx\n", hr); IPictureDisp_Release(picdisp); }

1 0

Robert Shearman : oleaut32: Add a test for passing an invalid number of input parameters into IFontDisp ::Invoke with DISPATCH_PROPERTYGET.
by Alexandre Julliard 28 Jul '06

28 Jul '06

Module: wine Branch: refs/heads/master Commit: 9985f50389f924ec92fe5b9c5b32404d13a2f940 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9985f50389f924ec92fe5b9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 28 01:23:01 2006 +0100 oleaut32: Add a test for passing an invalid number of input parameters into IFontDisp::Invoke with DISPATCH_PROPERTYGET. --- dlls/oleaut32/tests/olefont.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index e98e84c..341ef61 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -465,6 +465,11 @@ static void test_Invoke(void) hr = IFontDisp_Invoke(fontdisp, 0xdeadbeef, &IID_NULL, 0, DISPATCH_PROPERTYGET, NULL, &varresult, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "IFontDisp_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); + dispparams.cArgs = 1; + dispparams.rgvarg = &vararg; + hr = IFontDisp_Invoke(fontdisp, DISPID_FONT_BOLD, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &varresult, NULL, NULL); + ok_ole_success(hr, "IFontDisp_Invoke"); + IFontDisp_Release(fontdisp); }

1 0