May 2014 - Wine-Commits - list.winehq.org

Stefan Dösinger : ddraw/tests: Add a test for getdc palette handling.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: a8bcb6c7adeb93bacaa731a1ebef4c668787129a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8bcb6c7adeb93bacaa731a1e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 2 16:11:08 2014 +0200 ddraw/tests: Add a test for getdc palette handling. --- dlls/ddraw/tests/ddraw1.c | 301 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 301 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 301 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 301 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1204 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8bcb6c7adeb93bacaa73…

1 0

Francois Gouget : ddraw: Remove WINAPI on static functions where not needed.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 4e950d9cbc7c8284d6a708d2a07b9a9ee7994d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e950d9cbc7c8284d6a708d2a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 2 16:44:23 2014 +0200 ddraw: Remove WINAPI on static functions where not needed. --- dlls/ddraw/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b561af4..d192348 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -447,7 +447,7 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) return IUnknown_AddRef(surface->texture_outer); } -static HRESULT WINAPI ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectDrawPalette *palette) +static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectDrawPalette *palette) { struct ddraw_palette *palette_impl = unsafe_impl_from_IDirectDrawPalette(palette); struct ddraw_palette *prev;

1 0

Matteo Bruni : d3dcompiler: Remove a couple of noisy traces.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 89cac9c20dd85837f9ac8dc57b83de16dcd0b21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89cac9c20dd85837f9ac8dc57… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 2 16:30:12 2014 +0200 d3dcompiler: Remove a couple of noisy traces. --- dlls/d3dcompiler_43/hlsl.y | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index ef68547..1efb65b 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1400,7 +1400,6 @@ base_type: KW_VOID { struct hlsl_type *type; - TRACE("Type %s.\n", $1); type = get_type(hlsl_ctx.cur_scope, $1, TRUE); $$ = type; d3dcompiler_free($1); @@ -1409,7 +1408,6 @@ base_type: KW_VOID { struct hlsl_type *type; - TRACE("Struct type %s.\n", $2); type = get_type(hlsl_ctx.cur_scope, $2, TRUE); if (type->type != HLSL_CLASS_STRUCT) {

1 0

Stefan Dösinger : ddraw/tests: Test mipmap GetDC behavior.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 7839ec874f2532ef59090d3b1e66d4ec75661122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7839ec874f2532ef59090d3b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 2 13:43:23 2014 +0200 ddraw/tests: Test mipmap GetDC behavior. --- dlls/ddraw/tests/ddraw1.c | 28 +++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw2.c | 28 +++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw4.c | 28 +++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw7.c | 5 +++++ 4 files changed, 80 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7839ec874f2532ef59090…

1 0

Matteo Bruni : d3dcompiler: add_func_parameter is only used in hlsl.y.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: c37714342ec3339c97338416e67b9fe324173bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37714342ec3339c97338416e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 2 16:30:14 2014 +0200 d3dcompiler: add_func_parameter is only used in hlsl.y. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 -- dlls/d3dcompiler_43/hlsl.y | 25 +++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 25 ------------------------- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index f7403f5..eb81ea5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1106,8 +1106,6 @@ static inline struct hlsl_ir_loop *loop_from_node(const struct hlsl_ir_node *nod BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; -BOOL add_func_parameter(struct list *list, struct parse_parameter *param, - const struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 9f2daba..f37e07e 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -808,6 +808,31 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis return TRUE; } +static BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location *loc) +{ + struct hlsl_ir_var *decl = d3dcompiler_alloc(sizeof(*decl)); + + if (!decl) + { + ERR("Out of memory.\n"); + return FALSE; + } + decl->node.type = HLSL_IR_VAR; + decl->node.data_type = param->type; + decl->node.loc = *loc; + decl->name = param->name; + decl->semantic = param->semantic; + decl->modifiers = param->modifiers; + + if (!add_declaration(hlsl_ctx.cur_scope, decl, FALSE)) + { + free_declaration(decl); + return FALSE; + } + list_add_tail(list, &decl->node.entry); + return TRUE; +} + static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tree *funcs, char *name, struct list *params, BOOL exact_signature) { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index c110718..858277a 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -805,31 +805,6 @@ void free_declaration(struct hlsl_ir_var *decl) d3dcompiler_free(decl); } -BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location *loc) -{ - struct hlsl_ir_var *decl = d3dcompiler_alloc(sizeof(*decl)); - - if (!decl) - { - ERR("Out of memory.\n"); - return FALSE; - } - decl->node.type = HLSL_IR_VAR; - decl->node.data_type = param->type; - decl->node.loc = *loc; - decl->name = param->name; - decl->semantic = param->semantic; - decl->modifiers = param->modifiers; - - if (!add_declaration(hlsl_ctx.cur_scope, decl, FALSE)) - { - free_declaration(decl); - return FALSE; - } - list_add_tail(list, &decl->node.entry); - return TRUE; -} - struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) {

1 0

Matteo Bruni : d3dcompiler: Pre/post increment/ decrement operators are unary.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: d25486fba4b87981618e0f55a5a7388db95c204f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25486fba4b87981618e0f55a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 2 16:30:13 2014 +0200 d3dcompiler: Pre/post increment/decrement operators are unary. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 10 +++++----- dlls/d3dcompiler_43/hlsl.y | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1be52bc..f7403f5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -826,6 +826,11 @@ enum hlsl_ir_expr_op { HLSL_IR_UNOP_SAT, + HLSL_IR_UNOP_PREINC, + HLSL_IR_UNOP_PREDEC, + HLSL_IR_UNOP_POSTINC, + HLSL_IR_UNOP_POSTDEC, + HLSL_IR_BINOP_ADD, HLSL_IR_BINOP_SUB, HLSL_IR_BINOP_MUL, @@ -856,11 +861,6 @@ enum hlsl_ir_expr_op { HLSL_IR_BINOP_POW, - HLSL_IR_BINOP_PREINC, - HLSL_IR_BINOP_PREDEC, - HLSL_IR_BINOP_POSTINC, - HLSL_IR_BINOP_POSTDEC, - HLSL_IR_TEROP_LERP, HLSL_IR_SEQUENCE, diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 1efb65b..9f2daba 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1848,7 +1848,7 @@ postfix_expr: primary_expr } operands[0] = $1; operands[1] = operands[2] = NULL; - $$ = &new_expr(HLSL_IR_BINOP_POSTINC, operands, &loc)->node; + $$ = &new_expr(HLSL_IR_UNOP_POSTINC, operands, &loc)->node; /* Post increment/decrement expressions are considered const */ $$->data_type = clone_hlsl_type($$->data_type); $$->data_type->modifiers |= HLSL_MODIFIER_CONST; @@ -1867,7 +1867,7 @@ postfix_expr: primary_expr } operands[0] = $1; operands[1] = operands[2] = NULL; - $$ = &new_expr(HLSL_IR_BINOP_POSTDEC, operands, &loc)->node; + $$ = &new_expr(HLSL_IR_UNOP_POSTDEC, operands, &loc)->node; /* Post increment/decrement expressions are considered const */ $$->data_type = clone_hlsl_type($$->data_type); $$->data_type->modifiers |= HLSL_MODIFIER_CONST; @@ -2040,7 +2040,7 @@ unary_expr: postfix_expr } operands[0] = $2; operands[1] = operands[2] = NULL; - $$ = &new_expr(HLSL_IR_BINOP_PREINC, operands, &loc)->node; + $$ = &new_expr(HLSL_IR_UNOP_PREINC, operands, &loc)->node; } | OP_DEC unary_expr { @@ -2056,7 +2056,7 @@ unary_expr: postfix_expr } operands[0] = $2; operands[1] = operands[2] = NULL; - $$ = &new_expr(HLSL_IR_BINOP_PREDEC, operands, &loc)->node; + $$ = &new_expr(HLSL_IR_UNOP_PREDEC, operands, &loc)->node; } | unary_op unary_expr {

1 0

Stefan Dösinger : wined3d: Remove broken gdi palette code.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 39212d2ffb908f343c42e7f405cb013424bd5bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=39212d2ffb908f343c42e7f40… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 2 13:43:24 2014 +0200 wined3d: Remove broken gdi palette code. --- dlls/ddraw/tests/ddraw1.c | 5 ++--- dlls/ddraw/tests/ddraw2.c | 5 ++--- dlls/ddraw/tests/ddraw4.c | 5 ++--- dlls/ddraw/tests/ddraw7.c | 5 ++--- dlls/wined3d/palette.c | 18 ++---------------- dlls/wined3d/surface.c | 1 - dlls/wined3d/wined3d_private.h | 6 ++---- 7 files changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c993e6f..7dd3412 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5097,10 +5097,9 @@ static void test_palette_gdi(void) hr = IDirectDrawSurface_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); - SelectPalette(dc, ddraw_palette_handle, FALSE); i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); @@ -5197,7 +5196,7 @@ static void test_palette_gdi(void) ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); /* Windows 2000 on the testbot assigns a different palette to the primary. Refrast? */ - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); SelectPalette(dc, ddraw_palette_handle, FALSE); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3433ac1..aaef2bc 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6165,10 +6165,9 @@ static void test_palette_gdi(void) hr = IDirectDrawSurface_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); - SelectPalette(dc, ddraw_palette_handle, FALSE); i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); @@ -6265,7 +6264,7 @@ static void test_palette_gdi(void) ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); /* Windows 2000 on the testbot assigns a different palette to the primary. Refrast? */ - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); SelectPalette(dc, ddraw_palette_handle, FALSE); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ff38553..cc96045 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7067,10 +7067,9 @@ static void test_palette_gdi(void) hr = IDirectDrawSurface4_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); - SelectPalette(dc, ddraw_palette_handle, FALSE); i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); @@ -7167,7 +7166,7 @@ static void test_palette_gdi(void) ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); /* Windows 2000 on the testbot assigns a different palette to the primary. Refrast? */ - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); SelectPalette(dc, ddraw_palette_handle, FALSE); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 62f8ac6..fca2892 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6789,10 +6789,9 @@ static void test_palette_gdi(void) hr = IDirectDrawSurface7_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); - SelectPalette(dc, ddraw_palette_handle, FALSE); i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); @@ -6889,7 +6888,7 @@ static void test_palette_gdi(void) ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE); /* Windows 2000 on the testbot assigns a different palette to the primary. Refrast? */ - todo_wine ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), + ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE), "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); SelectPalette(dc, ddraw_palette_handle, FALSE); diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index e659952..5572d10 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -45,10 +45,7 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) TRACE("%p decreasing refcount to %u.\n", palette, refcount); if (!refcount) - { - DeleteObject(palette->hpal); HeapFree(GetProcessHeap(), 0, palette); - } return refcount; } @@ -61,7 +58,7 @@ HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, if (flags) return WINED3DERR_INVALIDCALL; /* unchecked */ - if (start > palette->palNumEntries || count > palette->palNumEntries - start) + if (start > palette->size || count > palette->size - start) return WINED3DERR_INVALIDCALL; if (palette->flags & WINED3D_PALETTE_8BIT_ENTRIES) @@ -111,9 +108,6 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, palette->palents[255].peGreen = 255; palette->palents[255].peBlue = 255; } - - if (palette->hpal) - SetPaletteEntries(palette->hpal, start, count, palette->palents + start); } /* If the palette is attached to the render target, update all render targets */ @@ -138,19 +132,11 @@ static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wine palette->ref = 1; palette->device = device; palette->flags = flags; - - palette->palNumEntries = entry_count; - palette->hpal = CreatePalette((const LOGPALETTE *)&palette->palVersion); - if (!palette->hpal) - { - WARN("Failed to create palette.\n"); - return E_FAIL; - } + palette->size = entry_count; if (FAILED(hr = wined3d_palette_set_entries(palette, 0, 0, entry_count, entries))) { WARN("Failed to set palette entries, hr %#x.\n", hr); - DeleteObject(palette->hpal); return hr; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 680a815..cd3b5a2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -499,7 +499,6 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) surface->hDC = CreateCompatibleDC(0); SelectObject(surface->hDC, surface->dib.DIBsection); TRACE("Using wined3d palette %p.\n", surface->palette); - SelectPalette(surface->hDC, surface->palette ? surface->palette->hpal : 0, FALSE); surface->flags |= SFLAG_DIBSECTION; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e67f1e..395568a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2957,10 +2957,8 @@ struct wined3d_palette LONG ref; struct wined3d_device *device; - HPALETTE hpal; - WORD palVersion; /*| */ - WORD palNumEntries; /*| LOGPALETTE */ - PALETTEENTRY palents[256]; /*| */ + unsigned int size; + PALETTEENTRY palents[256]; DWORD flags; };

1 0

Akihiro Sagawa : msvfw32: Fix uncompressed bitmap size handling in DrawDibDraw.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: af089289b32dbeec797f810938bca4adc8f717db URL: http://source.winehq.org/git/wine.git/?a=commit;h=af089289b32dbeec797f81093… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 2 22:14:24 2014 +0900 msvfw32: Fix uncompressed bitmap size handling in DrawDibDraw. --- dlls/msvfw32/drawdib.c | 8 ++------ dlls/msvfw32/tests/drawdib.c | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index 2916126..c4e5c40 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -355,12 +355,6 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, if (!(wFlags & DDF_UPDATE)) { - DWORD biSizeImage = lpbi->biSizeImage; - - /* biSizeImage may be set to 0 for BI_RGB (uncompressed) bitmaps */ - if ((lpbi->biCompression == BI_RGB) && (biSizeImage == 0)) - biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 * lpbi->biHeight; - if (lpbi->biCompression) { DWORD flags = 0; @@ -374,6 +368,8 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, } else { + /* BI_RGB: lpbi->biSizeImage isn't reliable */ + DWORD biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 * lpbi->biHeight; memcpy(whdd->lpvbits, lpBits, biSizeImage); } } diff --git a/dlls/msvfw32/tests/drawdib.c b/dlls/msvfw32/tests/drawdib.c index 24d8631..0a59d82 100644 --- a/dlls/msvfw32/tests/drawdib.c +++ b/dlls/msvfw32/tests/drawdib.c @@ -105,6 +105,12 @@ static void test_DrawDib_sizeimage(void) { 0, 0, 0, "" }, { 0, HEIGHT, 0, "" }, { WIDTH, 0, 0, "" }, + /* [8] zero size (to compare [9], [10] ) */ + { WIDTH, HEIGHT/2, 0, "8b75bf6d54a8645380114fe77505ee0699ffffaa" }, + /* [9] insufficient size */ + { WIDTH, HEIGHT/2, sizeof(RGBQUAD), "8b75bf6d54a8645380114fe77505ee0699ffffaa" }, + /* [10] too much size */ + { WIDTH, HEIGHT/2, WIDTH * HEIGHT * sizeof(RGBQUAD), "8b75bf6d54a8645380114fe77505ee0699ffffaa" }, }; HDC hdc; DWORD src_dib_size, dst_dib_size;

1 0

Henri Verbeet : wined3d: Bump ps_1x_max_value.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 14e3f71c7561d46bab0025b07c9ba5ad0dc1ad45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e3f71c7561d46bab0025b07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 2 12:50:15 2014 +0200 wined3d: Bump ps_1x_max_value. Shader model 4 hardware should generally have real floats for everything, and FLT_MAX matches the value from the Windows drivers for that kind of hardware. OpenGL requires at least 2^10 for colors, and 2^32 for other floats. --- dlls/wined3d/glsl_shader.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c86d400..cece6c1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -34,6 +34,9 @@ #include <limits.h> #include <stdio.h> +#ifdef HAVE_FLOAT_H +# include <float.h> +#endif #include "wined3d_private.h" @@ -6590,7 +6593,10 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s * the shader will generate incorrect results too. Unfortunately, GL deliberately doesn't * offer a way to query this. */ - caps->ps_1x_max_value = 8.0; + if (shader_model >= 4) + caps->ps_1x_max_value = FLT_MAX; + else + caps->ps_1x_max_value = 1024.0f; /* Ideally we'd only set caps like sRGB writes here if supported by both * the shader backend and the fragment pipe, but we can get called before

1 0

Akihiro Sagawa : msvfw32: Drawdib doesn't support inverted DIBs.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 47a3a0528d5bb2ec84b58a00937639413a803727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a3a0528d5bb2ec84b58a009… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 2 22:14:22 2014 +0900 msvfw32: Drawdib doesn't support inverted DIBs. --- dlls/msvfw32/drawdib.c | 17 ++++++++++++++--- dlls/msvfw32/tests/drawdib.c | 7 +++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index 9877e62..2916126 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -246,9 +246,18 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd, DWORD dwSize; /* No compression */ TRACE("Not compressed!\n"); - dwSize = lpbi->biSize + num_colours(lpbi)*sizeof(RGBQUAD); - whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, dwSize); - memcpy(whdd->lpbiOut, lpbi, dwSize); + if (lpbi->biHeight <= 0) + { + /* we don't draw inverted DIBs */ + TRACE("detected inverted DIB\n"); + ret = FALSE; + } + else + { + dwSize = lpbi->biSize + num_colours(lpbi)*sizeof(RGBQUAD); + whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, dwSize); + memcpy(whdd->lpbiOut, lpbi, dwSize); + } } if (ret) @@ -332,6 +341,8 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, { TRACE("Something changed!\n"); ret = DrawDibBegin(hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, 0); + if (!ret) + return ret; } #undef CHANGED diff --git a/dlls/msvfw32/tests/drawdib.c b/dlls/msvfw32/tests/drawdib.c index 54dd813..24d8631 100644 --- a/dlls/msvfw32/tests/drawdib.c +++ b/dlls/msvfw32/tests/drawdib.c @@ -98,6 +98,13 @@ static void test_DrawDib_sizeimage(void) { WIDTH, HEIGHT, WIDTH * HEIGHT * sizeof(RGBQUAD), "bc943d5ab024b8b0118d0a80aa283055d39942b8" }, /* [1] zero size */ { WIDTH, HEIGHT, 0, "bc943d5ab024b8b0118d0a80aa283055d39942b8" }, + /* error patterns */ + { WIDTH, -HEIGHT, 0, "" }, + { -WIDTH, HEIGHT, 0, "" }, + { -WIDTH, -HEIGHT, 0, "" }, + { 0, 0, 0, "" }, + { 0, HEIGHT, 0, "" }, + { WIDTH, 0, 0, "" }, }; HDC hdc; DWORD src_dib_size, dst_dib_size;

1 0