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

Vincent Povirk : ole32: STGM_NOSNAPSHOT implies deny write.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: b3e26be0cb80daf582e8c57fb58bf6851b089e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e26be0cb80daf582e8c57fb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 9 14:51:07 2014 -0500 ole32: STGM_NOSNAPSHOT implies deny write. --- dlls/ole32/storage32.c | 10 ++++++++++ dlls/ole32/storage32.h | 9 ++++++--- dlls/ole32/tests/storage32.c | 4 ++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 56d3229..786924b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2908,6 +2908,13 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) ULARGE_INTEGER cb; DWORD share_mode = STGM_SHARE_MODE(openFlags); + if (openFlags & STGM_NOSNAPSHOT) + { + /* STGM_NOSNAPSHOT implies deny write */ + if (share_mode == STGM_SHARE_DENY_READ) share_mode = STGM_SHARE_EXCLUSIVE; + else if (share_mode != STGM_SHARE_EXCLUSIVE) share_mode = STGM_SHARE_DENY_WRITE; + } + /* Wrap all other locking inside a single lock so we can check ranges safely */ offset.QuadPart = RANGELOCK_CHECKLOCKS; cb.QuadPart = 1; @@ -2954,6 +2961,9 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) if (SUCCEEDED(hr) && (share_mode == STGM_SHARE_DENY_WRITE || share_mode == STGM_SHARE_EXCLUSIVE)) hr = StorageImpl_LockOne(This, RANGELOCK_DENY_WRITE_FIRST, RANGELOCK_DENY_WRITE_LAST); + if (SUCCEEDED(hr) && (openFlags & STGM_NOSNAPSHOT) == STGM_NOSNAPSHOT) + hr = StorageImpl_LockOne(This, RANGELOCK_NOSNAPSHOT_FIRST, RANGELOCK_NOSNAPSHOT_LAST); + offset.QuadPart = RANGELOCK_CHECKLOCKS; cb.QuadPart = 1; ILockBytes_UnlockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE); diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 0b8bcc8..c6fe8b2 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -508,7 +508,8 @@ StgStreamImpl* StgStreamImpl_Construct( * In particular, ends of ranges may be wrong. 0x0 through 0x57: Unknown. Causes read-only exclusive opens to fail. - 0x58 through 0x7f: Priority mode. + 0x58 through 0x6b: Priority mode. + 0x6c through 0x7f: No snapshot mode. 0x80: Commit lock. 0x81 through 0x91: Priority mode, again. Not sure why it uses two regions. 0x92: Lock-checking lock. Held while opening so ranges can be tested without @@ -524,7 +525,9 @@ StgStreamImpl* StgStreamImpl_Construct( #define RANGELOCK_UNK1_FIRST 0x7fffff00 #define RANGELOCK_UNK1_LAST 0x7fffff57 #define RANGELOCK_PRIORITY1_FIRST 0x7fffff58 -#define RANGELOCK_PRIORITY1_LAST 0x7fffff7f +#define RANGELOCK_PRIORITY1_LAST 0x7fffff6b +#define RANGELOCK_NOSNAPSHOT_FIRST 0x7fffff6c +#define RANGELOCK_NOSNAPSHOT_LAST 0x7fffff7f #define RANGELOCK_COMMIT 0x7fffff80 #define RANGELOCK_PRIORITY2_FIRST 0x7fffff81 #define RANGELOCK_PRIORITY2_LAST 0x7fffff91 @@ -539,7 +542,7 @@ StgStreamImpl* StgStreamImpl_Construct( #define RANGELOCK_DENY_WRITE_LAST 0x7fffffe2 #define RANGELOCK_UNK2_FIRST 0x7fffffe3 #define RANGELOCK_UNK2_LAST 0x7fffffff -#define RANGELOCK_TRANSACTION_FIRST RANGELOCK_PRIORITY1_FIRST +#define RANGELOCK_TRANSACTION_FIRST RANGELOCK_COMMIT #define RANGELOCK_TRANSACTION_LAST RANGELOCK_CHECKLOCKS #define RANGELOCK_FIRST RANGELOCK_UNK1_FIRST #define RANGELOCK_LAST RANGELOCK_UNK2_LAST diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 5db9120..74b6def 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3156,6 +3156,7 @@ struct lock_test static const int priority_locked_bytes[] = { 0x58, 0x81, 0x93, -1 }; static const int rwex_locked_bytes[] = { 0x93, 0xa7, 0xbb, 0xcf, -1 }; static const int rw_locked_bytes[] = { 0x93, 0xa7, -1 }; +static const int nosn_locked_bytes[] = { 0x6c, 0x93, 0xa7, 0xcf, -1 }; static const int rwdw_locked_bytes[] = { 0x93, 0xa7, 0xcf, -1 }; static const int wodw_locked_bytes[] = { 0xa7, 0xcf, -1 }; static const int tr_locked_bytes[] = { 0x93, -1 }; @@ -3164,6 +3165,7 @@ static const int roex_locked_bytes[] = { 0x93, 0xbb, 0xcf, -1 }; static const int rwex_fail_ranges[] = { 0x93,0xe3, -1 }; static const int rw_fail_ranges[] = { 0xbb,0xe3, -1 }; +static const int rwdw_fail_ranges[] = { 0xa7,0xe3, -1 }; static const int dw_fail_ranges[] = { 0xa7,0xcf, -1 }; static const int tr_fail_ranges[] = { 0xbb,0xcf, -1 }; static const int pr_fail_ranges[] = { 0x80,0x81, 0xbb,0xcf, -1 }; @@ -3179,6 +3181,8 @@ static const struct lock_test lock_tests[] = { { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, FALSE }, + { STGM_READWRITE|STGM_TRANSACTED|STGM_NOSNAPSHOT, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, nosn_locked_bytes, rwdw_fail_ranges, FALSE }, + { STGM_READWRITE|STGM_TRANSACTED|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, rwdw_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE },

1 0

Nikolay Sivov : comctl32/listview: Fix custom draw stage sequence.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: fa3e750e2cfc5fe763c2891f5fa47fec2ded43b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3e750e2cfc5fe763c2891f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 11 00:49:27 2014 +0400 comctl32/listview: Fix custom draw stage sequence. --- dlls/comctl32/listview.c | 321 +++++++++++++++++++++++++--------------- dlls/comctl32/tests/listview.c | 83 +++++++++-- 2 files changed, 269 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa3e750e2cfc5fe763c28…

1 0

Henri Verbeet : d2d1: Add the ID2D1TessellationSink interface.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 7b6ee15bc216086f8a61a7f44d79a2f4c31d8bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b6ee15bc216086f8a61a7f44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 12 09:34:02 2014 +0200 d2d1: Add the ID2D1TessellationSink interface. --- include/d2d1.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 76cb47f..b208f71 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -107,6 +107,13 @@ typedef struct D2D1_FACTORY_OPTIONS D2D1_DEBUG_LEVEL debugLevel; } D2D1_FACTORY_OPTIONS; +typedef struct D2D1_TRIANGLE +{ + D2D1_POINT_2F point1; + D2D1_POINT_2F point2; + D2D1_POINT_2F point3; +} D2D1_TRIANGLE; + interface ID2D1Factory; [ @@ -158,5 +165,19 @@ interface ID2D1SimplifiedGeometrySink : IUnknown HRESULT Close(); } +[ + local, + object, + uuid(2cd906c1-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1TessellationSink : IUnknown +{ + void AddTriangles( + [in, size_is(count)] const D2D1_TRIANGLE *triangles, + [in] UINT32 count + ); + HRESULT Close(); +} + [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 ID2D1Geometry interface.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 2f72c13c379322ab99cd316eb80ccf9c99ce4152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f72c13c379322ab99cd316eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 12 09:34:03 2014 +0200 d2d1: Add the ID2D1Geometry interface. --- include/d2d1.idl | 115 ++++++++++++++++++++++++++++++++++++++++++++++++ include/d2dbasetypes.h | 18 ++++++++ 2 files changed, 133 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index b208f71..63ca96e 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -20,6 +20,8 @@ import "unknwn.idl"; import "d2dbasetypes.h"; typedef D2D_POINT_2F D2D1_POINT_2F; +typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; +typedef D2D_RECT_F D2D1_RECT_F; typedef enum D2D1_DEBUG_LEVEL { @@ -95,6 +97,32 @@ typedef enum D2D1_DASH_STYLE D2D1_DASH_STYLE_FORCE_DWORD = 0xffffffff, } D2D1_DASH_STYLE; +typedef enum D2D1_GEOMETRY_RELATION +{ + D2D1_GEOMETRY_RELATION_UNKNOWN = 0, + D2D1_GEOMETRY_RELATION_DISJOINT = 1, + D2D1_GEOMETRY_RELATION_IS_CONTAINED = 2, + D2D1_GEOMETRY_RELATION_CONTAINS = 3, + D2D1_GEOMETRY_RELATION_OVERLAP = 4, + D2D1_GEOMETRY_RELATION_FORCE_DWORD = 0xffffffff, +} D2D1_GEOMETRY_RELATION; + +typedef enum D2D1_GEOMETRY_SIMPLIFICATION_OPTION +{ + D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES = 0, + D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES = 1, + D2D1_GEOMETRY_SIMPLIFICATION_OPTION_FORCE_DWORD = 0xffffffff, +} D2D1_GEOMETRY_SIMPLIFICATION_OPTION; + +typedef enum D2D1_COMBINE_MODE +{ + D2D1_COMBINE_MODE_UNION = 0, + D2D1_COMBINE_MODE_INTERSECT = 1, + D2D1_COMBINE_MODE_XOR = 2, + D2D1_COMBINE_MODE_EXCLUDE = 3, + D2D1_COMBINE_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COMBINE_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -179,5 +207,92 @@ interface ID2D1TessellationSink : IUnknown HRESULT Close(); } +[ + local, + object, + uuid(2cd906a1-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1Geometry : ID2D1Resource +{ + HRESULT GetBounds( + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [out] D2D1_RECT_F *bounds + ); + HRESULT GetWidenedBounds( + [in] float stroke_width, + [in, optional] ID2D1StrokeStyle *stroke_style, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] D2D1_RECT_F *bounds + ); + HRESULT StrokeContainsPoint( + [in] D2D1_POINT_2F point, + [in] float stroke_width, + [in, optional] ID2D1StrokeStyle *stroke_style, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] BOOL *contains + ); + HRESULT FillContainsPoint( + [in] D2D1_POINT_2F point, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] BOOL *contains + ); + HRESULT CompareWithGeometry( + [in] ID2D1Geometry *geometry, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] D2D1_GEOMETRY_RELATION *relation + ); + HRESULT Simplify( + [in] D2D1_GEOMETRY_SIMPLIFICATION_OPTION option, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [in] ID2D1SimplifiedGeometrySink *sink + ); + HRESULT Tessellate( + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [in] ID2D1TessellationSink *sink + ); + HRESULT CombineWithGeometry( + [in] ID2D1Geometry *geometry, + [in] D2D1_COMBINE_MODE combine_mode, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [in] ID2D1SimplifiedGeometrySink *sink + ); + HRESULT Outline( + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [in] ID2D1SimplifiedGeometrySink *sink + ); + HRESULT ComputeArea( + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] float *area + ); + HRESULT ComputeLength( + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] float *length + ); + HRESULT ComputePointAtLength( + [in] float length, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out, optional] D2D1_POINT_2F *point, + [out, optional] D2D1_POINT_2F *tangent + ); + HRESULT Widen( + [in] float stroke_width, + [in, optional] ID2D1StrokeStyle *stroke_style, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [in] ID2D1SimplifiedGeometrySink *sink + ); +} + [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 b306e2b..385e0b3 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -21,3 +21,21 @@ typedef struct D2D_POINT_2F FLOAT x; FLOAT y; } D2D_POINT_2F; + +typedef struct D2D_MATRIX_3X2_F +{ + float _11; + float _12; + float _21; + float _22; + float _31; + float _32; +} D2D_MATRIX_3X2_F; + +typedef struct D2D_RECT_F +{ + float left; + float top; + float right; + float bottom; +} D2D_RECT_F;

1 0

Henri Verbeet : d2d1: Add the ID2D1RectangleGeometry interface.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 3a541f595fca798982029e486c5fcc1dc490b8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a541f595fca798982029e486… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 12 09:34:04 2014 +0200 d2d1: Add the ID2D1RectangleGeometry interface. --- include/d2d1.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 63ca96e..bf29404 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -294,5 +294,17 @@ interface ID2D1Geometry : ID2D1Resource ); } +[ + local, + object, + uuid(2cd906a2-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1RectangleGeometry : ID2D1Geometry +{ + void GetRect( + [out] D2D1_RECT_F *rect + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Piotr Caban : msvcrt: Don't crash on NULL struct _tm in asctime.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: c18d52d346898be56239976c1b73007a06d2f38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c18d52d346898be56239976c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 12 14:34:51 2014 +0200 msvcrt: Don't crash on NULL struct _tm in asctime. --- dlls/msvcrt/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index a6d4691..9c15bf4 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1263,7 +1263,7 @@ static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) static const char month[12][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - if (mstm->tm_sec<0 || mstm->tm_sec>59 + if (!mstm || mstm->tm_sec<0 || mstm->tm_sec>59 || mstm->tm_min<0 || mstm->tm_min>59 || mstm->tm_hour<0 || mstm->tm_hour>23 || mstm->tm_mon<0 || mstm->tm_mon>11

1 0

Stefan Dösinger : wined3d: Implement DDBLTFX_MIRRORUPDOWN for DXT2.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 46df06aae7e4a0c32c622deae69b8c391ed94012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46df06aae7e4a0c32c622deae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 12 15:12:41 2014 +0200 wined3d: Implement DDBLTFX_MIRRORUPDOWN for DXT2. --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4b40944..1111df2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5369,6 +5369,7 @@ static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data, } return WINED3D_OK; + case WINED3DFMT_DXT2: case WINED3DFMT_DXT3: for (y = 0; y < update_h; y += format->block_height) {

1 0

Alexandre Julliard : include: Add some more media type uuids.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 9a64cf7705709a04c0aadace9ccabea23bdaccad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a64cf7705709a04c0aadace9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 11:38:49 2014 +0200 include: Add some more media type uuids. --- include/Makefile.in | 1 + include/ksuuids.h | 81 ++++++++ include/uuids.h | 573 +++++++++++++++++++++++++++++++++------------------ 3 files changed, 449 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a64cf7705709a04c0aad…

1 0

Frédéric Delanoy : user32/tests: Constify some arrays.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: b242d9cee36b8c8186c92d0bf86c067fc56b19c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b242d9cee36b8c8186c92d0bf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat May 10 19:01:06 2014 +0200 user32/tests: Constify some arrays. --- dlls/user32/tests/cursoricon.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index a7c3ca4..9540f3d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -955,14 +955,14 @@ static void test_CreateIcon(void) /* Shamelessly ripped from dlls/oleaut32/tests/olepicture.c */ /* 1x1 pixel gif */ -static unsigned char gifimage[35] = { +static const unsigned char gifimage[35] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, 0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, 0x01,0x00,0x3b }; /* 1x1 pixel jpg */ -static unsigned char jpgimage[285] = { +static const unsigned char jpgimage[285] = { 0xff,0xd8,0xff,0xe0,0x00,0x10,0x4a,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x01,0x2c, 0x01,0x2c,0x00,0x00,0xff,0xdb,0x00,0x43,0x00,0x05,0x03,0x04,0x04,0x04,0x03,0x05, 0x04,0x04,0x04,0x05,0x05,0x05,0x06,0x07,0x0c,0x08,0x07,0x07,0x07,0x07,0x0f,0x0b, @@ -984,7 +984,7 @@ static unsigned char jpgimage[285] = { }; /* 1x1 pixel png */ -static unsigned char pngimage[285] = { +static const unsigned char pngimage[285] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, 0xde,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b, @@ -1005,14 +1005,14 @@ static unsigned char bmpimage[70] = { }; /* 1x1 pixel bmp using BITMAPCOREHEADER */ -static unsigned char bmpcoreimage[38] = { +static const unsigned char bmpcoreimage[38] = { 0x42,0x4d,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x22,0x00,0x00,0x00,0x0c,0x00, 0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xff,0xff,0xff,0x00,0x55,0x55, 0x55,0x00,0x00,0x00,0x00,0x00 }; /* 2x2 pixel gif */ -static unsigned char gif4pixel[42] = { +static const unsigned char gif4pixel[42] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x02,0x00,0x02,0x00,0xa1,0x00,0x00,0x00,0x00,0x00, 0x39,0x62,0xfc,0xff,0x1a,0xe5,0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x02,0x00, 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b @@ -1059,7 +1059,7 @@ static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); } -static void test_LoadImageFile(const char * test_desc, unsigned char * image_data, +static void test_LoadImageFile(const char * test_desc, const unsigned char * image_data, unsigned int image_size, const char * ext, BOOL expect_success) { HANDLE handle;

1 0

Alistair Leslie-Hughes : dxguid: Include dplobby8.h.
by Alexandre Julliard May 12, 2014

May 12, 2014

Module: wine Branch: master Commit: 123c670f8e6201dcadaf6e6d4cafb5730c4c40c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123c670f8e6201dcadaf6e6d4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 10 20:55:49 2014 +1000 dxguid: Include dplobby8.h. --- dlls/dxguid/dxguid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c index f923d9c..77d4194 100644 --- a/dlls/dxguid/dxguid.c +++ b/dlls/dxguid/dxguid.c @@ -40,6 +40,7 @@ #include "dplay.h" #include "dplay8.h" #include "dplobby.h" +#include "dplobby8.h" #include "dinput.h" #include "ddrawi.h" #include "dxdiag.h"

1 0