November 2009 - Wine-commits

André Hentschel : winebuild: Add ARM support.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 27fb36b39e611ff470ca970279671e33e087e155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27fb36b39e611ff470ca97027… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 17 20:20:48 2009 +0100 winebuild: Add ARM support. --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 12 ++++++++++++ tools/winebuild/main.c | 2 ++ tools/winebuild/spec32.c | 7 +++++++ tools/winebuild/utils.c | 26 +++++++++++++++++++++++--- 5 files changed, 45 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index b942934..65163f3 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -119,7 +119,7 @@ typedef struct enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_ALPHA, CPU_POWERPC + CPU_x86, CPU_x86_64, CPU_SPARC, CPU_ALPHA, CPU_POWERPC, CPU_ARM }; enum target_platform diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index bb9d6d1..d41a754 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -699,6 +699,10 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tlda $0,%d($0)\n", pos ); output( "\tjmp $31,($0)\n" ); break; + case CPU_ARM: + output( "\tmov r4, #%s\n", table ); + output( "\tldr r15, [r4, #%d]\n", pos ); + break; case CPU_POWERPC: output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) ); if (target_platform == PLATFORM_APPLE) @@ -1005,6 +1009,11 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjsr $26,%s\n", asm_name("__wine_spec_delay_load") ); output( "\tjmp $31,($0)\n" ); break; + case CPU_ARM: + output( "\tstmfd sp!, {r4, r5, r6, r7, r8, r9, r10, lr}\n" ); + output( "\tblx %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tldmfd sp!, {r4, r5, r6, r7, r8, r9, r10, pc}\n" ); + break; case CPU_POWERPC: if (target_platform == PLATFORM_APPLE) extra_stack_storage = 56; @@ -1088,6 +1097,9 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tldah $0,%d($0)\n", idx); output( "\tjmp $31,%s\n", asm_name("__wine_delay_load_asm") ); break; + case CPU_ARM: + output( "\tb %s\n", asm_name("__wine_delay_load_asm") ); + break; case CPU_POWERPC: switch(target_platform) { diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 4dfa63f..14c1689 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -58,6 +58,8 @@ enum target_cpu target_cpu = CPU_SPARC; enum target_cpu target_cpu = CPU_ALPHA; #elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; +#elif defined(__arm__) +enum target_cpu target_cpu = CPU_ARM; #else #error Unsupported CPU #endif diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 09e69f5..c2b11af 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -37,6 +37,7 @@ #define IMAGE_FILE_MACHINE_ALPHA 0x0184 #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_AMD64 0x8664 +#define IMAGE_FILE_MACHINE_ARM 0x01C0 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 #define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER 240 @@ -369,6 +370,9 @@ static void output_asm_constructor( const char *constructor ) case CPU_ALPHA: output( "\tjsr $26,%s\n", asm_name(constructor) ); break; + case CPU_ARM: + output( "\tblx %s\n", asm_name(constructor) ); + break; case CPU_POWERPC: output( "\tbl %s\n", asm_name(constructor) ); break; @@ -412,6 +416,7 @@ void output_module( DLLSPEC *spec ) case CPU_SPARC: output( "\tjmp 1f\n" ); break; + case CPU_ARM: case CPU_POWERPC: output( "\tb 1f\n" ); break; @@ -434,6 +439,7 @@ void output_module( DLLSPEC *spec ) { case CPU_x86: machine = IMAGE_FILE_MACHINE_I386; break; case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; + case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARM; break; case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; case CPU_ALPHA: machine = IMAGE_FILE_MACHINE_ALPHA; break; case CPU_SPARC: machine = IMAGE_FILE_MACHINE_UNKNOWN; break; @@ -623,6 +629,7 @@ void output_fake_module( DLLSPEC *spec ) case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; case CPU_ALPHA: put_word( IMAGE_FILE_MACHINE_ALPHA ); break; case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_UNKNOWN ); break; + case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARM ); break; } put_word( nb_sections ); /* NumberOfSections */ put_dword( 0 ); /* TimeDateStamp */ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index bbf23f4..c0b9371 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -57,7 +57,8 @@ static const struct { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, { "alpha", CPU_ALPHA }, - { "powerpc", CPU_POWERPC } + { "powerpc", CPU_POWERPC }, + { "arm", CPU_ARM } }; /* atexit handler to clean tmp files */ @@ -795,6 +796,7 @@ unsigned int get_alignment(unsigned int align) case CPU_x86: case CPU_x86_64: case CPU_SPARC: + case CPU_ARM: if (target_platform != PLATFORM_APPLE) return align; /* fall through */ case CPU_POWERPC: @@ -816,6 +818,7 @@ unsigned int get_page_size(void) case CPU_x86: return 4096; case CPU_x86_64: return 4096; case CPU_POWERPC: return 4096; + case CPU_ARM: return 4096; case CPU_SPARC: return 8192; case CPU_ALPHA: return 8192; } @@ -833,6 +836,7 @@ unsigned int get_ptr_size(void) case CPU_POWERPC: case CPU_SPARC: case CPU_ALPHA: + case CPU_ARM: return 4; case CPU_x86_64: return 8; @@ -873,7 +877,15 @@ const char *func_declaration( const char *func ) sprintf( buffer, ".def _%s; .scl 2; .type 32; .endef", func ); break; default: - sprintf( buffer, ".type %s,@function", func ); + switch(target_cpu) + { + case CPU_ARM: + sprintf( buffer, ".type %s,%%function", func ); + break; + default: + sprintf( buffer, ".type %s,@function", func ); + break; + } break; } return buffer; @@ -902,7 +914,15 @@ void output_gnu_stack_note(void) case PLATFORM_APPLE: break; default: - output( "\t.section .note.GNU-stack,\"\",@progbits\n" ); + switch(target_cpu) + { + case CPU_ARM: + output( "\t.section .note.GNU-stack,\"\",%%progbits\n" ); + break; + default: + output( "\t.section .note.GNU-stack,\"\",@progbits\n" ); + break; + } break; } }

1 0

Marcin Baczyński : gdiplus: Add missing declarations for brush.c.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: b60e98191c9942c37cf617cf903b49d295e1de5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b60e98191c9942c37cf617cf9… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Wed Nov 18 00:14:55 2009 +0100 gdiplus: Add missing declarations for brush.c. --- include/gdiplusflat.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 27a7574..9824646 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -350,6 +350,7 @@ GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle,ARGB,ARGB,GpHatch**); GpStatus WINGDIPAPI GdipGetHatchBackgroundColor(GpHatch*,ARGB*); GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch*,ARGB*); +GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch*,HatchStyle*); /* Image */ GpStatus WINGDIPAPI GdipCloneImage(GpImage*, GpImage**); @@ -430,11 +431,18 @@ GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient*,GDIPCONST ARGB*, GDIPCONST REAL*,INT); GpStatus WINGDIPAPI GdipGetLinePresetBlend(GpLineGradient*,ARGB*,REAL*,INT); GpStatus WINGDIPAPI GdipGetLinePresetBlendCount(GpLineGradient*,INT*); +GpStatus WINGDIPAPI GdipResetLineTransform(GpLineGradient*); +GpStatus WINGDIPAPI GdipRotateLineTransform(GpLineGradient*,REAL,GpMatrixOrder); +GpStatus WINGDIPAPI GdipScaleLineTransform(GpLineGradient*,REAL,REAL, + GpMatrixOrder); GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL); +GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient*,GDIPCONST GpMatrix*); GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode); +GpStatus WINGDIPAPI GdipTranslateLineTransform(GpLineGradient*,REAL,REAL, + GpMatrixOrder); /* Matrix */ GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix*,GpMatrix**); @@ -493,6 +501,8 @@ GpStatus WINGDIPAPI GdipGetPathGradientCenterPointI(GpPathGradient*,GpPoint*); GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*); GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient*,BOOL*); GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient*,INT*); +GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient*, + GDIPCONST ARGB*,GDIPCONST REAL*,INT); GpStatus WINGDIPAPI GdipGetPathGradientRect(GpPathGradient*,GpRectF*); GpStatus WINGDIPAPI GdipGetPathGradientRectI(GpPathGradient*,GpRect*); GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient*, @@ -638,9 +648,15 @@ GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage*,GDIPCONST GpImageAttributes*, INT,INT,INT,INT,GpTexture**); GpStatus WINGDIPAPI GdipGetTextureTransform(GpTexture*,GpMatrix*); GpStatus WINGDIPAPI GdipGetTextureWrapMode(GpTexture*, GpWrapMode*); +GpStatus WINGDIPAPI GdipMultiplyTextureTransform(GpTexture*, + GDIPCONST GpMatrix*,GpMatrixOrder); GpStatus WINGDIPAPI GdipResetTextureTransform(GpTexture*); +GpStatus WINGDIPAPI GdipRotateTextureTransform(GpTexture*,REAL,GpMatrixOrder); +GpStatus WINGDIPAPI GdipScaleTextureTransform(GpTexture*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *,GDIPCONST GpMatrix*); GpStatus WINGDIPAPI GdipSetTextureWrapMode(GpTexture*, GpWrapMode); +GpStatus WINGDIPAPI GdipTranslateTextureTransform(GpTexture*,REAL,REAL, + GpMatrixOrder); /* Without wrapper methods */ GpStatus WINGDIPAPI GdipCreateStreamOnFile(GDIPCONST WCHAR*,UINT,IStream**);

1 0

Rob Shearman : oleaut32: Unmarshall byref types correctly in IDispatch_Invoke_Proxy.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 6d7572c0e75227e51022f81b32479421a46a6c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7572c0e75227e51022f81b3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Nov 18 00:16:51 2009 +0000 oleaut32: Unmarshall byref types correctly in IDispatch_Invoke_Proxy. Byref arguments should only be passed in the rgVarRef array, not in arg array. Copy the value into the rgVarRef array before calling the remote function to ensure that memory isn't allocated for the byref pointers during unmarshalling. --- dlls/oleaut32/tests/tmarshal.c | 1 - dlls/oleaut32/usrmarshal.c | 14 +++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index ba28892..7a6c49e 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1364,7 +1364,6 @@ static void test_typelibmarshal(void) ok_ole_success(hr, ITypeInfo_Invoke); ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); ok(V_VT(&vararg[0]) == (VT_UI4|VT_BYREF), "arg VT not unmarshalled correctly: %x\n", V_VT(&vararg[0])); - todo_wine ok(V_UI4REF(&vararg[0]) == &uval, "Byref pointer not preserved: %p/%p\n", &uval, V_UI4REF(&vararg[0])); ok(*V_UI4REF(&vararg[0]) == 42, "Expected 42 to be returned instead of %u\n", *V_UI4REF(&vararg[0])); VariantClear(&varresult); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 3172eba..6ad9bd6 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1180,6 +1180,8 @@ HRESULT CALLBACK IDispatch_Invoke_Proxy( if (V_ISBYREF(arg)) { rgVarRefIdx[cVarRef] = u; VariantInit(&rgVarRef[cVarRef]); + VariantCopy(&rgVarRef[cVarRef], arg); + VariantClear(arg); cVarRef++; } } @@ -1265,6 +1267,12 @@ HRESULT __RPC_STUB IDispatch_Invoke_Stub( } if (SUCCEEDED(hr)) { + /* copy ref args to arg array */ + for (u=0; u<cVarRef; u++) { + unsigned i = rgVarRefIdx[u]; + VariantCopy(&arg[i], &rgVarRef[u]); + } + pDispParams->rgvarg = arg; hr = IDispatch_Invoke(This, @@ -1277,14 +1285,10 @@ HRESULT __RPC_STUB IDispatch_Invoke_Stub( pExcepInfo, pArgErr); - /* copy ref args to out list */ + /* copy ref args from arg array */ for (u=0; u<cVarRef; u++) { unsigned i = rgVarRefIdx[u]; - VariantInit(&rgVarRef[u]); VariantCopy(&rgVarRef[u], &arg[i]); - /* clear original if equal, to avoid double-free */ - if (V_BYREF(&rgVarRef[u]) == V_BYREF(&rgvarg[i])) - VariantClear(&rgvarg[i]); } }

1 0

Rob Shearman : oleaut32: Fix memory leaks in ITypeInfo_fnInvoke.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 99d9983b6146e4b6bc99c2ef1b602ec805dbc96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d9983b6146e4b6bc99c2ef1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Nov 18 00:17:46 2009 +0000 oleaut32: Fix memory leaks in ITypeInfo_fnInvoke. --- dlls/oleaut32/typelib.c | 42 +++++++++++++++------------------ dlls/oleaut32/variant.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.h | 1 + 3 files changed, 80 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 07447f2..bc92f5d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6146,7 +6146,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( else { VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); - hres = VariantCopy(&missing_arg[i], src_arg); + if (wParamFlags & PARAMFLAG_FIN) + hres = VariantCopy(&missing_arg[i], src_arg); V_VARIANTREF(&rgvarg[i]) = &missing_arg[i]; } V_VT(&rgvarg[i]) = rgvt[i]; @@ -6184,8 +6185,10 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) { VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); - V_VT(&missing_arg[i]) = V_VT(src_arg); - hres = VariantChangeType(&missing_arg[i], src_arg, 0, rgvt[i] & ~VT_BYREF); + if (wParamFlags & PARAMFLAG_FIN) + hres = VariantChangeType(&missing_arg[i], src_arg, 0, rgvt[i] & ~VT_BYREF); + else + V_VT(&missing_arg[i]) = rgvt[i] & ~VT_BYREF; V_BYREF(&rgvarg[i]) = &V_NONE(&missing_arg[i]); V_VT(&rgvarg[i]) = rgvt[i]; } @@ -6268,6 +6271,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( for (i = 0; i < func_desc->cParams; i++) { USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; + VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); if (wParamFlags & PARAMFLAG_FLCID) continue; @@ -6286,33 +6290,23 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( hres = VariantCopyInd(pVarResult, prgpvarg[i]); } - /* free data stored in varresult. Note that - * VariantClear doesn't do what we want because we are - * working with byref types. */ - /* FIXME: clear safearrays, bstrs, records and - * variants here too */ - if ((V_VT(prgpvarg[i]) == (VT_UNKNOWN | VT_BYREF)) || - (V_VT(prgpvarg[i]) == (VT_DISPATCH | VT_BYREF))) - { - if(*V_UNKNOWNREF(prgpvarg[i])) - IUnknown_Release(*V_UNKNOWNREF(prgpvarg[i])); - } - break; + VARIANT_ClearInd(prgpvarg[i]); } else if (vargs_converted < pDispParams->cArgs) { + VARIANTARG *arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - vargs_converted]; if (wParamFlags & PARAMFLAG_FOUT) { - VARIANTARG *arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - vargs_converted]; - - if ((rgvt[i] == VT_BYREF) && (V_VT(arg) != VT_BYREF)) + if ((rgvt[i] & VT_BYREF) && !(V_VT(arg) & VT_BYREF)) + { hres = VariantChangeType(arg, &rgvarg[i], 0, V_VT(arg)); - if (FAILED(hres)) - { - ERR("failed to convert param %d to vt %d\n", i, - V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1 - vargs_converted])); - break; + if (FAILED(hres)) + { + ERR("failed to convert param %d to vt %d\n", i, + V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1 - vargs_converted])); + break; + } } } else if (V_VT(prgpvarg[i]) == (VT_VARIANT | VT_ARRAY) && @@ -6351,6 +6345,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( if (wParamFlags & PARAMFLAG_FHASDEFAULT) VariantClear(&rgvarg[i]); } + + VariantClear(&missing_arg[i]); } if ((V_VT(&varresult) == VT_ERROR) && FAILED(V_ERROR(&varresult))) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index e92a63d..cd99814 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -578,6 +578,66 @@ void WINAPI VariantInit(VARIANTARG* pVarg) V_VT(pVarg) = VT_EMPTY; /* Native doesn't set any other fields */ } +HRESULT VARIANT_ClearInd(VARIANTARG *pVarg) +{ + HRESULT hres; + + TRACE("(%p->(%s%s))\n", pVarg, debugstr_VT(pVarg), debugstr_VF(pVarg)); + + hres = VARIANT_ValidateType(V_VT(pVarg)); + if (FAILED(hres)) + return hres; + + switch (V_VT(pVarg)) + { + case VT_DISPATCH: + case VT_UNKNOWN: + if (V_UNKNOWN(pVarg)) + IUnknown_Release(V_UNKNOWN(pVarg)); + break; + case VT_UNKNOWN | VT_BYREF: + case VT_DISPATCH | VT_BYREF: + if(*V_UNKNOWNREF(pVarg)) + IUnknown_Release(*V_UNKNOWNREF(pVarg)); + break; + case VT_BSTR: + SysFreeString(V_BSTR(pVarg)); + break; + case VT_BSTR | VT_BYREF: + SysFreeString(*V_BSTRREF(pVarg)); + break; + case VT_VARIANT | VT_BYREF: + VariantClear(V_VARIANTREF(pVarg)); + break; + case VT_RECORD: + case VT_RECORD | VT_BYREF: + { + struct __tagBRECORD* pBr = &V_UNION(pVarg,brecVal); + if (pBr->pRecInfo) + { + IRecordInfo_RecordClear(pBr->pRecInfo, pBr->pvRecord); + IRecordInfo_Release(pBr->pRecInfo); + } + break; + } + default: + if (V_ISARRAY(pVarg) || (V_VT(pVarg) & ~VT_BYREF) == VT_SAFEARRAY) + { + if (V_ISBYREF(pVarg)) + { + if (*V_ARRAYREF(pVarg)) + hres = SafeArrayDestroy(*V_ARRAYREF(pVarg)); + } + else if (V_ARRAY(pVarg)) + hres = SafeArrayDestroy(V_ARRAY(pVarg)); + } + break; + } + + V_VT(pVarg) = VT_EMPTY; + return hres; +} + /****************************************************************************** * VariantClear [OLEAUT32.9] * diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index c881b24..265fcc8 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -126,3 +126,4 @@ typedef struct tagVARIANT_NUMBER_CHARS BOOL VARIANT_GetLocalisedText(LANGID, DWORD, WCHAR *); +HRESULT VARIANT_ClearInd(VARIANTARG *);

1 0

Henri Verbeet : d3d9: Add a separate function for device initialization.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: b9243b721a6c747986003c76463b4bd7b3a50208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9243b721a6c747986003c764… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 10:45:50 2009 +0100 d3d9: Add a separate function for device initialization. --- dlls/d3d9/d3d9_private.h | 12 +---- dlls/d3d9/device.c | 112 ++++++++++++++++++++++++++++++++++++++++++- dlls/d3d9/directx.c | 119 +++++++--------------------------------------- 3 files changed, 130 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9243b721a6c747986003…

1 0

Henri Verbeet : d3d9: Move D3D9CB_DestroySwapChain() to device.c.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 434a23d90dfeefb31522e2cb3f051557c9f5f375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=434a23d90dfeefb31522e2cb3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 10:45:51 2009 +0100 d3d9: Move D3D9CB_DestroySwapChain() to device.c. --- dlls/d3d9/d3d9_private.h | 4 ---- dlls/d3d9/device.c | 11 +++++++++++ dlls/d3d9/directx.c | 10 ---------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 042a394..cbe5d80 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -563,8 +563,4 @@ typedef struct IDirect3DQuery9Impl { LPDIRECT3DDEVICE9EX parentDevice; } IDirect3DQuery9Impl; - -/* Callbacks */ -extern ULONG WINAPI D3D9CB_DestroySwapChain (IWineD3DSwapChain *pSwapChain) DECLSPEC_HIDDEN; - #endif /* __WINE_D3D9_PRIVATE_H */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 653395e..1151d99 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -181,6 +181,17 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static ULONG WINAPI D3D9CB_DestroySwapChain(IWineD3DSwapChain *swapchain) +{ + IDirect3DSwapChain9Impl *parent; + + TRACE("swapchain %p.\n", swapchain); + + IWineD3DSwapChain_GetParent(swapchain, (IUnknown **)&parent); + parent->isImplicit = FALSE; + return IDirect3DSwapChain9_Release((IDirect3DSwapChain9 *)parent); +} + /* IDirect3D IUnknown parts follow: */ static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(LPDIRECT3DDEVICE9EX iface, REFIID riid, LPVOID* ppobj) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 18c9955..9395381 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -407,16 +407,6 @@ static HMONITOR WINAPI IDirect3D9Impl_GetAdapterMonitor(LPDIRECT3D9EX iface, UIN return ret; } -ULONG WINAPI D3D9CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) { - IDirect3DSwapChain9Impl* swapChainParent; - TRACE("(%p) call back\n", pSwapChain); - - IWineD3DSwapChain_GetParent(pSwapChain,(IUnknown **) &swapChainParent); - swapChainParent->isImplicit = FALSE; - /* Swap chain had refcount of 0 GetParent addrefed to 1, so 1 Release is enough */ - return IDirect3DSwapChain9_Release((IDirect3DSwapChain9*) swapChainParent); -} - static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(IDirect3D9Ex *iface, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, IDirect3DDevice9 **device)

1 0

Juan Lang : crypt32: Apply name constraints to subject name.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: e4c03521accd128a3f4d70519116879e00bde1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c03521accd128a3f4d70519… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 13:33:35 2009 -0800 crypt32: Apply name constraints to subject name. --- dlls/crypt32/chain.c | 46 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 14e716a..0d9a66d 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -865,6 +865,36 @@ static void compare_alt_name_with_constraints(const CERT_EXTENSION *altNameExt, CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; } +static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + DWORD i; + + for (i = 0; i < nameConstraints->cExcludedSubtree; i++) + { + CERT_ALT_NAME_ENTRY *constraint = + &nameConstraints->rgExcludedSubtree[i].Base; + + if (constraint->dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME && + directory_name_matches(&constraint->u.DirectoryName, subjectName)) + *trustErrorStatus |= + CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + } + for (i = 0; i < nameConstraints->cPermittedSubtree; i++) + { + CERT_ALT_NAME_ENTRY *constraint = + &nameConstraints->rgPermittedSubtree[i].Base; + + if (constraint->dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME) + { + if (!directory_name_matches(&constraint->u.DirectoryName, + subjectName)) + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + } + } +} + static void CRYPT_CheckNameConstraints( const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, const CERT_INFO *cert, DWORD *trustErrorStatus) @@ -874,15 +904,13 @@ static void CRYPT_CheckNameConstraints( if (ext) compare_alt_name_with_constraints(ext, nameConstraints, trustErrorStatus); - else - { - if (nameConstraints->cPermittedSubtree) - *trustErrorStatus |= - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; - if (nameConstraints->cExcludedSubtree) - *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; - } + /* Name constraints apply to the subject alternative name as well as the + * subject name. From RFC 5280, section 4.2.1.10: + * "Restrictions apply to the subject distinguished name and apply to + * subject alternative names." + */ + compare_subject_with_constraints(&cert->Subject, nameConstraints, + trustErrorStatus); } /* Gets cert's name constraints, if any. Free with LocalFree. */

1 0

Juan Lang : crypt32: Check email address in subject name against rfc822 name constraints.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: d6f7d06cad28ebd28a98ea07e4d51abb208f711a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f7d06cad28ebd28a98ea07e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 13:34:00 2009 -0800 crypt32: Check email address in subject name against rfc822 name constraints. --- dlls/crypt32/chain.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 0d9a66d..a5b4141 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -865,11 +865,118 @@ static void compare_alt_name_with_constraints(const CERT_EXTENSION *altNameExt, CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; } +static BOOL rfc822_attr_matches_excluded_name(const CERT_RDN_ATTR *attr, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + DWORD i; + BOOL match = FALSE; + + for (i = 0; !match && i < nameConstraints->cExcludedSubtree; i++) + { + const CERT_ALT_NAME_ENTRY *constraint = + &nameConstraints->rgExcludedSubtree[i].Base; + + if (constraint->dwAltNameChoice == CERT_ALT_NAME_RFC822_NAME) + match = rfc822_name_matches(constraint->u.pwszRfc822Name, + (LPCWSTR)attr->Value.pbData, trustErrorStatus); + } + return match; +} + +static BOOL rfc822_attr_matches_permitted_name(const CERT_RDN_ATTR *attr, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus, + BOOL *present) +{ + DWORD i; + BOOL match = FALSE; + + for (i = 0; !match && i < nameConstraints->cPermittedSubtree; i++) + { + const CERT_ALT_NAME_ENTRY *constraint = + &nameConstraints->rgPermittedSubtree[i].Base; + + if (constraint->dwAltNameChoice == CERT_ALT_NAME_RFC822_NAME) + { + *present = TRUE; + match = rfc822_name_matches(constraint->u.pwszRfc822Name, + (LPCWSTR)attr->Value.pbData, trustErrorStatus); + } + } + return match; +} + +static void compare_subject_with_email_constraints( + const CERT_NAME_BLOB *subjectName, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + CERT_NAME_INFO *name; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_UNICODE_NAME, + subjectName->pbData, subjectName->cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, &name, &size)) + { + DWORD i, j; + + for (i = 0; i < name->cRDN; i++) + for (j = 0; j < name->rgRDN[i].cRDNAttr; j++) + if (!strcmp(name->rgRDN[i].rgRDNAttr[j].pszObjId, + szOID_RSA_emailAddr)) + { + BOOL nameFormPresent; + + /* A name constraint only applies if the name form is + * present. From RFC 5280, section 4.2.1.10: + * "Restrictions apply only when the specified name form is + * present. If no name of the type is in the certificate, + * the certificate is acceptable." + */ + if (rfc822_attr_matches_excluded_name( + &name->rgRDN[i].rgRDNAttr[j], nameConstraints, + trustErrorStatus)) + *trustErrorStatus |= + CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + nameFormPresent = FALSE; + if (!rfc822_attr_matches_permitted_name( + &name->rgRDN[i].rgRDNAttr[j], nameConstraints, + trustErrorStatus, &nameFormPresent) && nameFormPresent) + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + } + LocalFree(name); + } + else + *trustErrorStatus |= + CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; +} + static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName, const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) { + BOOL hasEmailConstraint = FALSE; DWORD i; + /* In general, a subject distinguished name only matches a directory name + * constraint. However, an exception exists for email addresses. + * From RFC 5280, section 4.2.1.6: + * "Legacy implementations exist where an electronic mail address is + * embedded in the subject distinguished name as an emailAddress + * attribute [RFC2985]." + * If an email address constraint exists, check that constraint separately. + */ + for (i = 0; !hasEmailConstraint && i < nameConstraints->cExcludedSubtree; + i++) + if (nameConstraints->rgExcludedSubtree[i].Base.dwAltNameChoice == + CERT_ALT_NAME_RFC822_NAME) + hasEmailConstraint = TRUE; + for (i = 0; !hasEmailConstraint && i < nameConstraints->cPermittedSubtree; + i++) + if (nameConstraints->rgPermittedSubtree[i].Base.dwAltNameChoice == + CERT_ALT_NAME_RFC822_NAME) + hasEmailConstraint = TRUE; + if (hasEmailConstraint) + compare_subject_with_email_constraints(subjectName, nameConstraints, + trustErrorStatus); for (i = 0; i < nameConstraints->cExcludedSubtree; i++) { CERT_ALT_NAME_ENTRY *constraint =

1 0

Juan Lang : crypt32: Accept a certificate if its name matches any permitted subtree of a name constraint .
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: c464875a6d7465fddb14239f7b35bb4ca099019e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c464875a6d7465fddb14239f7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 13:57:25 2009 -0800 crypt32: Accept a certificate if its name matches any permitted subtree of a name constraint. --- dlls/crypt32/chain.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index a5b4141..72f5e24 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -987,18 +987,21 @@ static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName, *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; } - for (i = 0; i < nameConstraints->cPermittedSubtree; i++) + if (nameConstraints->cPermittedSubtree) { - CERT_ALT_NAME_ENTRY *constraint = - &nameConstraints->rgPermittedSubtree[i].Base; + BOOL match = FALSE; - if (constraint->dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME) + for (i = 0; !match && i < nameConstraints->cPermittedSubtree; i++) { - if (!directory_name_matches(&constraint->u.DirectoryName, - subjectName)) - *trustErrorStatus |= - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + CERT_ALT_NAME_ENTRY *constraint = + &nameConstraints->rgPermittedSubtree[i].Base; + + if (constraint->dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME) + match = directory_name_matches(&constraint->u.DirectoryName, + subjectName); } + if (!match) + *trustErrorStatus |= CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; } }

1 0

Juan Lang : crypt32: Don' t apply directory name constraints to an empty subject name.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: a63affe5e0127c3e21898fff23167d0d096e2585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63affe5e0127c3e21898fff2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 13:57:52 2009 -0800 crypt32: Don't apply directory name constraints to an empty subject name. --- dlls/crypt32/chain.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 72f5e24..df94523 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -950,6 +950,22 @@ static void compare_subject_with_email_constraints( CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; } +static BOOL CRYPT_IsEmptyName(const CERT_NAME_BLOB *name) +{ + BOOL empty; + + if (!name->cbData) + empty = TRUE; + else if (name->cbData == 2 && name->pbData[1] == 0) + { + /* An empty sequence is also empty */ + empty = TRUE; + } + else + empty = FALSE; + return empty; +} + static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName, const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) { @@ -987,7 +1003,13 @@ static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName, *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; } - if (nameConstraints->cPermittedSubtree) + /* RFC 5280, section 4.2.1.10: + * "Restrictions apply only when the specified name form is present. + * If no name of the type is in the certificate, the certificate is + * acceptable." + * An empty name can't have the name form present, so don't check it. + */ + if (nameConstraints->cPermittedSubtree && !CRYPT_IsEmptyName(subjectName)) { BOOL match = FALSE;

1 0