wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Austin English : wine.inf: Create %systemroot%\logs directory by default.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 2a708ee94db84276e4b72e13cbb124e67aa0fb9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a708ee94db84276e4b72e13c… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jul 16 12:10:22 2011 -0500 wine.inf: Create %systemroot%\logs directory by default. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index d9159dd..69124be 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2600,6 +2600,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" ; create some directories first 10,help, 10,inf, +10,logs, 10,temp, 11,mui, 11,spool\drivers\color,

1 0

Frédéric Delanoy : cmd/tests: Convert line endings to DOS style at runtime before running batch test file .
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 1cb7378e94bc15d8223af824f0d691fb478d0e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb7378e94bc15d8223af824f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 16 10:14:50 2011 +0200 cmd/tests: Convert line endings to DOS style at runtime before running batch test file. --- programs/cmd/tests/batch.c | 43 ++++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 03c2b56..2715b11 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -25,22 +25,39 @@ static char workdir[MAX_PATH]; static DWORD workdir_len; -/* Substitute escaped spaces with real ones */ -static const char* replace_escaped_spaces(const char *data, DWORD size, DWORD *new_size) +/* Convert to DOS line endings, and substitute escaped spaces with real ones */ +static const char* convert_input_data(const char *data, DWORD size, DWORD *new_size) { - static const char escaped_space[] = {'@','s','p','a','c','e','@','\0'}; + static const char escaped_space[] = {'@','s','p','a','c','e','@'}; + DWORD i, eol_count = 0; char *ptr, *new_data; - new_data = ptr = HeapAlloc(GetProcessHeap(), 0, size + 1); - memcpy( new_data, data, size ); - new_data[size] = 0; - - while ((ptr = strstr(ptr, escaped_space))) - { - char *end = ptr + sizeof(escaped_space) - 1; - *ptr++ = ' '; - memmove( ptr, end, strlen(end) + 1 ); + for (i = 0; i < size; i++) + if (data[i] == '\n') eol_count++; + + ptr = new_data = HeapAlloc(GetProcessHeap(), 0, size + eol_count + 1); + + for (i = 0; i < size; i++) { + switch (data[i]) { + case '\n': + *ptr++ = '\r'; + *ptr++ = '\n'; + break; + case '@': + if (data + i + sizeof(escaped_space) - 1 < data + size + && !memcmp(data + i, escaped_space, sizeof(escaped_space))) { + *ptr++ = ' '; + i += sizeof(escaped_space) - 1; + } else { + *ptr++ = data[i]; + } + break; + default: + *ptr++ = data[i]; + } } + *ptr = '\0'; + *new_size = strlen(new_data); return new_data; } @@ -233,7 +250,7 @@ static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, const char *out_data, *actual_cmd_data; DWORD out_size, actual_cmd_size; - actual_cmd_data = replace_escaped_spaces(cmd_data, cmd_size, &actual_cmd_size); + actual_cmd_data = convert_input_data(cmd_data, cmd_size, &actual_cmd_size); if(!actual_cmd_size || !actual_cmd_data) goto cleanup;

1 0

Vincent Povirk : gdiplus: Fix use of uninitialized memory.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 171e832839c082b55e7e44161d82bd58aa3b056e URL: http://source.winehq.org/git/wine.git/?a=commit;h=171e832839c082b55e7e44161… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 15 13:21:09 2011 -0500 gdiplus: Fix use of uninitialized memory. --- dlls/gdiplus/graphics.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1e3f946..324b895 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4713,6 +4713,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string args.graphics = graphics; args.brush = brush; + args.x = rect->X; + args.y = rect->Y; + args.rel_width = rel_width; args.rel_height = rel_height;

1 0

Rico Schüller : d3dx9: Implement D3DXGetShaderSamplers ().
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: c42ee0339a8aa6069712059ccc6b3e72d10e9d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c42ee0339a8aa6069712059cc… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jul 15 10:52:36 2011 +0200 d3dx9: Implement D3DXGetShaderSamplers(). --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 62 +++++++++++++++++++++++ dlls/d3dx9_36/tests/shader.c | 111 ++++++++++++++++++++++++++++++++++++++++++ include/d3dx9shader.h | 1 + 4 files changed, 175 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c42ee0339a8aa60697120…

1 0

Travis Athougies : d3dx9_36: Improved constant table handle support.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 48d03555a7a6931ee8ba0952ccb92c70925c6bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d03555a7a6931ee8ba0952c… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Jul 14 14:06:49 2011 -0700 d3dx9_36: Improved constant table handle support. --- dlls/d3dx9_36/shader.c | 81 ++++++++++++++++++++++++++--------------------- 1 files changed, 45 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 958c4e8..6a67f04 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -648,6 +648,33 @@ static DWORD calc_bytes(D3DXCONSTANT_DESC *desc) return 4 * desc->Elements * desc->Rows * desc->Columns; } +static ctab_constant *is_valid_constant(ID3DXConstantTableImpl *This, D3DXHANDLE parameter) +{ + UINT i; + + for (i = 0; i < This->desc.Constants; i++) + if ((ctab_constant *)parameter == &This->constants[i]) + return (ctab_constant *)parameter; + + return NULL; +} + +static ctab_constant *lookup_constant_by_name(ID3DXConstantTableImpl *This, ctab_constant *c, LPCSTR name) +{ + UINT i; + + TRACE("(%p, %p, %s)\n", This, c, name); + + if (c) + FIXME("Only top level constant supported\n"); + + for (i = 0; i < This->desc.Constants; i++) + if (!strcmp(This->constants[i].desc.Name, name)) + return &This->constants[i]; + + return NULL; +} + /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable* iface, REFIID riid, void** ppvObject) { @@ -741,16 +768,13 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable* return D3DERR_INVALIDCALL; /* Applications can pass the name of the constant in place of the handle */ - if (!((UINT_PTR)constant >> 16)) - constant_info = &This->constants[(UINT_PTR)constant - 1]; + if (is_valid_constant(This, constant)) + constant_info = (ctab_constant *)constant; else - { - D3DXHANDLE c = ID3DXConstantTable_GetConstantByName(iface, NULL, constant); - if (!c) - return D3DERR_INVALIDCALL; + constant_info = lookup_constant_by_name(This, NULL, (LPCSTR)constant); - constant_info = &This->constants[(UINT_PTR)c - 1]; - } + if (!constant_info) + return D3DERR_INVALIDCALL; if (desc) *desc = constant_info->desc; @@ -785,39 +809,33 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable* TRACE("(%p)->(%p, %d)\n", This, constant, index); - if (constant) + if (!constant) { - FIXME("Only top level constants supported\n"); - return NULL; - } + if (index >= This->desc.Constants) + return NULL; - if (index >= This->desc.Constants) + return (D3DXHANDLE)&This->constants[index]; + } + else + { + FIXME("Only top level constant supported\n"); return NULL; - - return (D3DXHANDLE)(DWORD_PTR)(index + 1); + } } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantTable* iface, D3DXHANDLE constant, LPCSTR name) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - UINT i; TRACE("(%p)->(%p, %s)\n", This, constant, name); if (!name) return NULL; - if (constant) - { - FIXME("Only top level constants supported\n"); + if (!constant || is_valid_constant(This, constant)) + return (D3DXHANDLE)lookup_constant_by_name(This, (ctab_constant *)constant, name); + else return NULL; - } - - for (i = 0; i < This->desc.Constants; i++) - if (!strcmp(This->constants[i].desc.Name, name)) - return (D3DXHANDLE)(DWORD_PTR)(i + 1); - - return NULL; } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index) @@ -1217,13 +1235,6 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, if (ctab_header->Target) TRACE("Target = %s\n", object->ctab + ctab_header->Target); - if (object->desc.Constants > 65535) - { - FIXME("Too many constants (%u)\n", object->desc.Constants); - hr = E_NOTIMPL; - goto error; - } - object->constants = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object->constants) * object->desc.Constants); if (!object->constants) @@ -1255,9 +1266,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, error: - HeapFree(GetProcessHeap(), 0, object->constants); - HeapFree(GetProcessHeap(), 0, object->ctab); - HeapFree(GetProcessHeap(), 0, object); + ID3DXConstantTableImpl_Release((ID3DXConstantTable *)object); return hr; }

1 0

Travis Athougies : d3dx9_36: Separate calculation of Bytes.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: c55caea1b3c6435c94e0cf3a1d95c7765e941ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c55caea1b3c6435c94e0cf3a1… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Jul 14 14:06:48 2011 -0700 d3dx9_36: Separate calculation of Bytes. --- dlls/d3dx9_36/shader.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c3ae172..958c4e8 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -639,6 +639,15 @@ static inline int is_vertex_shader(DWORD version) return (version & 0xFFFF0000) == 0xFFFE0000; } +static DWORD calc_bytes(D3DXCONSTANT_DESC *desc) +{ + if (desc->RegisterSet != D3DXRS_FLOAT4 && desc->RegisterSet != D3DXRS_SAMPLER) + FIXME("Don't know how to calculate Bytes for constants of type %d\n", + desc->RegisterSet); + + return 4 * desc->Elements * desc->Rows * desc->Columns; +} + /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable* iface, REFIID riid, void** ppvObject) { @@ -1130,6 +1139,7 @@ static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, ctab_co constant->desc.Columns = type->Columns; constant->desc.Elements = type->Elements; constant->desc.StructMembers = type->StructMembers; + constant->desc.Bytes = calc_bytes(&constant->desc); TRACE("class = %d, type = %d, rows = %d, columns = %d, elements = %d, struct_members = %d\n", constant->desc.Class, constant->desc.Type, constant->desc.Elements, @@ -1237,22 +1247,6 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, &object->constants[i]); if (hr != D3D_OK) goto error; - - if (constant_info[i].RegisterSet != D3DXRS_FLOAT4 && - constant_info[i].RegisterSet != D3DXRS_SAMPLER) - FIXME("Don't know how to calculate Bytes for constants of type %d\n", - constant_info[i].RegisterSet); - - /* - * D3DXRS_FLOAT4 and D3DXRS_SAMPLER have a base size of 4 - * (not taking into account dimensions and element count) - */ - object->constants[i].desc.Bytes = 4; - - /* Take into account dimensions and elements */ - object->constants[i].desc.Bytes *= object->constants[i].desc.Elements; - object->constants[i].desc.Bytes *= object->constants[i].desc.Rows * - object->constants[i].desc.Columns; } *constant_table = &object->ID3DXConstantTable_iface;

1 0

Alexandre Julliard : winex11: Simplify a couple of BitBlt operation codes.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 5ce421efbde9f482a4e2634db63467d4b7bfc7f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce421efbde9f482a4e2634db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 11:38:20 2011 +0200 winex11: Simplify a couple of BitBlt operation codes. --- dlls/winex11.drv/bitblt.c | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 73ab7e8..9ecdbc9 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -79,20 +79,20 @@ static const unsigned char BITBLT_Opcodes[256][MAX_OP_LEN] = { OP(PAT,DST,GXand), OP(SRC,DST,GXnor) }, /* 0x13 ~(S|(D&P)) */ { OP(PAT,SRC,GXequiv), OP(SRC,DST,GXnor) }, /* 0x14 ~(D|~(P^S)) */ { OP(PAT,SRC,GXand), OP(SRC,DST,GXnor) }, /* 0x15 ~(D|(P&S)) */ - { OP(SRC,TMP,GXcopy), OP(PAT,TMP,GXnand), - OP(TMP,DST,GXand), OP(SRC,DST,GXxor), + { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXnand), + OP(SRC,DST,GXand), OP(TMP,DST,GXxor), OP(PAT,DST,GXxor) }, /* 0x16 P^S^(D&~(P&S) */ { OP(SRC,TMP,GXcopy), OP(SRC,DST,GXxor), OP(PAT,SRC,GXxor), OP(SRC,DST,GXand), OP(TMP,DST,GXequiv) }, /* 0x17 ~S^((S^P)&(S^D))*/ { OP(PAT,SRC,GXxor), OP(PAT,DST,GXxor), OP(SRC,DST,GXand) }, /* 0x18 (S^P)&(D^P) */ - { OP(SRC,TMP,GXcopy), OP(PAT,TMP,GXnand), - OP(TMP,DST,GXand), OP(SRC,DST,GXequiv) }, /* 0x19 ~S^(D&~(P&S)) */ + { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXnand), + OP(SRC,DST,GXand), OP(TMP,DST,GXequiv) }, /* 0x19 ~S^(D&~(P&S)) */ { OP(PAT,SRC,GXand), OP(SRC,DST,GXor), OP(PAT,DST,GXxor) }, /* 0x1a P^(D|(S&P)) */ - { OP(SRC,TMP,GXcopy), OP(PAT,TMP,GXxor), - OP(TMP,DST,GXand), OP(SRC,DST,GXequiv) }, /* 0x1b ~S^(D&(P^S)) */ + { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXxor), + OP(SRC,DST,GXand), OP(TMP,DST,GXequiv) }, /* 0x1b ~S^(D&(P^S)) */ { OP(PAT,DST,GXand), OP(SRC,DST,GXor), OP(PAT,DST,GXxor) }, /* 0x1c P^(S|(D&P)) */ { OP(DST,TMP,GXcopy), OP(PAT,DST,GXxor), @@ -107,13 +107,13 @@ static const unsigned char BITBLT_Opcodes[256][MAX_OP_LEN] = OP(SRC,DST,GXand) }, /* 0x24 (S^P)&(S^D) */ { OP(PAT,SRC,GXnand), OP(SRC,DST,GXand), OP(PAT,DST,GXequiv) }, /* 0x25 ~P^(D&~(S&P)) */ - { OP(SRC,TMP,GXcopy), OP(PAT,TMP,GXand), - OP(TMP,DST,GXor), OP(SRC,DST,GXxor) }, /* 0x26 S^(D|(S&P)) */ - { OP(SRC,TMP,GXcopy), OP(PAT,TMP,GXequiv), - OP(TMP,DST,GXor), OP(SRC,DST,GXxor) }, /* 0x27 S^(D|~(P^S)) */ + { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXand), + OP(SRC,DST,GXor), OP(TMP,DST,GXxor) }, /* 0x26 S^(D|(S&P)) */ + { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXequiv), + OP(SRC,DST,GXor), OP(TMP,DST,GXxor) }, /* 0x27 S^(D|~(P^S)) */ { OP(PAT,SRC,GXxor), OP(SRC,DST,GXand) }, /* 0x28 D&(P^S) */ - { OP(SRC,TMP,GXcopy), OP(PAT,TMP,GXand), - OP(TMP,DST,GXor), OP(SRC,DST,GXxor), + { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXand), + OP(SRC,DST,GXor), OP(TMP,DST,GXxor), OP(PAT,DST,GXequiv) }, /* 0x29 ~P^S^(D|(P&S)) */ { OP(PAT,SRC,GXnand), OP(SRC,DST,GXand) }, /* 0x2a D&~(P&S) */ { OP(SRC,TMP,GXcopy), OP(PAT,SRC,GXxor), @@ -528,7 +528,7 @@ static int do_bitop( int s, int d, int rop ) int main() { int rop, i, res, src, dst, pat, tmp, dstUsed; - const BYTE *opcode; + const unsigned char *opcode; for (rop = 0; rop < 256; rop++) { @@ -555,9 +555,6 @@ int main() dst = do_bitop( src, dst, *opcode & 0xf ); dstUsed = 1; break; - case OP_ARGS(PAT,TMP): - tmp = do_bitop( pat, tmp, *opcode & 0xf ); - break; case OP_ARGS(PAT,DST): dst = do_bitop( pat, dst, *opcode & 0xf ); dstUsed = 1; @@ -1389,11 +1386,6 @@ static void execute_rop( X11DRV_PDEVICE *physdev, Pixmap src_pixmap, GC gc, XCopyArea( gdi_display, pixmaps[OP_SRC(*opcode)], pixmaps[OP_DST(*opcode)], gc, 0, 0, width, height, 0, 0 ); break; - - case OP_ARGS(PAT,TMP): - if (!pixmaps[TMP] && !null_brush) - pixmaps[TMP] = XCreatePixmap( gdi_display, root_window, width, height, physdev->depth ); - /* fall through */ case OP_ARGS(PAT,DST): case OP_ARGS(PAT,SRC): if (!null_brush)

1 0

Alexandre Julliard : winex11: Avoid overflowing the source rectangle in StretchBlt.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 1e2e45ce665700e74f905da1432fb61014d58289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e2e45ce665700e74f905da14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 16:22:57 2011 +0200 winex11: Avoid overflowing the source rectangle in StretchBlt. --- dlls/winex11.drv/bitblt.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 9ecdbc9..53f5c63 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -804,9 +804,7 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, /* Retrieve a source row */ BITBLT_GetRow( srcImage, rowSrc, (ysrc >> 16) - visRectSrc->top, - hswap ? widthSrc - visRectSrc->right - : visRectSrc->left, - visRectSrc->right - visRectSrc->left, + visRectSrc->left, visRectSrc->right - visRectSrc->left, dstImage->depth, foreground, background, pixel_mask, hswap ); /* Stretch or shrink it */ @@ -814,9 +812,7 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, BITBLT_StretchRow( rowSrc, rowDst, visRectDst->left, visRectDst->right - visRectDst->left, xinc, xoff, mode ); - else BITBLT_ShrinkRow( rowSrc, rowDst, - hswap ? widthSrc - visRectSrc->right - : visRectSrc->left, + else BITBLT_ShrinkRow( rowSrc, rowDst, visRectSrc->left, visRectSrc->right - visRectSrc->left, xinc, xoff, mode ); @@ -863,9 +859,7 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, /* Retrieve a source row */ BITBLT_GetRow( srcImage, rowSrc, ysrc - visRectSrc->top, - hswap ? widthSrc - visRectSrc->right - : visRectSrc->left, - visRectSrc->right - visRectSrc->left, + visRectSrc->left, visRectSrc->right - visRectSrc->left, dstImage->depth, foreground, background, pixel_mask, hswap ); /* Stretch or shrink it */ @@ -873,9 +867,7 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, BITBLT_StretchRow( rowSrc, rowDst, visRectDst->left, visRectDst->right - visRectDst->left, xinc, xoff, mode ); - else BITBLT_ShrinkRow( rowSrc, rowDst, - hswap ? widthSrc - visRectSrc->right - : visRectSrc->left, + else BITBLT_ShrinkRow( rowSrc, rowDst, visRectSrc->left, visRectSrc->right - visRectSrc->left, xinc, xoff, mode ); @@ -1474,6 +1466,7 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, GC tmpGC; if (IsRectEmpty( &dst->visrect )) return TRUE; + if (IsRectEmpty( &src->visrect )) return TRUE; fStretch = (src->width != dst->width) || (src->height != dst->height);

1 0

Alexandre Julliard : winex11: Don' t access the source rectangle in PutImage until needed.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 55bc21938f5109c8bec7e59acbdcfb55b6fb4748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55bc21938f5109c8bec7e59ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 15 19:57:31 2011 +0200 winex11: Don't access the source rectangle in PutImage until needed. --- dlls/winex11.drv/bitblt.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 880d71f..73ab7e8 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1802,8 +1802,6 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str struct gdi_image_bits dst_bits; const XPixmapFormatValues *format; const ColorShifts *color_shifts; - int width = rect->right - rect->left; - int height = rect->bottom - rect->top; if (hbitmap) { @@ -1866,6 +1864,9 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str if (!ret) { + int width = rect->right - rect->left; + int height = rect->bottom - rect->top; + image->data = dst_bits.ptr; if (bitmap) {

1 0

Alexandre Julliard : gdi32: Use the original StretchBlt rectangle if a DC doesn' t have a visible region.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: a64a549b4c644d9dd0a5227419ec246cfceb45a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64a549b4c644d9dd0a522741… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 15 20:15:25 2011 +0200 gdi32: Use the original StretchBlt rectangle if a DC doesn't have a visible region. --- dlls/gdi32/bitblt.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index a99efc7..da22507 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -89,8 +89,10 @@ static void get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, if (rect.left > rect.right) { swap_ints( &rect.left, &rect.right ); rect.left++; rect.right++; } if (rect.top > rect.bottom) { swap_ints( &rect.top, &rect.bottom ); rect.top++; rect.bottom++; } - get_clip_box( dc_dst, &clip ); - intersect_rect( &dst->visrect, &rect, &clip ); + if (get_clip_box( dc_dst, &clip )) + intersect_rect( &dst->visrect, &rect, &clip ); + else + dst->visrect = rect; /* get the source visible rectangle */

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
84
Older →

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 July 2011