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

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillRectangleI.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 849af30eb82aa3307d6c78f926ff2dfa5c760e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=849af30eb82aa3307d6c78f92… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 10:38:47 2009 -0500 gdiplus: Use brush_fill_path in GdipFillRectangleI. --- dlls/gdiplus/graphics.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 595fc24..58ca2e6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2786,12 +2786,14 @@ GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics *graphics, GpBrush *brush, save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); transform_and_round_points(graphics, pti, ptf, 4); + BeginPath(graphics->hdc); Polygon(graphics->hdc, pti, 4); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); RestoreDC(graphics->hdc, save_state);

1 0

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillRegion.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 6a8a770c76fb530b98dd18064f9dd40f9e159218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8a770c76fb530b98dd18064… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 10:57:07 2009 -0500 gdiplus: Use brush_fill_path in GdipFillRegion. --- dlls/gdiplus/graphics.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2912416..595fc24 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2855,6 +2855,7 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, INT save_state; GpStatus status; HRGN hrgn; + RECT rc; TRACE("(%p, %p, %p)\n", graphics, brush, region); @@ -2870,9 +2871,17 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); - FillRgn(graphics->hdc, hrgn, brush->gdibrush); + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + + if (GetClipBox(graphics->hdc, &rc) != NULLREGION) + { + BeginPath(graphics->hdc); + Rectangle(graphics->hdc, rc.left, rc.top, rc.right, rc.bottom); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); + } RestoreDC(graphics->hdc, save_state);

1 0

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillPolygonI.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 38fc894c966442cc952bcdcdedc97fa0fc44f84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38fc894c966442cc952bcdcde… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 10:37:22 2009 -0500 gdiplus: Use brush_fill_path in GdipFillPolygonI. --- dlls/gdiplus/graphics.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e0fbf8a..2912416 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2684,13 +2684,16 @@ GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics *graphics, GpBrush *brush, save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); SetPolyFillMode(graphics->hdc, (fillMode == FillModeAlternate ? ALTERNATE : WINDING)); transform_and_round_points(graphics, pti, ptf, count); + + BeginPath(graphics->hdc); Polygon(graphics->hdc, pti, count); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); RestoreDC(graphics->hdc, save_state);

1 0

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillPolygon.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 15fef07887b7c9dcd6f092d843a26d24131f21d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15fef07887b7c9dcd6f092d84… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 10:35:40 2009 -0500 gdiplus: Use brush_fill_path in GdipFillPolygon. --- dlls/gdiplus/graphics.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 160b7f8..e0fbf8a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2634,13 +2634,16 @@ GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); SetPolyFillMode(graphics->hdc, (fillMode == FillModeAlternate ? ALTERNATE : WINDING)); transform_and_round_points(graphics, pti, ptf, count); + + BeginPath(graphics->hdc); Polygon(graphics->hdc, pti, count); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); RestoreDC(graphics->hdc, save_state);

1 0

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillPie.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: bedbd40f5ebb5ad0d648b1bdc4001639025c6ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bedbd40f5ebb5ad0d648b1bdc… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 10:32:34 2009 -0500 gdiplus: Use brush_fill_path in GdipFillPie. --- dlls/gdiplus/graphics.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e8777e9..160b7f8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2586,10 +2586,12 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + BeginPath(graphics->hdc); draw_pie(graphics, x, y, width, height, startAngle, sweepAngle); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); RestoreDC(graphics->hdc, save_state);

1 0

Andrew Talbot : dbghelp: Constify some variables.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 41ca9b0ffd48765e34a886d08435bbfe5b477ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ca9b0ffd48765e34a886d08… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jul 11 16:13:17 2009 +0100 dbghelp: Constify some variables. --- dlls/dbghelp/elf_module.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 12754dd..6c79c8b 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -237,7 +237,7 @@ static void elf_end_find(struct elf_file_map* fmap) * * Get the size of an ELF section */ -static inline unsigned elf_get_map_size(struct elf_section_map* esm) +static inline unsigned elf_get_map_size(const struct elf_section_map* esm) { if (esm->sidx < 0 || esm->sidx >= esm->fmap->elfhdr.e_shnum) return 0; @@ -473,7 +473,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, */ static const Elf32_Sym* elf_lookup_symtab(const struct module* module, const struct hash_table* ht_symtab, - const char* name, struct symt* compiland) + const char* name, const struct symt* compiland) { struct symtab_elt* weak_result = NULL; /* without compiland name */ struct symtab_elt* result = NULL; @@ -490,7 +490,7 @@ static const Elf32_Sym* elf_lookup_symtab(const struct module* module, if (compiland) { compiland_name = source_get(module, - ((struct symt_compiland*)compiland)->source); + ((const struct symt_compiland*)compiland)->source); compiland_basename = strrchr(compiland_name, '/'); if (!compiland_basename++) compiland_basename = compiland_name; } @@ -542,7 +542,7 @@ static const Elf32_Sym* elf_lookup_symtab(const struct module* module, * - get any relevant information (address & size) from the bits we got from the * stabs debugging information */ -static void elf_finish_stabs_info(struct module* module, struct hash_table* symtab) +static void elf_finish_stabs_info(struct module* module, const struct hash_table* symtab) { struct hash_table_iter hti; void* ptr; @@ -623,7 +623,7 @@ static void elf_finish_stabs_info(struct module* module, struct hash_table* symt * * creating the thunk objects for a wine native DLL */ -static int elf_new_wine_thunks(struct module* module, struct hash_table* ht_symtab, +static int elf_new_wine_thunks(struct module* module, const struct hash_table* ht_symtab, const struct elf_thunk_area* thunks) { int j; @@ -716,7 +716,7 @@ static int elf_new_wine_thunks(struct module* module, struct hash_table* ht_symt * * Creates a set of public symbols from an ELF symtab */ -static int elf_new_public_symbols(struct module* module, struct hash_table* symtab) +static int elf_new_public_symbols(struct module* module, const struct hash_table* symtab) { struct hash_table_iter hti; struct symtab_elt* ste; @@ -830,7 +830,7 @@ found: * Parses a .gnu_debuglink section and loads the debug info from * the external file specified there. */ -static BOOL elf_debuglink_parse(struct elf_file_map* fmap, struct module* module, +static BOOL elf_debuglink_parse(struct elf_file_map* fmap, const struct module* module, const BYTE* debuglink) { /* The content of a debug link section is:

1 0

Vincent Povirk : gdiplus: Use brush_fill_path in GdipFillEllipse.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: e306316c7dd390358e93f435b3add19833d2ba04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e306316c7dd390358e93f435b… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 10:29:44 2009 -0500 gdiplus: Use brush_fill_path in GdipFillEllipse. --- dlls/gdiplus/graphics.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b59814e..e8777e9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2512,12 +2512,14 @@ GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); transform_and_round_points(graphics, pti, ptf, 2); + BeginPath(graphics->hdc); Ellipse(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y); + EndPath(graphics->hdc); + + brush_fill_path(graphics, brush); RestoreDC(graphics->hdc, save_state);

1 0

Alexandre Julliard : widl: Take into account the alignment of conformant arrays to pad a structure.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: f21eab110127a27855db84b5a7d53f2c44984a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21eab110127a27855db84b5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 09:23:06 2009 +0200 widl: Take into account the alignment of conformant arrays to pad a structure. --- tools/widl/typegen.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3a5e2e5..d297eb2 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2208,11 +2208,12 @@ static void write_struct_members(FILE *file, const type_t *type, if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) { type_t *ft = field->type; + unsigned int align = 0; + unsigned int size = type_memsize(ft, &align); + if (salign < align) salign = align; + if (!is_conformant_array(ft) || type_array_is_decl_as_ptr(ft)) { - unsigned int align = 0; - unsigned int size = type_memsize(ft, &align); - if (salign < align) salign = align; if ((align - 1) & offset) { unsigned char fc = 0;

1 0

Alexandre Julliard : oleaut32: Fix safe array marshalling on 64-bit.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 74c985aad16e802f30d9d329c67dc58f56fa3008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c985aad16e802f30d9d329c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 19:13:27 2009 +0200 oleaut32: Fix safe array marshalling on 64-bit. --- dlls/oleaut32/usrmarshal.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 1e20c3c..3172eba 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -232,7 +232,7 @@ static unsigned int get_type_size(ULONG *pFlags, VARTYPE vt) case VT_DECIMAL: return sizeof(DECIMAL); case VT_BSTR: - return sizeof(BSTR); + return sizeof(ULONG); case VT_VARIANT: return sizeof(VARIANT); case VT_UNKNOWN: @@ -764,7 +764,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY HRESULT hr; size += sizeof(ULONG); - size += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); + size += 2 * sizeof(USHORT) + 2 * sizeof(ULONG); sftype = SAFEARRAY_GetUnionType(psa); size += sizeof(ULONG); @@ -850,23 +850,23 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf VARTYPE vt; SAFEARRAY *psa = *ppsa; ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); - wireSAFEARRAY wiresa; SF_TYPE sftype; GUID guid; *(ULONG *)Buffer = psa->cDims; Buffer += sizeof(ULONG); - wiresa = (wireSAFEARRAY)Buffer; - wiresa->cDims = psa->cDims; - wiresa->fFeatures = psa->fFeatures; - wiresa->cbElements = psa->cbElements; + *(USHORT *)Buffer = psa->cDims; + Buffer += sizeof(USHORT); + *(USHORT *)Buffer = psa->fFeatures; + Buffer += sizeof(USHORT); + *(ULONG *)Buffer = psa->cbElements; + Buffer += sizeof(ULONG); hr = SafeArrayGetVartype(psa, &vt); if (FAILED(hr)) vt = 0; - wiresa->cLocks = (USHORT)psa->cLocks | (vt << 16); - - Buffer += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); + *(ULONG *)Buffer = (USHORT)psa->cLocks | (vt << 16); + Buffer += sizeof(ULONG); sftype = SAFEARRAY_GetUnionType(psa); *(ULONG *)Buffer = sftype; @@ -987,7 +987,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B Buffer += sizeof(ULONG); wiresa = (wireSAFEARRAY)Buffer; - Buffer += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); + Buffer += 2 * sizeof(USHORT) + 2 * sizeof(ULONG); if (cDims != wiresa->cDims) RpcRaiseException(RPC_S_INVALID_BOUND);

1 0

Alexandre Julliard : ddraw/tests: Fix a few tests that fail on Win64.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 5622f74486eb560f38867655f9f754c0c5b21cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5622f74486eb560f38867655f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 20:52:33 2009 +0200 ddraw/tests: Fix a few tests that fail on Win64. --- dlls/ddraw/tests/d3d.c | 1 + dlls/ddraw/tests/dsurface.c | 3 ++- dlls/ddraw/tests/overlay.c | 3 ++- dlls/ddraw/tests/refcount.c | 12 +++++++++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 57e1da0..f4cd07b 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -951,6 +951,7 @@ static BOOL D3D1_createObjects(void) ok(hr==DD_OK, "SetCooperativeLevel returned: %x\n", hr); hr = IDirectDraw_QueryInterface(DirectDraw1, &IID_IDirect3D, (void**) &Direct3D1); + if (hr == E_NOINTERFACE) return FALSE; ok(hr==DD_OK, "QueryInterface returned: %x\n", hr); if (!Direct3D1) { return FALSE; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index c3280fb..a73c34c 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1029,7 +1029,8 @@ static void IFaceRefCount(void) todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); /* IDirect3DTexture interface (unlike the others) alters the original IDirectDrawSurface ref count */ - IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture, (void **) &tex); + ret = IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture, (void **) &tex); + if (ret == E_NOINTERFACE) return; /* win64 */ ref = getRefcount((IUnknown *) tex); todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); ref = getRefcount((IUnknown *) surf); diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index d1edc1d..55c4989 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -200,7 +200,8 @@ static void yv12_test(void) ok(desc.dwFlags == (DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_PITCH), "Unexpected desc.dwFlags 0x%08x\n", desc.dwFlags); - ok(desc.ddsCaps.dwCaps == (DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM), + ok(desc.ddsCaps.dwCaps == (DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM) || + desc.ddsCaps.dwCaps == (DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_HWCODEC), "Unexpected desc.ddsCaps.dwCaps 0x%08x\n", desc.ddsCaps.dwCaps); ok(desc.dwWidth == 256 && desc.dwHeight == 256, "Expected size 64x64, got %ux%u\n", desc.dwWidth, desc.dwHeight); diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index bfff64a..f0496e3 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -237,7 +237,17 @@ static void test_iface_refcnt(void) ok(ref == 1, "IDirectDraw reference count is %ld\n", ref); hr = IDirectDraw7_QueryInterface(DDraw7, &IID_IDirect3D7, (void **) &D3D7); - ok(hr == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", hr); + ok(hr == DD_OK || hr == E_NOINTERFACE, /* win64 */ + "IDirectDraw7_QueryInterface returned %08x\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(DDraw7); + IDirectDraw4_Release(DDraw4); + IDirectDraw2_Release(DDraw2); + IDirectDraw_Release(DDraw1); + skip( "no IDirect3D7 support\n" ); + return; + } /* Apparently IDirectDrawX and IDirect3DX are linked together */ ref = getRefcount( (IUnknown *) D3D7);

1 0