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

Piotr Caban : include: Add STATE_SYSTEM_* definition to oleacc.idl.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: b6284cfc63872a34cb5cfe4f4494f1a8187fb367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6284cfc63872a34cb5cfe4f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:40 2014 +0200 include: Add STATE_SYSTEM_* definition to oleacc.idl. --- include/oleacc.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/include/oleacc.idl b/include/oleacc.idl index e9cf138..daf7dec 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -18,6 +18,7 @@ import "oaidl.idl"; +cpp_quote("#define NAVDIR_MIN 0") cpp_quote("#define NAVDIR_UP 1") cpp_quote("#define NAVDIR_DOWN 2") cpp_quote("#define NAVDIR_LEFT 3") @@ -26,6 +27,7 @@ cpp_quote("#define NAVDIR_NEXT 5") cpp_quote("#define NAVDIR_PREVIOUS 6") cpp_quote("#define NAVDIR_FIRSTCHILD 7") cpp_quote("#define NAVDIR_LASTCHILD 8") +cpp_quote("#define NAVDIR_MAX 9") cpp_quote("#define ROLE_SYSTEM_TITLEBAR 1") cpp_quote("#define ROLE_SYSTEM_MENUBAR 2") @@ -100,6 +102,45 @@ cpp_quote("#define SELFLAG_ADDSELECTION 0x08") cpp_quote("#define SELFLAG_REMOVESELECTION 0x10") cpp_quote("#define SELFLAG_VALID 0x1f") +cpp_quote("#ifndef STATE_SYSTEM_UNAVAILABLE") +cpp_quote("#define STATE_SYSTEM_NORMAL 0x00000000") +cpp_quote("#define STATE_SYSTEM_UNAVAILABLE 0x00000001") +cpp_quote("#define STATE_SYSTEM_SELECTED 0x00000002") +cpp_quote("#define STATE_SYSTEM_FOCUSED 0x00000004") +cpp_quote("#define STATE_SYSTEM_PRESSED 0x00000008") +cpp_quote("#define STATE_SYSTEM_CHECKED 0x00000010") +cpp_quote("#define STATE_SYSTEM_MIXED 0x00000020") +cpp_quote("#define STATE_SYSTEM_INDETERMINATE STATE_SYSTEM_MIXED") +cpp_quote("#define STATE_SYSTEM_READONLY 0x00000040") +cpp_quote("#define STATE_SYSTEM_HOTTRACKED 0x00000080") +cpp_quote("#define STATE_SYSTEM_DEFAULT 0x00000100") +cpp_quote("#define STATE_SYSTEM_EXPANDED 0x00000200") +cpp_quote("#define STATE_SYSTEM_COLLAPSED 0x00000400") +cpp_quote("#define STATE_SYSTEM_BUSY 0x00000800") +cpp_quote("#define STATE_SYSTEM_FLOATING 0x00001000") +cpp_quote("#define STATE_SYSTEM_MARQUEED 0x00002000") +cpp_quote("#define STATE_SYSTEM_ANIMATED 0x00004000") +cpp_quote("#define STATE_SYSTEM_INVISIBLE 0x00008000") +cpp_quote("#define STATE_SYSTEM_OFFSCREEN 0x00010000") +cpp_quote("#define STATE_SYSTEM_SIZEABLE 0x00020000") +cpp_quote("#define STATE_SYSTEM_MOVEABLE 0x00040000") +cpp_quote("#define STATE_SYSTEM_SELFVOICING 0x00080000") +cpp_quote("#define STATE_SYSTEM_FOCUSABLE 0x00100000") +cpp_quote("#define STATE_SYSTEM_SELECTABLE 0x00200000") +cpp_quote("#define STATE_SYSTEM_LINKED 0x00400000") +cpp_quote("#define STATE_SYSTEM_TRAVERSED 0x00800000") +cpp_quote("#define STATE_SYSTEM_MULTISELECTABLE 0x01000000") +cpp_quote("#define STATE_SYSTEM_EXTSELECTABLE 0x02000000") +cpp_quote("#define STATE_SYSTEM_ALERT_LOW 0x04000000") +cpp_quote("#define STATE_SYSTEM_ALERT_MEDIUM 0x08000000") +cpp_quote("#define STATE_SYSTEM_ALERT_HIGH 0x10000000") +cpp_quote("#define STATE_SYSTEM_PROTECTED 0x20000000") +cpp_quote("#define STATE_SYSTEM_VALID 0x7FFFFFFF") +cpp_quote("#endif") +cpp_quote("#ifndef STATE_SYSTEM_HASPOPUP") +cpp_quote("#define STATE_SYSTEM_HASPOPUP 0x40000000") +cpp_quote("#endif") + typedef GUID MSAAPROPID; typedef enum AnnoScope

1 0

Stefan Dösinger : wined3d: Always provide P8 GL texture information.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 7b049245f532d355ea0541c9a970d3459144aaf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b049245f532d355ea0541c9a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:51 2014 +0200 wined3d: Always provide P8 GL texture information. --- dlls/wined3d/surface.c | 23 ++--------------------- dlls/wined3d/utils.c | 2 +- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e0ba375..8e4b88b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1457,12 +1457,6 @@ static void surface_download_data(struct wined3d_surface *surface, const struct int src_pitch = 0; int dst_pitch = 0; - if (format->id == WINED3DFMT_P8_UINT) - { - gl_format = GL_ALPHA; - gl_type = GL_UNSIGNED_BYTE; - } - if (surface->flags & SFLAG_NONPOW2) { unsigned char alignment = surface->resource.device->surface_alignment; @@ -3211,8 +3205,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BYTE *mem; - GLint fmt; - GLint type; BYTE *row, *top, *bottom; int i; BOOL srcIsUpsideDown; @@ -3246,18 +3238,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc srcIsUpsideDown = FALSE; } - switch (surface->resource.format->id) - { - case WINED3DFMT_P8_UINT: - fmt = GL_ALPHA; - type = GL_UNSIGNED_BYTE; - break; - - default: - fmt = surface->resource.format->glFormat; - type = surface->resource.format->glType; - } - if (data.buffer_object) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data.buffer_object)); @@ -3270,7 +3250,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc gl_info->gl_ops.gl.p_glReadPixels(0, 0, surface->resource.width, surface->resource.height, - fmt, type, data.addr); + surface->resource.format->glFormat, + surface->resource.format->glType, data.addr); checkGLcall("glReadPixels"); /* Reset previous pixel store pack state */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 044eed0..c077567 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -743,7 +743,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, 0, - ARB_FRAGMENT_PROGRAM, NULL}, + 0, NULL}, /* Standard ARGB formats */ {WINED3DFMT_B8G8R8_UNORM, GL_RGB8, GL_RGB8, 0, GL_BGR, GL_UNSIGNED_BYTE, 0,

1 0

Henri Verbeet : d2d1: Add the ID2D1Brush interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: eb4d5c7a254fe5e1e688e874c7b142e9d8d1331f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4d5c7a254fe5e1e688e874c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 07:56:26 2014 +0200 d2d1: Add the ID2D1Brush interface. --- include/d2d1.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 367905c..ef05f00 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -543,5 +543,24 @@ interface ID2D1Bitmap : ID2D1Image ); } +[ + local, + object, + uuid(2cd906a8-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1Brush : ID2D1Resource +{ + void SetOpacity( + [in] float opacity + ); + void SetTransform( + [in] const D2D1_MATRIX_3X2_F *transform + ); + float GetOpacity(); + void GetTransform( + [out] D2D1_MATRIX_3X2_F *transform + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1Bitmap interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 2156e68a4ce47a2d1347d4c1efc40a0a6669e5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2156e68a4ce47a2d1347d4c1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 13:02:38 2014 +0200 d2d1: Add the ID2D1Bitmap interface. --- include/d2d1.idl | 36 ++++++++++++++++++++++++++++++++++++ include/d2dbasetypes.h | 20 ++++++++++++++++++++ include/dcommon.h | 17 +++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 55a8f4d..367905c 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -17,9 +17,11 @@ */ import "unknwn.idl"; +import "dcommon.h"; import "d2dbasetypes.h"; interface ID2D1Factory; +interface ID2D1RenderTarget; interface IDWriteRenderingParams; typedef D2D_POINT_2F D2D1_POINT_2F; @@ -27,6 +29,9 @@ typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; typedef D2D_SIZE_F D2D1_SIZE_F; typedef UINT64 D2D1_TAG; +typedef D2D_SIZE_U D2D1_SIZE_U; +typedef D2D_POINT_2U D2D1_POINT_2U; +typedef D2D_RECT_U D2D1_RECT_U; typedef enum D2D1_DEBUG_LEVEL { @@ -507,5 +512,36 @@ interface ID2D1Image : ID2D1Resource { } +[ + local, + object, + uuid(a2296057-ea42-4099-983b-539fb6505426) +] +interface ID2D1Bitmap : ID2D1Image +{ + D2D1_SIZE_F GetSize(); + D2D1_SIZE_U GetPixelSize(); + D2D1_PIXEL_FORMAT GetPixelFormat(); + void GetDpi( + [out] float *dpi_x, + [out] float *dpi_y + ); + HRESULT CopyFromBitmap( + [in] const D2D1_POINT_2U *dst_point, + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_RECT_U *src_rect + ); + HRESULT CopyFromRenderTarget( + [in] const D2D1_POINT_2U *dst_point, + [in] ID2D1RenderTarget *render_target, + [in] const D2D1_RECT_U *src_rect + ); + HRESULT CopyFromMemory( + [in] const D2D1_RECT_U *dst_rect, + [in] const void *src_data, + [in] UINT32 pitch + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index 4ddb994..61158ac 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -45,3 +45,23 @@ typedef struct D2D_SIZE_F float width; float height; } D2D_SIZE_F; + +typedef struct D2D_SIZE_U +{ + UINT32 width; + UINT32 height; +} D2D_SIZE_U; + +typedef struct D2D_POINT_2U +{ + UINT32 x; + UINT32 y; +} D2D_POINT_2U; + +typedef struct D2D_RECT_U +{ + UINT32 left; + UINT32 top; + UINT32 right; + UINT32 bottom; +} D2D_RECT_U; diff --git a/include/dcommon.h b/include/dcommon.h index 50daefb..56445a3 100644 --- a/include/dcommon.h +++ b/include/dcommon.h @@ -19,6 +19,8 @@ #ifndef __WINE_DCOMMON_H #define __WINE_DCOMMON_H +#include "dxgiformat.h" + typedef enum DWRITE_MEASURING_MODE { DWRITE_MEASURING_MODE_NATURAL, @@ -26,4 +28,19 @@ typedef enum DWRITE_MEASURING_MODE DWRITE_MEASURING_MODE_GDI_NATURAL } DWRITE_MEASURING_MODE; +typedef enum D2D1_ALPHA_MODE +{ + D2D1_ALPHA_MODE_UNKNOWN = 0, + D2D1_ALPHA_MODE_PREMULTIPLIED = 1, + D2D1_ALPHA_MODE_STRAIGHT = 2, + D2D1_ALPHA_MODE_IGNORE = 3, + D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_ALPHA_MODE; + +typedef struct D2D1_PIXEL_FORMAT +{ + DXGI_FORMAT format; + D2D1_ALPHA_MODE alphaMode; +} D2D1_PIXEL_FORMAT; + #endif /* __WINE_DCOMMON_H */

1 0

Henri Verbeet : d2d1: Add the ID2D1Image interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 61a909069d29070685f6f59ff9f6ebda7593dcec URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a909069d29070685f6f59ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 07:56:24 2014 +0200 d2d1: Add the ID2D1Image interface. --- include/d2d1.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 6fcadee..55a8f4d 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -498,5 +498,14 @@ interface ID2D1DrawingStateBlock : ID2D1Resource ); } +[ + local, + object, + uuid(65019f75-8da2-497c-b32c-dfa34e48ede6) +] +interface ID2D1Image : ID2D1Resource +{ +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1PathGeometry interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: a4b15c1bb5a07fc8ae9f610b4188f92f0321683c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b15c1bb5a07fc8ae9f610b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 07:56:22 2014 +0200 d2d1: Add the ID2D1PathGeometry interface. --- include/d2d1.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index bfed202..c6b9288 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -429,5 +429,26 @@ interface ID2D1GeometrySink : ID2D1SimplifiedGeometrySink ); } +[ + local, + object, + uuid(2cd906a5-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1PathGeometry : ID2D1Geometry +{ + HRESULT Open( + [out] ID2D1GeometrySink **sink + ); + HRESULT Stream( + [in] ID2D1GeometrySink *sink + ); + HRESULT GetSegmentCount( + [out] UINT32 *count + ); + HRESULT GetFigureCount( + [out] UINT32 *count + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Piotr Caban : user32: Fix LoadStringA behavior on 1-character long buffer.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: c2df317c4b7be489d63fd559d7fb6676578a0bb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2df317c4b7be489d63fd559d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:27 2014 +0200 user32: Fix LoadStringA behavior on 1-character long buffer. --- dlls/user32/resource.c | 3 ++- dlls/user32/tests/resource.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 1917d51..83442d8 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -310,7 +310,8 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT while (id--) p += *p + 1; - RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR) ); + if (buflen != 1) + RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR) ); } buffer[retval] = 0; TRACE("returning %s\n", debugstr_a(buffer)); diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 9cb7380..2388adb 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -126,6 +126,13 @@ static void test_LoadStringA (void) ok( ret == -1 || broken(ret == 0), "LoadStringA did not return -1 when called with buflen = 0, got %d, err %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + buf[0] = 'a'; + ret = LoadStringA(hInst, 1, buf, 1); + ok( !ret, "LoadString returned %d\n", ret); + ok( buf[0] == 0, "buf[0] = %c (%x)\n", buf[0], buf[0]); + ok( GetLastError() == 0xdeadbeef, "GetLastError() = %d\n", GetLastError()); } static void test_accel1(void)

1 0

Stefan Dösinger : wined3d: Don' t update the color table on palette changes.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 544816797adc4de21713abe4c9e208692d88eaa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=544816797adc4de21713abe4c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:53 2014 +0200 wined3d: Don't update the color table on palette changes. --- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- dlls/wined3d/surface.c | 15 +++------------ 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ef07b97..c8f7d65 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5126,7 +5126,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -5139,7 +5139,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 64aa519..23795d3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6194,7 +6194,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -6207,7 +6207,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b760dfb..3d0bfe5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7096,7 +7096,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -7109,7 +7109,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 8c5f6ac..97a6a19 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6818,7 +6818,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -6831,7 +6831,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8e4b88b..dea27ab 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -787,12 +787,6 @@ static void surface_realize_palette(struct wined3d_surface *surface) } } - if (surface->flags & SFLAG_DIBSECTION) - { - TRACE("Updating the DC's palette.\n"); - SetDIBColorTable(surface->hDC, 0, 256, palette->colors); - } - /* Propagate the changes to the drawable when we have a palette. */ if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) surface_load_location(surface, surface->draw_binding); @@ -1379,17 +1373,14 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) if (!palette) return; - if (surface->flags & SFLAG_DIBSECTION) - { - TRACE("Updating the DC's palette.\n"); - SetDIBColorTable(surface->hDC, 0, 256, palette->colors); - } - /* Update the image because of the palette change. Some games like e.g. * Red Alert call SetEntries a lot to implement fading. */ /* Tell the swapchain to update the screen. */ if (surface->swapchain && surface == surface->swapchain->front_buffer) + { + SetDIBColorTable(surface->hDC, 0, 256, palette->colors); x11_copy_to_screen(surface->swapchain, NULL); + } } static void gdi_surface_unmap(struct wined3d_surface *surface)

1 0

Stefan Dösinger : wined3d: Remove WINED3D_CT_PALETTED_CK.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: bfb5be0f4b93aa36044847d8d930ec6224d5fc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb5be0f4b93aa36044847d8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:50 2014 +0200 wined3d: Remove WINED3D_CT_PALETTED_CK. There's no difference between WINED3D_CT_PALETTED_CK and WINED3D_CT_PALETTED with the palette index in the alpha channel. --- dlls/wined3d/arb_program_shader.c | 3 +-- dlls/wined3d/surface.c | 10 +++------- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 653298a..195c3ae 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7282,9 +7282,8 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; - BOOL colorkey = !!(surface->container->color_key_flags & WINEDDSD_CKSRCBLT); - d3dfmt_p8_init_palette(surface, table, colorkey); + d3dfmt_p8_init_palette(surface, table); if (!priv->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &priv->palette_texture); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0e71de0..e0ba375 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1725,10 +1725,7 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ format->glInternal = GL_RGBA; format->glType = GL_UNSIGNED_BYTE; format->conv_byte_count = 4; - if (colorkey_active) - *conversion_type = WINED3D_CT_PALETTED_CK; - else - *conversion_type = WINED3D_CT_PALETTED; + *conversion_type = WINED3D_CT_PALETTED; } break; @@ -3426,7 +3423,7 @@ static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD colo && color <= color_key->color_space_high_value; } -void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) +void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4]) { const struct wined3d_palette *pal = surface->palette; unsigned int i; @@ -3475,12 +3472,11 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } case WINED3D_CT_PALETTED: - case WINED3D_CT_PALETTED_CK: { BYTE table[256][4]; unsigned int x, y; - d3dfmt_p8_init_palette(surface, table, (conversion_type == WINED3D_CT_PALETTED_CK)); + d3dfmt_p8_init_palette(surface, table); for (y = 0; y < height; y++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f7b5c57..9233148 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2341,7 +2341,6 @@ enum wined3d_conversion_type { WINED3D_CT_NONE, WINED3D_CT_PALETTED, - WINED3D_CT_PALETTED_CK, WINED3D_CT_CK_565, WINED3D_CT_CK_5551, WINED3D_CT_CK_RGB24, @@ -2349,7 +2348,7 @@ enum wined3d_conversion_type WINED3D_CT_CK_ARGB32, }; -void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN; +void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4]) DECLSPEC_HIDDEN; struct wined3d_sampler {

1 0

Stefan Dösinger : wined3d: Use GL_ALPHA8 for WINED3DFMT_P8_UINT surfaces.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 3cd83f4d56b94d6041acc4312073fbdb8f250a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd83f4d56b94d6041acc4312… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:52 2014 +0200 wined3d: Use GL_ALPHA8 for WINED3DFMT_P8_UINT surfaces. --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c077567..6a27920 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -740,7 +740,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_FLOAT, NULL}, /* Palettized formats */ - {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, + {WINED3DFMT_P8_UINT, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, 0, 0, NULL},

1 0