wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Jacek Caban : jscript: Always alloc the first chunk of code buffer.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 11453b2414a3cde94887afa56fe6e26ca4f13027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11453b2414a3cde94887afa56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 2 11:45:54 2012 +0100 jscript: Always alloc the first chunk of code buffer. --- dlls/jscript/compile.c | 43 ++++++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 60b0c2e..268c3b0 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -150,12 +150,7 @@ static unsigned push_instr(compiler_ctx_t *ctx, jsop_t op) { assert(ctx->code_size >= ctx->code_off); - if(!ctx->code_size) { - ctx->code->instrs = heap_alloc(64 * sizeof(instr_t)); - if(!ctx->code->instrs) - return -1; - ctx->code_size = 64; - }else if(ctx->code_size == ctx->code_off) { + if(ctx->code_size == ctx->code_off) { instr_t *new_instrs; new_instrs = heap_realloc(ctx->code->instrs, ctx->code_size*2*sizeof(instr_t)); @@ -1647,22 +1642,36 @@ void release_compiler(compiler_ctx_t *ctx) static HRESULT init_compiler(parser_ctx_t *parser) { - if(!parser->code) { - parser->code = heap_alloc_zero(sizeof(bytecode_t)); - if(!parser->code) - return E_OUTOFMEMORY; - jsheap_init(&parser->code->heap); + compiler_ctx_t *compiler; + + if(parser->compiler) + return S_OK; + + compiler = heap_alloc_zero(sizeof(*compiler)); + if(!compiler) + return E_OUTOFMEMORY; + + compiler->code = heap_alloc_zero(sizeof(bytecode_t)); + if(!compiler->code) { + release_compiler(compiler); + return E_OUTOFMEMORY; } - if(!parser->compiler) { - parser->compiler = heap_alloc_zero(sizeof(compiler_ctx_t)); - if(!parser->compiler) - return E_OUTOFMEMORY; + jsheap_init(&compiler->code->heap); - parser->compiler->parser = parser; - parser->compiler->code = parser->code; + compiler->code->instrs = heap_alloc(64 * sizeof(instr_t)); + if(!compiler->code->instrs) { + release_bytecode(compiler->code); + release_compiler(compiler); + return E_OUTOFMEMORY; } + compiler->code_size = 64; + + compiler->parser = parser; + + parser->code = compiler->code; + parser->compiler = compiler; return S_OK; }

1 0

Jacek Caban : vbscript: Added InStr tests.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: ea185259fb6795470af29c0161dba4f735480ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea185259fb6795470af29c016… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 17:00:23 2011 +0100 vbscript: Added InStr tests. --- dlls/vbscript/tests/api.vbs | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ae1e73b..1c22791 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -89,4 +89,39 @@ TestHex empty, "0" Call ok(getVT(hex(null)) = "VT_NULL", "getVT(hex(null)) = " & getVT(hex(null))) Call ok(getVT(hex(empty)) = "VT_BSTR", "getVT(hex(empty)) = " & getVT(hex(empty))) +x = InStr(1, "abcd", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr("abcd", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr("abc", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr("abcbc", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr("bcabc", "bc") +Call ok(x = 1, "InStr returned " & x) + +x = InStr(3, "abcd", "bc") +Call ok(x = 0, "InStr returned " & x) + +x = InStr("abcd", "bcx") +Call ok(x = 0, "InStr returned " & x) + +x = InStr(5, "abcd", "bc") +Call ok(x = 0, "InStr returned " & x) + +x = "abcd" +x = InStr(x, "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr("abcd", null) +Call ok(isNull(x), "InStr returned " & x) +x = InStr(null, "abcd") +Call ok(isNull(x), "InStr returned " & x) +x = InStr(2, null, "abcd") +Call ok(isNull(x), "InStr returned " & x) + Call reportSuccess()

1 0

Jacek Caban : vbscript: Added InStr implementation.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: d23ecdfc64bd3f36f422466417e6d2474765904c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d23ecdfc64bd3f36f42246641… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 17:00:12 2011 +0100 vbscript: Added InStr implementation. --- dlls/vbscript/global.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 92 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e3c7161..d0f1130 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -85,6 +85,26 @@ static HRESULT return_short(VARIANT *res, short val) return S_OK; } +static HRESULT return_int(VARIANT *res, int val) +{ + if((short)val == val) + return return_short(res, val); + + if(res) { + V_VT(res) = VT_I4; + V_I4(res) = val; + } + + return S_OK; +} + +static inline HRESULT return_null(VARIANT *res) +{ + if(res) + V_VT(res) = VT_NULL; + return S_OK; +} + static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr = NULL; @@ -511,10 +531,78 @@ static HRESULT Global_String(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_InStr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT *startv, *str1v, *str2v; + BSTR str1, str2; + int start, ret; + + TRACE("\n"); + + switch(args_cnt) { + case 2: + startv = NULL; + str1v = args+1; + str2v = args; + break; + case 3: + startv = args+2; + str1v = args+1; + str2v = args; + break; + case 4: + FIXME("unsupported compare argument %s\n", debugstr_variant(args)); + return E_NOTIMPL; + default: + assert(0); + } + + if(startv) { + /* FIXME: Move to helper */ + switch(V_VT(startv)) { + case VT_I2: + start = V_I2(startv); + break; + case VT_I4: + start = V_I4(startv); + break; + default: + FIXME("unsupported start %s\n", debugstr_variant(startv)); + return E_NOTIMPL; + } + if(--start < 0) { + FIXME("start %d\n", start); + return E_FAIL; + } + }else { + start = 0; + } + + if(V_VT(str1v) == VT_NULL || V_VT(str2v) == VT_NULL) + return return_null(res); + + if(V_VT(str1v) != VT_BSTR) { + FIXME("Unsupported str1 type %s\n", debugstr_variant(str1v)); + return E_NOTIMPL; + } + str1 = V_BSTR(str1v); + + if(V_VT(str2v) != VT_BSTR) { + FIXME("Unsupported str2 type %s\n", debugstr_variant(str2v)); + return E_NOTIMPL; + } + str2 = V_BSTR(str2v); + + if(start < SysStringLen(str1)) { + WCHAR *ptr; + + ptr = strstrW(str1+start, str2); + ret = ptr ? ptr-str1+1 : 0; + }else { + ret = 0; + } + + return return_int(res, ret); } static HRESULT Global_InStrB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -1532,7 +1620,7 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_TRIM, Global_Trim, 0, 1}, {DISPID_GLOBAL_SPACE, Global_Space, 0, 1}, {DISPID_GLOBAL_STRING, Global_String, 0, 0, 2}, - {DISPID_GLOBAL_INSTR, Global_InStr, 0, 3, 4}, + {DISPID_GLOBAL_INSTR, Global_InStr, 0, 2, 4}, {DISPID_GLOBAL_INSTRB, Global_InStrB, 0, 3, 4}, {DISPID_GLOBAL_ASCB, Global_AscB, 0, 1}, {DISPID_GLOBAL_CHRB, Global_ChrB, 0, 1},

1 0

Jacek Caban : vbscript: Added support for VARIANTREF arguments in multiple argument functions.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: fc8756ac7c1ec1ddc12002b01e12d6b1cdef7b77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8756ac7c1ec1ddc12002b01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 17:00:02 2011 +0100 vbscript: Added support for VARIANTREF arguments in multiple argument functions. --- dlls/vbscript/vbdisp.c | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 5032f4a..ab62c9f 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #include "vbscript.h" #include "wine/debug.h" @@ -133,7 +135,8 @@ static HRESULT invoke_variant_prop(vbdisp_t *This, VARIANT *v, WORD flags, DISPP static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD flags, DISPPARAMS *dp, VARIANT *res) { - VARIANT *args; + VARIANT *args, arg_buf[8]; + unsigned argn; switch(flags) { case DISPATCH_PROPERTYGET: @@ -163,15 +166,36 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f return E_NOTIMPL; } - if(arg_cnt(dp) < prop->min_args || arg_cnt(dp) > (prop->max_args ? prop->max_args : prop->min_args)) { + argn = arg_cnt(dp); + + if(argn < prop->min_args || argn > (prop->max_args ? prop->max_args : prop->min_args)) { FIXME("invalid number of arguments\n"); return E_FAIL; } - if(arg_cnt(dp) == 1 && V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT)) - args = V_VARIANTREF(dp->rgvarg); - else - args = dp->rgvarg; + args = dp->rgvarg; + + if(argn == 1) { + if(V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT)) + args = V_VARIANTREF(dp->rgvarg); + }else { + unsigned i; + + assert(argn < sizeof(arg_buf)/sizeof(*arg_buf)); + + for(i=0; i < argn; i++) { + if(V_VT(dp->rgvarg+i) == (VT_BYREF|VT_VARIANT)) { + for(i=0; i < argn; i++) { + if(V_VT(dp->rgvarg+i) == (VT_BYREF|VT_VARIANT)) + arg_buf[i] = *V_VARIANTREF(dp->rgvarg+i); + else + arg_buf[i] = dp->rgvarg[i]; + } + args = arg_buf; + break; + } + } + } return prop->proc(This, args, dp->cArgs, res); }

1 0

Alexandre Julliard : Update copyright info for 2012.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 5dc8bedb95630e5e22fc8bbc047954af6a3fd403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dc8bedb95630e5e22fc8bbc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 10:17:10 2012 +0100 Update copyright info for 2012. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index bcd8991..1ec4844 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2011 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2012 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 8447169..0e755e6 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -106,7 +106,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2011 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2012 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Alexandre Julliard : d3d9/tests: Convert a file to utf-8.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 7533f9bead9dd9f636f14d4fb57a3fbb9e1ed917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7533f9bead9dd9f636f14d4fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 10:16:56 2012 +0100 d3d9/tests: Convert a file to utf-8. --- dlls/d3d9/tests/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 80d8199..ac1a287 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -1,6 +1,6 @@ /* * Copyright 2006-2007 Henri Verbeet - * Copyright 2011 Stefan D�singer for CodeWeavers + * Copyright 2011 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Alexandre Julliard : d3d8/tests: Convert a file to utf-8.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 158d1891c30094a4831a09b844276afb3ab09ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=158d1891c30094a4831a09b84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 10:16:49 2012 +0100 d3d8/tests: Convert a file to utf-8. --- dlls/d3d8/tests/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index 837e2d4..1062972 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -1,6 +1,6 @@ /* * Copyright 2006-2007 Henri Verbeet - * Copyright 2011 Stefan D�singer for CodeWeavers + * Copyright 2011 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Alexandre Julliard : gdi32: Add stubs for the OpenGL entry points in the DIB driver.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 5721cbf0e8a6c02c42a1ceea0f58877b0b43a1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5721cbf0e8a6c02c42a1ceea0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 12:36:39 2012 +0100 gdi32: Add stubs for the OpenGL entry points in the DIB driver. --- dlls/gdi32/dibdrv/dc.c | 186 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 169 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 8ead659..5b9c844 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -400,6 +400,158 @@ static UINT dibdrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const RG return next->funcs->pSetDIBColorTable( next, pos, count, colors ); } +/*********************************************************************** + * dibdrv_ChoosePixelFormat + */ +static INT dibdrv_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *pfd ) +{ + FIXME( "Not supported on DIB section\n" ); + return 0; +} + +/*********************************************************************** + * dibdrv_DescribePixelFormat + */ +static INT dibdrv_DescribePixelFormat( PHYSDEV dev, INT fmt, UINT size, PIXELFORMATDESCRIPTOR *pfd ) +{ + FIXME( "Not supported on DIB section\n" ); + return 0; +} + +/*********************************************************************** + * dibdrv_GetPixelFormat + */ +static INT dibdrv_GetPixelFormat( PHYSDEV dev ) +{ + FIXME( "Not supported on DIB section\n" ); + return 0; +} + +/*********************************************************************** + * dibdrv_SetPixelFormat + */ +static BOOL dibdrv_SetPixelFormat( PHYSDEV dev, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_SwapBuffers + */ +static BOOL dibdrv_SwapBuffers( PHYSDEV dev ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglCopyContext + */ +static BOOL dibdrv_wglCopyContext( HGLRC src, HGLRC dst, UINT mask ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglCreateContext + */ +static HGLRC dibdrv_wglCreateContext( PHYSDEV dev ) +{ + FIXME( "Not supported on DIB section\n" ); + return 0; +} + +/*********************************************************************** + * dibdrv_wglCreateContextAttribsARB + */ +static HGLRC dibdrv_wglCreateContextAttribsARB( PHYSDEV dev, HGLRC ctx, const int *attribs ) +{ + FIXME( "Not supported on DIB section\n" ); + return 0; +} + +/*********************************************************************** + * dibdrv_wglDeleteContext + */ +static BOOL dibdrv_wglDeleteContext( HGLRC ctx ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglGetPbufferDCARB + */ +static HDC dibdrv_wglGetPbufferDCARB( PHYSDEV dev, void *buffer ) +{ + FIXME( "Not supported on DIB section\n" ); + return 0; +} + +/*********************************************************************** + * dibdrv_wglGetProcAddress + */ +static PROC dibdrv_wglGetProcAddress( LPCSTR name ) +{ + FIXME( "Not supported on DIB section\n" ); + return NULL; +} + +/*********************************************************************** + * dibdrv_wglMakeContextCurrentARB + */ +static BOOL dibdrv_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC ctx ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglMakeCurrent + */ +static BOOL dibdrv_wglMakeCurrent( PHYSDEV dev, HGLRC ctx ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglSetPixelFormatWINE + */ +static BOOL dibdrv_wglSetPixelFormatWINE( PHYSDEV dev, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglShareLists + */ +static BOOL dibdrv_wglShareLists( HGLRC ctx1, HGLRC ctx2 ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglUseFontBitmapsA + */ +static BOOL dibdrv_wglUseFontBitmapsA( PHYSDEV dev, DWORD first, DWORD count, DWORD base ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglUseFontBitmapsW + */ +static BOOL dibdrv_wglUseFontBitmapsW( PHYSDEV dev, DWORD first, DWORD count, DWORD base ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} const struct gdi_dc_funcs dib_driver = { @@ -411,7 +563,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pArcTo */ NULL, /* pBeginPath */ dibdrv_BlendImage, /* pBlendImage */ - NULL, /* pChoosePixelFormat */ + dibdrv_ChoosePixelFormat, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ dibdrv_CopyBitmap, /* pCopyBitmap */ @@ -422,7 +574,7 @@ const struct gdi_dc_funcs dib_driver = dibdrv_DeleteBitmap, /* pDeleteBitmap */ dibdrv_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ - NULL, /* pDescribePixelFormat */ + dibdrv_DescribePixelFormat, /* pDescribePixelFormat */ NULL, /* pDeviceCapabilities */ NULL, /* pEllipse */ NULL, /* pEndDoc */ @@ -458,7 +610,7 @@ const struct gdi_dc_funcs dib_driver = dibdrv_GetNearestColor, /* pGetNearestColor */ NULL, /* pGetOutlineTextMetrics */ dibdrv_GetPixel, /* pGetPixel */ - NULL, /* pGetPixelFormat */ + dibdrv_GetPixelFormat, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetTextCharsetInfo */ NULL, /* pGetTextExtentExPoint */ @@ -514,7 +666,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ dibdrv_SetPixel, /* pSetPixel */ - NULL, /* pSetPixelFormat */ + dibdrv_SetPixelFormat, /* pSetPixelFormat */ NULL, /* pSetPolyFillMode */ NULL, /* pSetROP2 */ NULL, /* pSetRelAbs */ @@ -534,19 +686,19 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pStretchDIBits */ NULL, /* pStrokeAndFillPath */ NULL, /* pStrokePath */ - NULL, /* pSwapBuffers */ + dibdrv_SwapBuffers, /* pSwapBuffers */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ - NULL, /* pwglCopyContext */ - NULL, /* pwglCreateContext */ - NULL, /* pwglCreateContextAttribsARB */ - NULL, /* pwglDeleteContext */ - NULL, /* pwglGetPbufferDCARB */ - NULL, /* pwglGetProcAddress */ - NULL, /* pwglMakeContextCurrentARB */ - NULL, /* pwglMakeCurrent */ - NULL, /* pwglSetPixelFormatWINE */ - NULL, /* pwglShareLists */ - NULL, /* pwglUseFontBitmapsA */ - NULL /* pwglUseFontBitmapsW */ + dibdrv_wglCopyContext, /* pwglCopyContext */ + dibdrv_wglCreateContext, /* pwglCreateContext */ + dibdrv_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */ + dibdrv_wglDeleteContext, /* pwglDeleteContext */ + dibdrv_wglGetPbufferDCARB, /* pwglGetPbufferDCARB */ + dibdrv_wglGetProcAddress, /* pwglGetProcAddress */ + dibdrv_wglMakeContextCurrentARB, /* pwglMakeContextCurrentARB */ + dibdrv_wglMakeCurrent, /* pwglMakeCurrent */ + dibdrv_wglSetPixelFormatWINE, /* pwglSetPixelFormatWINE */ + dibdrv_wglShareLists, /* pwglShareLists */ + dibdrv_wglUseFontBitmapsA, /* pwglUseFontBitmapsA */ + dibdrv_wglUseFontBitmapsW, /* pwglUseFontBitmapsW */ };

1 0

Alexandre Julliard : gdi32: Calculate the image size in GradientFill only once we have the correct bit count .
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: ccfbcfaf538ef6bf52e09a0d97e8ae6784718478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccfbcfaf538ef6bf52e09a0d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 2 21:46:46 2012 +0100 gdi32: Calculate the image size in GradientFill only once we have the correct bit count. --- dlls/gdi32/bitblt.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 0d7ed3c..80a42ea 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -395,7 +395,7 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, struct gdi_image_bits bits; unsigned int i; POINT *pts; - BOOL ret = TRUE; + BOOL ret = FALSE; DWORD err; HRGN rgn; @@ -436,15 +436,14 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, info->bmiHeader.biClrImportant = 0; info->bmiHeader.biWidth = dst.visrect.right - dst.visrect.left; info->bmiHeader.biHeight = dst.visrect.bottom - dst.visrect.top; - info->bmiHeader.biSizeImage = get_dib_image_size( info ); + info->bmiHeader.biSizeImage = 0; dev = GET_DC_PHYSDEV( dc, pPutImage ); err = dev->funcs->pPutImage( dev, 0, 0, info, NULL, NULL, NULL, 0 ); - if ((err && err != ERROR_BAD_FORMAT) || - !(bits.ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ))) - { - ret = FALSE; + if (err && err != ERROR_BAD_FORMAT) goto done; + + info->bmiHeader.biSizeImage = get_dib_image_size( info ); + if (!(bits.ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ))) goto done; - } bits.is_copy = TRUE; bits.free = free_heap_bits; @@ -462,7 +461,7 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, rgn = CreateRectRgn( 0, 0, 0, 0 ); gradient_bitmapinfo( info, bits.ptr, vert_array, nvert, grad_array, ngrad, mode, pts, rgn ); OffsetRgn( rgn, dst.visrect.left, dst.visrect.top ); - if (dev->funcs->pPutImage( dev, 0, rgn, info, &bits, &src, &dst, SRCCOPY )) ret = FALSE; + ret = !dev->funcs->pPutImage( dev, 0, rgn, info, &bits, &src, &dst, SRCCOPY ); if (bits.free) bits.free( &bits ); DeleteObject( rgn );

1 0

André Hentschel : Wine 1.3.36 freigegeben
by Jeremy Newman 03 Jan '12

03 Jan '12

Module: website Branch: master Commit: 9e92399c01334b17475bf7e787a65f9a518ab89c URL: http://source.winehq.org/git/website.git/?a=commit;h=9e92399c01334b17475bf7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 31 16:34:27 2011 +0100 Wine 1.3.36 freigegeben --- news/de/2011123001.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2011123001.xml b/news/de/2011123001.xml new file mode 100644 index 0000000..ac0a4e8 --- /dev/null +++ b/news/de/2011123001.xml @@ -0,0 +1,18 @@ +<news> +<date>30. Dezember 2011</date> +<title>Wine 1.3.36 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.36 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.36">Neuerungen (en)</a> in dieser Version: +<ul> + <li>UDisks Backend für die dynamische Geräteunterstützung.</li> + <li>Polygone und geometrische Stifte in der DIB Engine.</li> + <li>JScript kompiliert jetzt ganze Funktionen.</li> + <li>Verbesserte Unterstützung für vertikale Schriften.</li> + <li>UniScribe mit ein paar neuen Scipts.</li> + <li>Ein Haufen ctype Funktionen in MSVCP implementiert.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.36.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012