January 2007 - Wine-Commits

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarSub.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: a5e3a999eafe78f2973bc732748756981b044795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5e3a999eafe78f2973bc7327… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 2 18:52:11 2007 -0500 oleaut32: Support for VT_DISPATCH in VarSub. --- dlls/oleaut32/variant.c | 130 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 101 insertions(+), 29 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 60af75d..7a7909e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3690,17 +3690,80 @@ HRESULT WINAPI VarSub(LPVARIANT left, LP VARTYPE leftvt,rightvt; VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; VARIANT lv,rv; + VARIANT tempLeft, tempRight; + + VariantInit(&lv); + VariantInit(&rv); + VariantInit(&tempLeft); + VariantInit(&tempRight); TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH && + (V_VT(left)&(~VT_TYPEMASK)) == 0 && + (V_VT(right) & VT_TYPEMASK) != VT_NULL) + { + if (NULL == V_DISPATCH(left)) { + if ((V_VT(right) & VT_TYPEMASK) >= VT_INT_PTR) + hres = DISP_E_BADVARTYPE; + else if ((V_VT(right) & VT_TYPEMASK) >= VT_UI8 && + (V_VT(right) & VT_TYPEMASK) < VT_RECORD) + hres = DISP_E_BADVARTYPE; + else switch (V_VT(right) & VT_TYPEMASK) + { + case VT_VARIANT: + case VT_UNKNOWN: + case 15: + case VT_I1: + case VT_UI2: + case VT_UI4: + hres = DISP_E_BADVARTYPE; + } + if (FAILED(hres)) goto end; + } + hres = VARIANT_FetchDispatchValue(left, &tempLeft); + if (FAILED(hres)) goto end; + left = &tempLeft; + } + if ((V_VT(right) & VT_TYPEMASK) == VT_DISPATCH && + (V_VT(right)&(~VT_TYPEMASK)) == 0 && + (V_VT(left) & VT_TYPEMASK) != VT_NULL) + { + if (NULL == V_DISPATCH(right)) + { + if ((V_VT(left) & VT_TYPEMASK) >= VT_INT_PTR) + hres = DISP_E_BADVARTYPE; + else if ((V_VT(left) & VT_TYPEMASK) >= VT_UI8 && + (V_VT(left) & VT_TYPEMASK) < VT_RECORD) + hres = DISP_E_BADVARTYPE; + else switch (V_VT(left) & VT_TYPEMASK) + { + case VT_VARIANT: + case VT_UNKNOWN: + case 15: + case VT_I1: + case VT_UI2: + case VT_UI4: + hres = DISP_E_BADVARTYPE; + } + if (FAILED(hres)) goto end; + } + hres = VARIANT_FetchDispatchValue(right, &tempRight); + if (FAILED(hres)) goto end; + right = &tempRight; + } + 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; + { + hres = DISP_E_BADVARTYPE; + goto end; + } ExtraFlags = leftExtraFlags; /* determine return type and return code */ @@ -3712,9 +3775,15 @@ HRESULT WINAPI VarSub(LPVARIANT left, LP ExtraFlags == VT_VECTOR || ExtraFlags == VT_BYREF || ExtraFlags == VT_RESERVED) - return DISP_E_BADVARTYPE; + { + hres = DISP_E_BADVARTYPE; + goto end; + } else if (ExtraFlags >= VT_ARRAY) - return DISP_E_TYPEMISMATCH; + { + hres = DISP_E_TYPEMISMATCH; + goto end; + } /* 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 || @@ -3729,34 +3798,44 @@ HRESULT WINAPI VarSub(LPVARIANT left, LP leftvt == VT_RECORD || rightvt == VT_RECORD) { if (leftvt == VT_RECORD && rightvt == VT_I8) - return DISP_E_TYPEMISMATCH; + hres = DISP_E_TYPEMISMATCH; else if (leftvt < VT_UI1 && rightvt == VT_RECORD) - return DISP_E_TYPEMISMATCH; + hres = DISP_E_TYPEMISMATCH; else if (leftvt >= VT_UI1 && rightvt == VT_RECORD) - return DISP_E_TYPEMISMATCH; + hres = DISP_E_TYPEMISMATCH; else if (leftvt == VT_RECORD && rightvt <= VT_UI1) - return DISP_E_TYPEMISMATCH; + hres = DISP_E_TYPEMISMATCH; else if (leftvt == VT_RECORD && rightvt > VT_UI1) - return DISP_E_BADVARTYPE; + hres = DISP_E_BADVARTYPE; else - return DISP_E_BADVARTYPE; + hres = DISP_E_BADVARTYPE; + goto end; } /* 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; + { + hres = DISP_E_BADVARTYPE; + goto end; + } /* 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; + { + hres = DISP_E_BADVARTYPE; + goto end; + } 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; + { + hres = DISP_E_TYPEMISMATCH; + goto end; + } else if (leftvt == VT_NULL || rightvt == VT_NULL) resvt = VT_NULL; else if ((leftvt == VT_EMPTY && rightvt == VT_BSTR) || @@ -3793,32 +3872,22 @@ HRESULT WINAPI VarSub(LPVARIANT left, LP else if (leftvt == VT_UI1 || rightvt == VT_UI1) resvt = VT_UI1; else - return DISP_E_TYPEMISMATCH; - - VariantInit(&lv); - VariantInit(&rv); + { + hres = DISP_E_TYPEMISMATCH; + goto end; + } /* 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; - } + if (hres != S_OK) goto end; 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; - } + if (hres != S_OK) goto end; /* do the math */ V_VT(result) = resvt; @@ -3858,9 +3927,12 @@ HRESULT WINAPI VarSub(LPVARIANT left, LP break; } +end: VariantClear(&lv); VariantClear(&rv); - + VariantClear(&tempLeft); + VariantClear(&tempRight); + TRACE("returning 0x%8x (variant type %s)\n", hres, debugstr_VT(result)); return hres; }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarDiv.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 67c9b7cbb88bf24876bd35294e431e04624c714b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c9b7cbb88bf24876bd35294… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 2 18:51:28 2007 -0500 oleaut32: Support for VT_DISPATCH in VarDiv. --- dlls/oleaut32/variant.c | 71 ++++++++++++++++++++++++++++++---------------- 1 files changed, 46 insertions(+), 25 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 570b299..60af75d 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3527,6 +3527,29 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LP VARTYPE leftvt,rightvt; VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; VARIANT lv,rv; + VARIANT tempLeft, tempRight; + + VariantInit(&tempLeft); + VariantInit(&tempRight); + VariantInit(&lv); + VariantInit(&rv); + + TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), + debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(left, &tempLeft); + if (FAILED(hres)) goto end; + left = &tempLeft; + } + if ((V_VT(right) & VT_TYPEMASK) == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(right, &tempRight); + if (FAILED(hres)) goto end; + right = &tempRight; + } leftvt = V_VT(left)&VT_TYPEMASK; rightvt = V_VT(right)&VT_TYPEMASK; @@ -3534,15 +3557,18 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LP rightExtraFlags = V_VT(right)&(~VT_TYPEMASK); if (leftExtraFlags != rightExtraFlags) - return DISP_E_BADVARTYPE; + { + hres = DISP_E_BADVARTYPE; + goto end; + } ExtraFlags = leftExtraFlags; - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); - - /* Native VarPow always returns a error when using any extra flags */ + /* Native VarDiv always returns a error when using any extra flags */ if (ExtraFlags != 0) - return DISP_E_BADVARTYPE; + { + hres = DISP_E_BADVARTYPE; + goto end; + } /* Determine return type */ if (!(rightvt == VT_EMPTY)) @@ -3550,7 +3576,8 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LP if (leftvt == VT_NULL || rightvt == VT_NULL) { V_VT(result) = VT_NULL; - return S_OK; + hres = S_OK; + goto end; } else if (leftvt == VT_DECIMAL || rightvt == VT_DECIMAL) resvt = VT_DECIMAL; @@ -3580,30 +3607,21 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LP else if (leftvt == VT_NULL && rightvt == VT_EMPTY) { V_VT(result) = VT_NULL; - return S_OK; + hres = S_OK; + goto end; } else - return DISP_E_BADVARTYPE; - - VariantInit(&lv); - VariantInit(&rv); + { + hres = DISP_E_BADVARTYPE; + goto end; + } /* coerce to the result type */ hres = VariantChangeType(&lv, left, 0, resvt); - if (hres != S_OK) - { - VariantClear(&lv); - VariantClear(&rv); - return hres; - } + if (hres != S_OK) goto end; hres = VariantChangeType(&rv, right, 0, resvt); - if (hres != S_OK) - { - VariantClear(&lv); - VariantClear(&rv); - return hres; - } + if (hres != S_OK) goto end; /* do the math */ V_VT(result) = resvt; @@ -3642,9 +3660,12 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LP break; } +end: VariantClear(&lv); VariantClear(&rv); - + VariantClear(&tempLeft); + VariantClear(&tempRight); + TRACE("returning 0x%8x (variant type %s)\n", hres, debugstr_VT(result)); return hres; }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarMul.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 01395dec518c0e5bd7b59ee4f82d39a690844ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=01395dec518c0e5bd7b59ee4f… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 2 18:50:41 2007 -0500 oleaut32: Support for VT_DISPATCH in VarMul. --- dlls/oleaut32/variant.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a1102d3..570b299 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3345,6 +3345,7 @@ HRESULT WINAPI VarMul(LPVARIANT left, LP HRESULT hres; VARTYPE lvt, rvt, resvt, tvt; VARIANT lv, rv, tv; + VARIANT tempLeft, tempRight; double r8res; /* Variant priority for coercion. Sorted from lowest to highest. @@ -3374,6 +3375,23 @@ HRESULT WINAPI VarMul(LPVARIANT left, LP VariantInit(&lv); VariantInit(&rv); VariantInit(&tv); + VariantInit(&tempLeft); + VariantInit(&tempRight); + + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(left, &tempLeft); + if (FAILED(hres)) goto end; + left = &tempLeft; + } + if ((V_VT(right) & VT_TYPEMASK) == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(right, &tempRight); + if (FAILED(hres)) goto end; + right = &tempRight; + } + lvt = V_VT(left)&VT_TYPEMASK; rvt = V_VT(right)&VT_TYPEMASK; @@ -3482,6 +3500,8 @@ end: VariantClear(&lv); VariantClear(&rv); VariantClear(&tv); + VariantClear(&tempLeft); + VariantClear(&tempRight); TRACE("returning 0x%8x (variant type %s)\n", hres, debugstr_VT(result)); return hres; }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarAdd.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 308a0b2e183e3f61e9b604d58d7c998b33c7c110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308a0b2e183e3f61e9b604d58… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 2 18:49:59 2007 -0500 oleaut32: Support for VT_DISPATCH in VarAdd. --- dlls/oleaut32/variant.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 899cb92..a1102d3 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3130,6 +3130,7 @@ HRESULT WINAPI VarAdd(LPVARIANT left, LP HRESULT hres; VARTYPE lvt, rvt, resvt, tvt; VARIANT lv, rv, tv; + VARIANT tempLeft, tempRight; double r8res; /* Variant priority for coercion. Sorted from lowest to highest. @@ -3161,6 +3162,26 @@ HRESULT WINAPI VarAdd(LPVARIANT left, LP VariantInit(&lv); VariantInit(&rv); VariantInit(&tv); + VariantInit(&tempLeft); + VariantInit(&tempRight); + + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(left) & VT_TYPEMASK) != VT_NULL && (V_VT(right) & VT_TYPEMASK) != VT_NULL) + { + if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(left, &tempLeft); + if (FAILED(hres)) goto end; + left = &tempLeft; + } + if ((V_VT(right) & VT_TYPEMASK) == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(right, &tempRight); + if (FAILED(hres)) goto end; + right = &tempRight; + } + } + lvt = V_VT(left)&VT_TYPEMASK; rvt = V_VT(right)&VT_TYPEMASK; @@ -3288,6 +3309,8 @@ end: VariantClear(&lv); VariantClear(&rv); VariantClear(&tv); + VariantClear(&tempLeft); + VariantClear(&tempRight); TRACE("returning 0x%8x (variant type %s)\n", hres, debugstr_VT(result)); return hres; }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarAnd.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 97d13c552cc5a5977176002ac539d32f0ae29d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d13c552cc5a5977176002ac… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 2 18:49:17 2007 -0500 oleaut32: Support for VT_DISPATCH in VarAnd. --- dlls/oleaut32/variant.c | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 52193e9..899cb92 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2893,20 +2893,40 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LP VARTYPE leftvt,rightvt; VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; VARIANT varLeft, varRight; + VARIANT tempLeft, tempRight; VariantInit(&varLeft); VariantInit(&varRight); + VariantInit(&tempLeft); + VariantInit(&tempRight); TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(left, &tempLeft); + if (FAILED(hres)) goto VarAnd_Exit; + left = &tempLeft; + } + if ((V_VT(right) & VT_TYPEMASK) == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(right, &tempRight); + if (FAILED(hres)) goto VarAnd_Exit; + right = &tempRight; + } + 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; + { + hres = DISP_E_BADVARTYPE; + goto VarAnd_Exit; + } ExtraFlags = leftExtraFlags; /* Native VarAnd always returns a error when using any extra @@ -2915,7 +2935,10 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LP if ((leftvt == VT_I8 && rightvt == VT_INT) || (leftvt == VT_INT && rightvt == VT_I8) || ExtraFlags != 0) - return DISP_E_BADVARTYPE; + { + hres = DISP_E_BADVARTYPE; + goto VarAnd_Exit; + } /* Determine return type */ else if (leftvt == VT_I8 || rightvt == VT_I8) @@ -2950,7 +2973,10 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LP leftvt == VT_BSTR || rightvt == VT_BSTR) resvt = VT_NULL; else - return DISP_E_BADVARTYPE; + { + hres = DISP_E_BADVARTYPE; + goto VarAnd_Exit; + } if (leftvt == VT_NULL || rightvt == VT_NULL) { @@ -3068,6 +3094,8 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LP VarAnd_Exit: VariantClear(&varLeft); VariantClear(&varRight); + VariantClear(&tempLeft); + VariantClear(&tempRight); return hres; }

1 0

Alex Villacís Lasso : oleaut32: Add wrapper for dereferencing a VARIANT of type VT_DISPATCH and returning the VARIANT value .
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 4245cbb31ce87c5c9368377109849066fcdaa296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4245cbb31ce87c5c936837710… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 2 18:48:10 2007 -0500 oleaut32: Add wrapper for dereferencing a VARIANT of type VT_DISPATCH and returning the VARIANT value. --- dlls/oleaut32/variant.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index f586d8a..52193e9 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2856,6 +2856,22 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LP #undef _VARCMP } +static HRESULT VARIANT_FetchDispatchValue(LPVARIANT pvDispatch, LPVARIANT pValue) +{ + HRESULT hres; + static DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; + + if ((V_VT(pvDispatch) & VT_TYPEMASK) == VT_DISPATCH) { + if (NULL == V_DISPATCH(pvDispatch)) return DISP_E_TYPEMISMATCH; + hres = IDispatch_Invoke(V_DISPATCH(pvDispatch), DISPID_VALUE, &IID_NULL, + LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &emptyParams, pValue, + NULL, NULL); + } else { + hres = DISP_E_TYPEMISMATCH; + } + return hres; +} + /********************************************************************** * VarAnd [OLEAUT32.142] *

1 0

Lei Zhang : comctl32: Add initial tests for the status bar control.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 3a463f039b544ad27ae3b8e8945aacc598f3e8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a463f039b544ad27ae3b8e89… Author: Lei Zhang <thestig(a)google.com> Date: Tue Jan 2 22:23:51 2007 -0800 comctl32: Add initial tests for the status bar control. --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/status.c | 82 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 86d07ce..b879575 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -15,6 +15,7 @@ CTESTS = \ mru.c \ progress.c \ propsheet.c \ + status.c \ string.c \ subclass.c \ tab.c \ diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c new file mode 100644 index 0000000..bfb0e7f --- /dev/null +++ b/dlls/comctl32/tests/status.c @@ -0,0 +1,82 @@ +/* Unit test suite for status control. + * + * Copyright 2007 Google (Lei Zhang) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <windows.h> +#include <commctrl.h> +#include <stdio.h> + +#include "wine/test.h" + +static HINSTANCE hinst; + +static HWND create_status_control(DWORD style, DWORD exstyle) +{ + HWND hWndStatus; + + /* make the control */ + hWndStatus = CreateWindowEx(0, STATUSCLASSNAME, NULL, style, + /* placement */ + 0, 0, 300, 20, + /* parent, etc */ + NULL, NULL, hinst, NULL); + assert (hWndStatus); + return hWndStatus; +} + +static void test_status_control(void) +{ + HWND hWndStatus; + int r; + int nParts[] = {50, 150, -1}; + RECT rc; + + hWndStatus = create_status_control(0, 0); + r = SendMessage(hWndStatus, SB_SETPARTS, 3, (long)nParts); + ok(r == TRUE, "Expected TRUE, got %d\n", r); + r = SendMessage(hWndStatus, SB_SETTEXT, 0, (LPARAM)"First"); + ok(r == TRUE, "Expected TRUE, got %d\n", r); + r = SendMessage(hWndStatus, SB_SETTEXT, 1, (LPARAM)"Second"); + ok(r == TRUE, "Expected TRUE, got %d\n", r); + r = SendMessage(hWndStatus, SB_SETTEXT, 2, (LPARAM)"Third"); + ok(r == TRUE, "Expected TRUE, got %d\n", r); + + r = SendMessage(hWndStatus, SB_GETRECT, 0, (LPARAM)&rc); + ok(r == TRUE, "Expected TRUE, got %d\n", r); + ok(rc.top == 2, "Expected 2, got %d\n", rc.top); + ok(rc.bottom == 21, "Expected 21, got %d\n", rc.bottom); + ok(rc.left == 0, "Expected 0, got %d\n", rc.left); + ok(rc.right == 50, "Expected 50, got %d\n", rc.right); + + r = SendMessage(hWndStatus, SB_GETRECT, -1, (LPARAM)&rc); + ok(r == FALSE, "Expected FALSE, got %d\n", r); + r = SendMessage(hWndStatus, SB_GETRECT, 5, (LPARAM)&rc); + ok(r == FALSE, "Expected FALSE, got %d\n", r); + + DestroyWindow(hWndStatus); +} + +START_TEST(status) +{ + hinst = GetModuleHandleA(NULL); + + InitCommonControls(); + + test_status_control(); +}

1 0

Vijay Kiran Kamuju : comctl32: statusbar: Fix GetRect return value bug.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: c292c40d051a6322347870e98bfbed1d393a2194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c292c40d051a6322347870e98… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Dec 25 15:13:52 2006 +0530 comctl32: statusbar: Fix GetRect return value bug. --- dlls/comctl32/status.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 85f7c6e..719e545 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -433,6 +433,8 @@ static BOOL STATUSBAR_GetRect (STATUS_INFO *infoPtr, INT nPart, LPRECT rect) { TRACE("part %d\n", nPart); + if(nPart >= infoPtr->numParts || nPart < 0) + return FALSE; if (infoPtr->simple) *rect = infoPtr->part0.bound; else

1 0

Stefan Dösinger : wined3d: Select a proper texture unit in LockRect and dirtify the state.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: d0f1c23c936244ae779eb13035b2f217039dfe20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f1c23c936244ae779eb1303… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jan 2 22:55:31 2007 +0100 wined3d: Select a proper texture unit in LockRect and dirtify the state. --- dlls/wined3d/surface.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4e1a0d6..e7991f6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -633,8 +633,15 @@ static HRESULT WINAPI IWineD3DSurfaceImp This->Flags |= SFLAG_ACTIVELOCK; /* When this flag is set to true, loading the surface again won't free THis->resource.allocatedMemory */ /* TODO: make activeLock a bit more intelligent, maybe implement a method to purge the texture memory. */ - /* Make sure that the texture is loaded */ - IWineD3DSurface_PreLoad(iface); /* Make sure there is a texture to bind! */ + /* Make sure that a proper texture unit is selected, bind the texture and dirtify the sampler to restore the texture on the next draw */ + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + ENTER_GL(); + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); + checkGLcall("glActiveTextureARB"); + LEAVE_GL(); + } + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); + IWineD3DSurface_PreLoad(iface); surface_download_data(This); }

1 0

Stefan Dösinger : wined3d: Move the projection matrix into its own state.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 82bd0790ed1c294b96e330d5800e8a54fb81566d URL: http://source.winehq.org/git/wine.git/?a=commit;h=82bd0790ed1c294b96e330d58… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jan 2 22:50:38 2007 +0100 wined3d: Move the projection matrix into its own state. --- dlls/wined3d/drawprim.c | 57 --------------------------- dlls/wined3d/state.c | 100 +++++++++++++++++++++++++++++++++++----------- dlls/wined3d/surface.c | 6 +++ 3 files changed, 82 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82bd0790ed1c294b96e33…

1 0