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

Huw Davies : gdi32: Move the release until after the final dc access.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: d4d65e2df9c465f02a06ca91c847dd575c0df6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d65e2df9c465f02a06ca91c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:33 2016 +0100 gdi32: Move the release until after the final dc access. Also only reselect the font if the graphics mode changes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 59a3d9b..3b6c2ea 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1037,9 +1037,9 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) ret = dc->GraphicsMode; dc->GraphicsMode = mode; } - release_dc_ptr( dc ); /* font metrics depend on the graphics mode */ - if (ret) SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); + if (ret != mode) SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); + release_dc_ptr( dc ); return ret; }

1 0

Huw Davies : gdi32: Where possible directly access the DC instead of using GetCurrentObject() .
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: aa4934783fb213c781e7ea4e5d54782ec5e570e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4934783fb213c781e7ea4e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:34 2016 +0100 gdi32: Where possible directly access the DC instead of using GetCurrentObject(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/enhmfdrv/objects.c | 6 ++++-- dlls/gdi32/font.c | 2 +- dlls/gdi32/palette.c | 3 ++- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3b6c2ea..92a98df 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -354,8 +354,8 @@ void DC_UpdateXforms( DC *dc ) if (memcmp(&oldworld2vport, &dc->xformWorld2Vport, sizeof(oldworld2vport)) && !GdiIsMetaFileDC(dc->hSelf)) { - SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); - SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_PEN)); + SelectObject(dc->hSelf, dc->hFont); + SelectObject(dc->hSelf, dc->hPen); } } @@ -1038,7 +1038,7 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) dc->GraphicsMode = mode; } /* font metrics depend on the graphics mode */ - if (ret != mode) SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); + if (ret != mode) SelectObject(dc->hSelf, dc->hFont); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d052e04..18e109e 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -390,9 +390,9 @@ static INT nulldrv_GetTextFace( PHYSDEV dev, INT size, LPWSTR name ) { INT ret = 0; LOGFONTW font; - HFONT hfont = GetCurrentObject( dev->hdc, OBJ_FONT ); + DC *dc = get_nulldrv_dc( dev ); - if (GetObjectW( hfont, sizeof(font), &font )) + if (GetObjectW( dc->hFont, sizeof(font), &font )) { ret = strlenW( font.lfFaceName ) + 1; if (name) diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index a8f6fb5..9bf79e4 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -463,10 +463,11 @@ found: COLORREF EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) { EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); + DC *dc = get_physdev_dc( dev ); EMRSELECTOBJECT emr; DWORD index; - if (GetCurrentObject( dev->hdc, OBJ_BRUSH ) != GetStockObject( DC_BRUSH )) return color; + if (dc->hBrush != GetStockObject( DC_BRUSH )) return color; if (physDev->dc_brush) DeleteObject( physDev->dc_brush ); if (!(physDev->dc_brush = CreateSolidBrush( color ))) return CLR_INVALID; @@ -484,11 +485,12 @@ COLORREF EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) COLORREF EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) { EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); + DC *dc = get_physdev_dc( dev ); EMRSELECTOBJECT emr; DWORD index; LOGPEN logpen = { PS_SOLID, { 0, 0 }, color }; - if (GetCurrentObject( dev->hdc, OBJ_PEN ) != GetStockObject( DC_PEN )) return color; + if (dc->hPen != GetStockObject( DC_PEN )) return color; if (physDev->dc_pen) DeleteObject( physDev->dc_pen ); if (!(physDev->dc_pen = CreatePenIndirect( &logpen ))) return CLR_INVALID; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index afeebb8..0dad024 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2269,7 +2269,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, } GetTextMetricsW(hdc, &tm); - GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf); + GetObjectW(dc->hFont, sizeof(lf), &lf); if(!(tm.tmPitchAndFamily & TMPF_VECTOR)) /* Non-scalable fonts shouldn't be rotated */ lf.lfEscapement = 0; diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index be84b71..a8135d5 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -503,6 +503,7 @@ UINT WINAPI GetNearestPaletteIndex( COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) { unsigned char spec_type; + DC *dc = get_nulldrv_dc( dev ); if (!(GetDeviceCaps( dev->hdc, RASTERCAPS ) & RC_PALETTE)) return color; @@ -512,7 +513,7 @@ COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) /* we need logical palette for PALETTERGB and PALETTEINDEX colorrefs */ UINT index; PALETTEENTRY entry; - HPALETTE hpal = GetCurrentObject( dev->hdc, OBJ_PAL ); + HPALETTE hpal = dc->hPalette; if (!hpal) hpal = GetStockObject( DEFAULT_PALETTE ); if (spec_type == 2) /* PALETTERGB */

1 0

Huw Davies : gdi32: Access several more properties directly from the DC.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 199ca9258a966b0fe4e164a91f327004223645dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=199ca9258a966b0fe4e164a91… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:35 2016 +0100 gdi32: Access several more properties directly from the DC. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 6 +++--- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/enhmfdrv/graphics.c | 35 ++++++++++++++++++++--------------- dlls/gdi32/font.c | 18 ++++++++++-------- dlls/gdi32/painting.c | 9 ++++++--- 5 files changed, 41 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=199ca9258a966b0fe4e16…

1 0

Huw Davies : gdi32: Convert a few uses of get_dc_ptr() to get_physdev_dc() .
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 0f2a776a59006a15fb84a2a51237d3484f136966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2a776a59006a15fb84a2a51… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:36 2016 +0100 gdi32: Convert a few uses of get_dc_ptr() to get_physdev_dc(). In these cases we have the PHYSDEV meaning we own the DC already. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 11 ++--------- dlls/gdi32/enhmfdrv/dc.c | 13 ++++--------- dlls/gdi32/freetype.c | 4 +--- dlls/gdi32/path.c | 6 ++---- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index ebed7af..3a8f0f4 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -250,7 +250,7 @@ void get_mono_dc_colors( DC *dc, BITMAPINFO *info, int count ) BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) { - DC *dc_src, *dc_dst = get_nulldrv_dc( dst_dev ); + DC *dc_src = get_physdev_dc( src_dev ), *dc_dst = get_nulldrv_dc( dst_dev ); char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; @@ -258,13 +258,9 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, DWORD err; struct gdi_image_bits bits; - if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); if (src_dev->funcs->pGetImage( src_dev, src_info, &bits, src )) - { - release_dc_ptr( dc_src ); return FALSE; - } dst_dev = GET_DC_PHYSDEV( dc_dst, pPutImage ); copy_bitmapinfo( dst_info, src_info ); @@ -305,7 +301,6 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } if (bits.free) bits.free( &bits ); - release_dc_ptr( dc_src ); return !err; } @@ -313,7 +308,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func ) { - DC *dc_src, *dc_dst = get_nulldrv_dc( dst_dev ); + DC *dc_src = get_physdev_dc( src_dev ), *dc_dst = get_nulldrv_dc( dst_dev ); char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; @@ -321,7 +316,6 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, DWORD err; struct gdi_image_bits bits; - if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); err = src_dev->funcs->pGetImage( src_dev, src_info, &bits, src ); if (err) goto done; @@ -345,7 +339,6 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, if (bits.free) bits.free( &bits ); done: - release_dc_ptr( dc_src ); if (err) SetLastError( err ); return !err; } diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 00f4d65..64c6136 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -52,7 +52,7 @@ BOOL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRestoreDC ); EMFDRV_PDEVICE* physDev = get_emf_physdev( dev ); - DC *dc = get_dc_ptr( dev->hdc ); + DC *dc = get_physdev_dc( dev ); EMRRESTOREDC emr; BOOL ret; @@ -63,7 +63,6 @@ BOOL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) emr.iRelative = level; else emr.iRelative = level - dc->saveLevel - 1; - release_dc_ptr( dc ); physDev->restoring++; ret = next->funcs->pRestoreDC( next, level ); @@ -433,7 +432,7 @@ BOOL EMFDRV_BeginPath( PHYSDEV dev ) EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pBeginPath ); EMRBEGINPATH emr; - DC *dc; + DC *dc = get_physdev_dc( dev ); emr.emr.iType = EMR_BEGINPATH; emr.emr.nSize = sizeof(emr); @@ -442,10 +441,8 @@ BOOL EMFDRV_BeginPath( PHYSDEV dev ) if (physDev->path) return TRUE; /* already open */ if (!next->funcs->pBeginPath( next )) return FALSE; - dc = get_dc_ptr( dev->hdc ); push_dc_driver( &dc->physDev, &physDev->pathdev, &emfpath_driver ); physDev->path = TRUE; - release_dc_ptr( dc ); return TRUE; } @@ -519,10 +516,9 @@ static BOOL emfpathdrv_AbortPath( PHYSDEV dev ) { PHYSDEV emfdev = get_emfdev( dev ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pAbortPath ); - DC *dc = get_dc_ptr( dev->hdc ); + DC *dc = get_physdev_dc( dev ); emfpath_driver.pDeleteDC( pop_dc_driver( dc, &emfpath_driver )); - release_dc_ptr( dc ); emfdev->funcs->pAbortPath( emfdev ); return next->funcs->pAbortPath( next ); } @@ -641,10 +637,9 @@ static BOOL emfpathdrv_EndPath( PHYSDEV dev ) { PHYSDEV emfdev = get_emfdev( dev ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pEndPath ); - DC *dc = get_dc_ptr( dev->hdc ); + DC *dc = get_physdev_dc( dev ); emfpath_driver.pDeleteDC( pop_dc_driver( dc, &emfpath_driver )); - release_dc_ptr( dc ); emfdev->funcs->pEndPath( emfdev ); return next->funcs->pEndPath( next ); } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f8b4235..5ddfc6a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5322,14 +5322,13 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) CHARSETINFO csi; FMAT2 dcmat; FontSubst *psub = NULL; - DC *dc = get_dc_ptr( dev->hdc ); + DC *dc = get_physdev_dc( dev ); const SYSTEM_LINKS *font_link; if (!hfont) /* notification that the font has been changed by another driver */ { release_font( physdev->font ); physdev->font = NULL; - release_dc_ptr( dc ); return 0; } @@ -5779,7 +5778,6 @@ done: physdev->font = ret; } LeaveCriticalSection( &freetype_cs ); - release_dc_ptr( dc ); return ret ? hfont : 0; } diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 4ae9ba2..51334b2 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -767,10 +767,9 @@ static BOOL pathdrv_BeginPath( PHYSDEV dev ) */ static BOOL pathdrv_AbortPath( PHYSDEV dev ) { - DC *dc = get_dc_ptr( dev->hdc ); + DC *dc = get_physdev_dc( dev ); path_driver.pDeleteDC( pop_dc_driver( dc, &path_driver )); - release_dc_ptr( dc ); return TRUE; } @@ -781,12 +780,11 @@ static BOOL pathdrv_AbortPath( PHYSDEV dev ) static BOOL pathdrv_EndPath( PHYSDEV dev ) { struct path_physdev *physdev = get_path_physdev( dev ); - DC *dc = get_dc_ptr( dev->hdc ); + DC *dc = get_physdev_dc( dev ); dc->path = physdev->path; pop_dc_driver( dc, &path_driver ); HeapFree( GetProcessHeap(), 0, physdev ); - release_dc_ptr( dc ); return TRUE; }

1 0

Jacek Caban : jscript: Store function arguments on JS stack and transfer them to variable object only when needed.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 5e4d3826ece2c4816fb9fd6ee163d904068fcb1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4d3826ece2c4816fb9fd6ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 18:44:43 2016 +0200 jscript: Store function arguments on JS stack and transfer them to variable object only when needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 133 ++++++++++++++++++++++++++++++++++++++++-------- dlls/jscript/engine.h | 9 +++- dlls/jscript/function.c | 83 +++++++++++------------------- dlls/jscript/global.c | 4 +- dlls/jscript/jscript.c | 4 +- 5 files changed, 155 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e4d3826ece2c4816fb9f…

1 0

Jacek Caban : jscipt: Use passed copy of arguments if they are alread at the top of the stack.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: b0dcbbdbee2bfa0d4d0fab1d6ff21cb04e5eb596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0dcbbdbee2bfa0d4d0fab1d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 18:44:57 2016 +0200 jscipt: Use passed copy of arguments if they are alread at the top of the stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index acdeb85..2c44112 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2591,19 +2591,25 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc, jsval_t *argv) { + const unsigned orig_stack = ctx->stack_top; unsigned i; jsval_t v; HRESULT hres; - frame->arguments_off = ctx->stack_top; - - for(i = 0; i < argc; i++) { - hres = jsval_copy(argv[i], &v); - if(SUCCEEDED(hres)) - hres = stack_push(ctx, v); - if(FAILED(hres)) { - stack_popn(ctx, i); - return hres; + /* If arguments are already on the stack, we may use them. */ + if(argv + argc == ctx->stack + ctx->stack_top) { + frame->arguments_off = argv - ctx->stack; + i = argc; + }else { + frame->arguments_off = ctx->stack_top; + for(i = 0; i < argc; i++) { + hres = jsval_copy(argv[i], &v); + if(SUCCEEDED(hres)) + hres = stack_push(ctx, v); + if(FAILED(hres)) { + stack_popn(ctx, i); + return hres; + } } } @@ -2611,12 +2617,12 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc for(; i < frame->function->param_cnt; i++) { hres = stack_push(ctx, jsval_undefined()); if(FAILED(hres)) { - stack_popn(ctx, i); + stack_popn(ctx, ctx->stack_top - orig_stack); return hres; } } - frame->pop_locals = i; + frame->pop_locals = ctx->stack_top - orig_stack; frame->base_scope->frame = frame; return S_OK; }

1 0

Jacek Caban : jscript: Fixed potential leak in RegExp lastIndex setter.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 9fc2863ebd87f3ec06c238009a98672a42acc7b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc2863ebd87f3ec06c238009… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 18:45:05 2016 +0200 jscript: Fixed potential leak in RegExp lastIndex setter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsregexp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 9f74e50..a47da1f 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -335,6 +335,7 @@ static HRESULT RegExp_set_lastIndex(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t TRACE("\n"); + jsval_release(regexp->last_index_val); hres = jsval_copy(value, &regexp->last_index_val); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Set output to undefined in jsval_copy on failure.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: e641469f9ffb48a33712147a884f3f1f071dbd40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e641469f9ffb48a33712147a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 18:45:13 2016 +0200 jscript: Set output to undefined in jsval_copy on failure. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 4 +--- dlls/jscript/jsutils.c | 8 ++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 538219e..cbfcc85 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -491,10 +491,8 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val, IServi TRACE("%s = %s\n", debugstr_w(prop->name), debugstr_jsval(val)); hres = jsval_copy(val, &prop->u.val); - if(FAILED(hres)) { - prop->u.val = jsval_undefined(); + if(FAILED(hres)) return hres; - } if(This->builtin_info->on_put) This->builtin_info->on_put(This, prop->name); diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index dd79510..e7100ba 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -212,13 +212,17 @@ static HRESULT jsval_variant(jsval_t *val, VARIANT *var) __JSVAL_TYPE(*val) = JSV_VARIANT; __JSVAL_VAR(*val) = v = heap_alloc(sizeof(VARIANT)); - if(!v) + if(!v) { + *val = jsval_undefined(); return E_OUTOFMEMORY; + } V_VT(v) = VT_EMPTY; hres = VariantCopy(v, var); - if(FAILED(hres)) + if(FAILED(hres)) { + *val = jsval_undefined(); heap_free(v); + } return hres; }

1 0

Alistair Leslie-Hughes : d3dx10: Add D3DXCpuOptimizations stub.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: e09f404bd0f873b03f9c087bf6555c542a024359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e09f404bd0f873b03f9c087bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 26 07:53:07 2016 +0000 d3dx10: Add D3DXCpuOptimizations stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 10 +++++++-- include/Makefile.in | 1 + include/d3dx10.h | 1 + include/d3dx10math.h | 45 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index ab696e8..f410be8 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -70,7 +70,7 @@ @ stdcall D3DXColorAdjustSaturation(ptr ptr float) d3dx9_36.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingSphere -@ stub D3DXCpuOptimizations(long) +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateMatrixStack(long ptr) d3dx9_36.D3DXCreateMatrixStack @ stdcall D3DXFloat16To32Array(ptr ptr long) d3dx9_36.D3DXFloat16To32Array @ stdcall D3DXFloat32To16Array(ptr ptr long) d3dx9_36.D3DXFloat32To16Array diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 0c1ff80..7308373 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -34,8 +34,7 @@ #include "objbase.h" #include "d3d10_1.h" -#include "d3dx10core.h" -#include "d3dx10tex.h" +#include "d3dx10.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -210,3 +209,10 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat return E_NOTIMPL; } + +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) +{ + FIXME("enable %#x stub.\n", enable); + + return D3DX_NOT_OPTIMIZED; +} diff --git a/include/Makefile.in b/include/Makefile.in index 9c20f28a..4aaefaf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -256,6 +256,7 @@ HEADER_SRCS = \ d3dvec.inl \ d3dx10.h \ d3dx10async.h \ + d3dx10math.h \ d3dx10tex.h \ d3dx11.h \ d3dx11async.h \ diff --git a/include/d3dx10.h b/include/d3dx10.h index dd423a5..fb48723 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -27,6 +27,7 @@ #define DXGI_FORMAT_FROM_FILE ((DXGI_FORMAT)0xfffffffdu) #include "d3d10.h" +#include "d3dx10math.h" #include "d3dx10core.h" #include "d3dx10async.h" #include "d3dx10tex.h" diff --git a/include/d3dx10math.h b/include/d3dx10math.h new file mode 100644 index 0000000..a96784b --- /dev/null +++ b/include/d3dx10math.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2016 Alistair Leslie-Hughes + * + * 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 "d3dx10.h" + +/* This guard is the same as D3DX9 to prevent double-inclusion */ +#ifndef __D3DX9MATH_H__ +#define __D3DX9MATH_H__ + +#include <math.h> + +typedef enum _D3DX_CPU_OPTIMIZATION +{ + D3DX_NOT_OPTIMIZED, + D3DX_3DNOW_OPTIMIZED, + D3DX_SSE2_OPTIMIZED, + D3DX_SSE_OPTIMIZED +} D3DX_CPU_OPTIMIZATION; + +#ifdef __cplusplus +extern "C" { +#endif + +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable); + +#ifdef __cplusplus +} +#endif + +#endif /* __D3DX9MATH_H__ */

1 0

Nikolay Sivov : rpcrt4: Added NdrAsyncServerCall stub.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 858064abf694877de6b6558e5074bcee508cdbe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858064abf694877de6b6558e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 18:17:16 2016 +0300 rpcrt4: Added NdrAsyncServerCall stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 5 +++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index f5a6bab..92a3665 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1850,3 +1850,8 @@ RPCRTAPI LONG RPC_ENTRY NdrAsyncStubCall(struct IRpcStubBuffer* pThis, FIXME("unimplemented, expect crash!\n"); return 0; } + +void RPC_ENTRY NdrAsyncServerCall(PRPC_MESSAGE pRpcMsg) +{ + FIXME("unimplemented, %p\n", pRpcMsg); +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index f85d263..0fe9d65 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -117,7 +117,7 @@ @ stub NDRcopy @ stdcall NdrAllocate(ptr long) @ varargs NdrAsyncClientCall(ptr ptr) -@ stub NdrAsyncServerCall +@ stdcall NdrAsyncServerCall(ptr) @ stdcall NdrAsyncStubCall(ptr ptr ptr ptr) @ stdcall NdrByteCountPointerBufferSize(ptr ptr ptr) @ stdcall NdrByteCountPointerFree(ptr ptr ptr)

1 0