December 2011 - Wine-Commits

Aric Stewart : usp10: Add script Tai Le.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 51b5e6090a59744629d9d4430f0bcdc8296ab6c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b5e6090a59744629d9d4430… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 12 07:31:56 2011 -0600 usp10: Add script Tai Le. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 11 +++++++++++ dlls/usp10/usp10.c | 8 +++++++- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 675765a..f2b2a7b 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -606,6 +606,7 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, NULL, "" , "", NULL, NULL}, {{ myanmar_features, 2}, NULL, "mymr", "", NULL, NULL}, {{ myanmar_features, 2}, NULL, "mymr", "", NULL, NULL}, + {{ standard_features, 2}, NULL, "tale", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 74fe334..7ae232a 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -150,6 +150,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define knda_tag MS_MAKE_TAG('k','n','d','a') #define mlym_tag MS_MAKE_TAG('m','l','y','m') #define mymr_tag MS_MAKE_TAG('m','y','m','r') +#define tale_tag MS_MAKE_TAG('t','a','l','e') static void test_ScriptItemize( void ) { @@ -304,6 +305,12 @@ static void test_ScriptItemize( void ) static const itemTest t241[2] = {{{0,0,0,0,0},0,0,0,0,mymr_tag,FALSE},{{0,0,0,0,0},12,0,0,0,-1,FALSE}}; static const itemTest t242[2] = {{{0,0,0,0,0},0,0,0,2,mymr_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},12,0,0,0,-1,FALSE}}; + /* Tai Le */ + static const WCHAR test25[] = {0x1956,0x196d,0x1970,0x1956,0x196c,0x1973,0x1951,0x1968,0x1952,0x1970}; + static const itemTest t251[2] = {{{0,0,0,0,0},0,0,0,0,tale_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; + static const itemTest t252[2] = {{{0,0,0,0,0},0,0,0,2,tale_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; + + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; @@ -362,6 +369,7 @@ static void test_ScriptItemize( void ) test_items_ok(test22,6,NULL,NULL,2,t221,FALSE,0); test_items_ok(test23,6,NULL,NULL,2,t231,FALSE,0); test_items_ok(test24,12,NULL,NULL,1,t241,FALSE,0); + test_items_ok(test25,10,NULL,NULL,1,t251,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -393,6 +401,7 @@ static void test_ScriptItemize( void ) test_items_ok(test22,6,&Control,&State,2,t221,FALSE,0); test_items_ok(test23,6,&Control,&State,2,t231,FALSE,0); test_items_ok(test24,12,&Control,&State,1,t241,FALSE,0); + test_items_ok(test25,10,&Control,&State,1,t251,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -424,6 +433,7 @@ static void test_ScriptItemize( void ) test_items_ok(test22,6,&Control,&State,2,t222,FALSE,1); test_items_ok(test23,6,&Control,&State,2,t232,FALSE,0); test_items_ok(test24,12,&Control,&State,1,t242,FALSE,0); + test_items_ok(test25,10,&Control,&State,1,t252,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -456,6 +466,7 @@ static void test_ScriptItemize( void ) test_items_ok(test22,6,&Control,&State,1,t223,FALSE,2); test_items_ok(test23,6,&Control,&State,2,t232,FALSE,0); test_items_ok(test24,12,&Control,&State,1,t242,FALSE,0); + test_items_ok(test25,10,&Control,&State,1,t252,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1f225b0..5782591 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -111,6 +111,8 @@ static const scriptRange scriptRanges[] = { { Script_Myanmar, 0x1000, 0x109f, Script_Myanmar_Numeric, 0}, /* Georgian: U+10A0–U+10FF */ { Script_Georgian, 0x10a0, 0x10ff, 0, 0}, + /* Tai Le: U+1950–U+197F */ + { Script_Tai_Le, 0x1950, 0x197f, 0, 0}, /* Vedic Extensions: U+1CD0-U+1CFF */ { Script_Devanagari, 0x1cd0, 0x1cff, Script_Devanagari_Numeric, 0}, /* Phonetic Extensions: U+1D00–U+1DBF */ @@ -389,6 +391,10 @@ static const scriptData scriptInformation[] = { {0x55, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','y','m','r'), {0}}, + {{Script_Tai_Le, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('t','a','l','e'), + {'M','i','c','r','o','s','o','f','t',' ','T','a','i',' ','L','e'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -417,7 +423,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[42].props, &scriptInformation[43].props, &scriptInformation[44].props, &scriptInformation[45].props, &scriptInformation[46].props, &scriptInformation[47].props, - &scriptInformation[48].props + &scriptInformation[48].props, &scriptInformation[49].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index bade039..2a385d5 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -78,6 +78,7 @@ /* Unicode Chapter 11 continued */ #define Script_Myanmar 47 #define Script_Myanmar_Numeric 48 +#define Script_Tai_Le 49 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Jacek Caban : jscript: Properly handle NULL IDispatch in stack_pop_object.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 2c8e8948df50313990bfa80ba08ac91b4fbe9aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8e8948df50313990bfa80ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 14:44:09 2011 +0100 jscript: Properly handle NULL IDispatch in stack_pop_object. --- dlls/jscript/engine.c | 2 + dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 3 ++ po/ar.po | 50 +++++++++++++++++++++++-------------------- po/bg.po | 50 +++++++++++++++++++++++-------------------- po/ca.po | 51 ++++++++++++++++++++++++-------------------- po/cs.po | 50 +++++++++++++++++++++++-------------------- po/da.po | 51 ++++++++++++++++++++++++-------------------- po/de.po | 51 ++++++++++++++++++++++++-------------------- po/el.po | 50 +++++++++++++++++++++++-------------------- po/en.po | 50 +++++++++++++++++++++++-------------------- po/en_US.po | 50 +++++++++++++++++++++++-------------------- po/eo.po | 50 +++++++++++++++++++++++-------------------- po/es.po | 51 ++++++++++++++++++++++++-------------------- po/fa.po | 50 +++++++++++++++++++++++-------------------- po/fi.po | 50 +++++++++++++++++++++++-------------------- po/fr.po | 51 ++++++++++++++++++++++++-------------------- po/he.po | 50 +++++++++++++++++++++++-------------------- po/hi.po | 50 +++++++++++++++++++++++-------------------- po/hu.po | 51 ++++++++++++++++++++++++-------------------- po/it.po | 51 ++++++++++++++++++++++++-------------------- po/ja.po | 51 ++++++++++++++++++++++++-------------------- po/ko.po | 51 ++++++++++++++++++++++++-------------------- po/lt.po | 51 ++++++++++++++++++++++++-------------------- po/ml.po | 50 +++++++++++++++++++++++-------------------- po/nb_NO.po | 51 ++++++++++++++++++++++++-------------------- po/nl.po | 51 ++++++++++++++++++++++++-------------------- po/or.po | 50 +++++++++++++++++++++++-------------------- po/pa.po | 50 +++++++++++++++++++++++-------------------- po/pl.po | 51 ++++++++++++++++++++++++-------------------- po/pt_BR.po | 51 ++++++++++++++++++++++++-------------------- po/pt_PT.po | 51 ++++++++++++++++++++++++-------------------- po/rm.po | 50 +++++++++++++++++++++++-------------------- po/ro.po | 51 ++++++++++++++++++++++++-------------------- po/ru.po | 51 ++++++++++++++++++++++++-------------------- po/sk.po | 50 +++++++++++++++++++++++-------------------- po/sl.po | 51 ++++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 51 ++++++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 51 ++++++++++++++++++++++++-------------------- po/sv.po | 51 ++++++++++++++++++++++++-------------------- po/te.po | 50 +++++++++++++++++++++++-------------------- po/th.po | 50 +++++++++++++++++++++++-------------------- po/tr.po | 50 +++++++++++++++++++++++-------------------- po/uk.po | 51 ++++++++++++++++++++++++-------------------- po/wa.po | 50 +++++++++++++++++++++++-------------------- po/wine.pot | 50 +++++++++++++++++++++++-------------------- po/zh_CN.po | 50 +++++++++++++++++++++++-------------------- po/zh_TW.po | 50 +++++++++++++++++++++++-------------------- 50 files changed, 1245 insertions(+), 1035 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c8e8948df50313990bfa…

1 0

Hans Leidekker : msi: Format the value name from the RegLocator table.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 0f3eb5f689542f04240c8763f724203dcf653f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3eb5f689542f04240c8763f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 12 10:47:25 2011 +0100 msi: Format the value name from the RegLocator table. --- dlls/msi/appsearch.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index f93e05d..0010fd8 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -371,14 +371,11 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig) { static const WCHAR query[] = { - 's','e','l','e','c','t',' ','*',' ', - 'f','r','o','m',' ', - 'R','e','g','L','o','c','a','t','o','r',' ', - 'w','h','e','r','e',' ', + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'R','e','g','L','o','c','a','t','o','r',' ','W','H','E','R','E',' ', 'S','i','g','n','a','t','u','r','e','_',' ','=',' ', '\'','%','s','\'',0}; - LPWSTR keyPath = NULL, valueName = NULL; - LPWSTR deformatted = NULL; - LPWSTR ptr = NULL, end; + const WCHAR *keyPath, *valueName; + WCHAR *deformatted = NULL, *ptr = NULL, *end; int root, type; HKEY rootKey, key = NULL; DWORD sz = 0, regType; @@ -397,10 +394,10 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT return ERROR_SUCCESS; } - root = MSI_RecordGetInteger(row,2); - keyPath = msi_dup_record_field(row,3); - valueName = msi_dup_record_field(row,4); - type = MSI_RecordGetInteger(row,5); + root = MSI_RecordGetInteger(row, 2); + keyPath = MSI_RecordGetString(row, 3); + valueName = MSI_RecordGetString(row, 4); + type = MSI_RecordGetInteger(row, 5); deformat_string(package, keyPath, &deformatted); @@ -430,7 +427,10 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT goto end; } - rc = RegQueryValueExW(key, valueName, NULL, NULL, NULL, &sz); + msi_free(deformatted); + deformat_string(package, valueName, &deformatted); + + rc = RegQueryValueExW(key, deformatted, NULL, NULL, NULL, &sz); if (rc) { TRACE("RegQueryValueExW returned %d\n", rc); @@ -440,7 +440,7 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT * on the value of a property?) */ value = msi_alloc( sz ); - rc = RegQueryValueExW(key, valueName, NULL, &regType, value, &sz); + rc = RegQueryValueExW(key, deformatted, NULL, &regType, value, &sz); if (rc) { TRACE("RegQueryValueExW returned %d\n", rc); @@ -475,9 +475,6 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT end: msi_free( value ); RegCloseKey( key ); - - msi_free( keyPath ); - msi_free( valueName ); msi_free( deformatted ); msiobj_release(&row->hdr);

1 0

Alexandre Julliard : gdi32: Don' t create a default color table for pattern brushes, use the DC colors instead.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 65a2c885f1148966f841d1fd2f4e2cbd6c7f7768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a2c885f1148966f841d1fd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 12:23:12 2011 +0100 gdi32: Don't create a default color table for pattern brushes, use the DC colors instead. --- dlls/gdi32/brush.c | 4 ++-- dlls/gdi32/dibdrv/objects.c | 29 ++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index dc8eb90..384ef12 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -79,8 +79,6 @@ static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) return FALSE; } - if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) fill_default_color_table( info ); - /* release the unneeded space */ HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, info, get_dib_info_size( info, DIB_RGB_COLORS )); @@ -162,6 +160,8 @@ BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT * if (brush->info) { memcpy( info, brush->info, get_dib_info_size( brush->info, brush->usage )); + if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) + fill_default_color_table( info ); *bits = brush->bits.ptr; *usage = brush->usage; ret = TRUE; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 9ab3bcd..9229915 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1468,10 +1468,11 @@ static BOOL matching_pattern_format( dib_info *dib, dib_info *pattern ) return TRUE; } -static BOOL select_pattern_brush( dibdrv_physdev *pdev ) +static BOOL select_pattern_brush( dibdrv_physdev *pdev, BOOL *needs_reselect ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; + RGBQUAD color_table[2]; RECT rect; dib_info pattern; @@ -1490,12 +1491,31 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev ) copy_bitmapinfo( info, pdev->brush_pattern_info ); fill_color_table_from_pal_colors( info, pdev->dev.hdc ); init_dib_info_from_bitmapinfo( &pattern, info, pdev->brush_pattern_bits, 0 ); + *needs_reselect = TRUE; } else { init_dib_info_from_bitmapinfo( &pattern, pdev->brush_pattern_info, pdev->brush_pattern_bits, 0 ); } + if (pattern.bit_count == 1 && !pattern.color_table) + { + /* monochrome DDB pattern uses DC colors */ + COLORREF color = GetTextColor( pdev->dev.hdc ); + color_table[0].rgbRed = GetRValue( color ); + color_table[0].rgbGreen = GetGValue( color ); + color_table[0].rgbBlue = GetBValue( color ); + color_table[0].rgbReserved = 0; + color = GetBkColor( pdev->dev.hdc ); + color_table[1].rgbRed = GetRValue( color ); + color_table[1].rgbGreen = GetGValue( color ); + color_table[1].rgbBlue = GetBValue( color ); + color_table[1].rgbReserved = 0; + pattern.color_table = color_table; + pattern.color_table_size = 2; + *needs_reselect = TRUE; + } + copy_dib_color_info(&pdev->brush_dib, &pdev->dib); pdev->brush_dib.height = pattern.height; @@ -1537,13 +1557,14 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE int i, j; const WINEREGION *clip; POINT origin; + BOOL needs_reselect = FALSE; if(pdev->brush_and_bits == NULL) { switch(pdev->brush_style) { case BS_DIBPATTERN: - if (!pdev->brush_dib.bits.ptr && !select_pattern_brush( pdev )) + if (!pdev->brush_dib.bits.ptr && !select_pattern_brush( pdev, &needs_reselect )) return FALSE; if(!create_pattern_brush_bits(pdev)) return FALSE; @@ -1600,9 +1621,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE } release_wine_region( region ); - /* we need to recompute the bits each time for DIB_PAL_COLORS */ - if (pdev->brush_style == BS_DIBPATTERN && pdev->brush_pattern_usage == DIB_PAL_COLORS) - free_pattern_brush( pdev ); + if (needs_reselect) free_pattern_brush( pdev ); return TRUE; }

1 0

Alexandre Julliard : gdi32: Select the pattern brush only when first used.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: d5fe87e2e89ed485c9a2c481eb7c43b391047b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5fe87e2e89ed485c9a2c481e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 12:12:54 2011 +0100 gdi32: Select the pattern brush only when first used. --- dlls/gdi32/dibdrv/dc.c | 14 ------ dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 98 ++++++++++++++++++++---------------------- 3 files changed, 48 insertions(+), 66 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 6bcce26..ed7b0f7 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -167,20 +167,6 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD return TRUE; } -BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HDC hdc) -{ - if (bi->bmiHeader.biClrUsed && usage == DIB_PAL_COLORS) - { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)buffer; - - copy_bitmapinfo( info, bi ); - fill_color_table_from_pal_colors( info, hdc ); - return init_dib_info_from_bitmapinfo( dib, info, bits, private_color_table ); - } - return init_dib_info_from_bitmapinfo(dib, bi, bits, private_color_table ); -} - BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) { return init_dib_info( dib, &info->bmiHeader, (const DWORD *)info->bmiColors, diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 2aa672d..d388f91 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -103,6 +103,7 @@ typedef struct dibdrv_physdev const BITMAPINFO *brush_pattern_info; void *brush_pattern_bits; UINT brush_pattern_usage; + HBITMAP brush_pattern_bitmap; BOOL (* brush_rects)(struct dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN clip); /* background */ @@ -226,7 +227,6 @@ extern void get_rop_codes(INT rop, struct rop_codes *codes) DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; -extern BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HDC hdc) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 14f1260..9ab3bcd 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1468,35 +1468,62 @@ static BOOL matching_pattern_format( dib_info *dib, dib_info *pattern ) return TRUE; } -static void select_pattern_brush( dibdrv_physdev *pdev, dib_info *pattern ) +static BOOL select_pattern_brush( dibdrv_physdev *pdev ) { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; RECT rect; + dib_info pattern; + + if (!pdev->brush_pattern_info) + { + BITMAPOBJ *bmp = GDI_GetObjPtr( pdev->brush_pattern_bitmap, OBJ_BITMAP ); + BOOL ret; + + if (!bmp) return FALSE; + ret = init_dib_info_from_bitmapobj( &pattern, bmp, 0 ); + GDI_ReleaseObj( pdev->brush_pattern_bitmap ); + if (!ret) return FALSE; + } + else if (pdev->brush_pattern_info->bmiHeader.biClrUsed && pdev->brush_pattern_usage == DIB_PAL_COLORS) + { + copy_bitmapinfo( info, pdev->brush_pattern_info ); + fill_color_table_from_pal_colors( info, pdev->dev.hdc ); + init_dib_info_from_bitmapinfo( &pattern, info, pdev->brush_pattern_bits, 0 ); + } + else + { + init_dib_info_from_bitmapinfo( &pattern, pdev->brush_pattern_info, pdev->brush_pattern_bits, 0 ); + } - free_pattern_brush( pdev ); copy_dib_color_info(&pdev->brush_dib, &pdev->dib); - pdev->brush_dib.height = pattern->height; - pdev->brush_dib.width = pattern->width; + pdev->brush_dib.height = pattern.height; + pdev->brush_dib.width = pattern.width; pdev->brush_dib.stride = get_dib_stride( pdev->brush_dib.width, pdev->brush_dib.bit_count ); - if (matching_pattern_format( &pdev->brush_dib, pattern )) + if (matching_pattern_format( &pdev->brush_dib, &pattern )) { - pdev->brush_dib.bits.ptr = pattern->bits.ptr; + pdev->brush_dib.bits.ptr = pattern.bits.ptr; pdev->brush_dib.bits.is_copy = FALSE; pdev->brush_dib.bits.free = NULL; - return; } + else + { + pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, + pdev->brush_dib.height * pdev->brush_dib.stride ); + pdev->brush_dib.bits.is_copy = TRUE; + pdev->brush_dib.bits.free = free_heap_bits; - pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, - pdev->brush_dib.height * pdev->brush_dib.stride ); - pdev->brush_dib.bits.is_copy = TRUE; - pdev->brush_dib.bits.free = free_heap_bits; + rect.left = rect.top = 0; + rect.right = pattern.width; + rect.bottom = pattern.height; - rect.left = rect.top = 0; - rect.right = pattern->width; - rect.bottom = pattern->height; + pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &pattern, &rect); + } - pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, pattern, &rect); + free_dib_info( &pattern ); + return TRUE; } /********************************************************************** @@ -1516,15 +1543,8 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE switch(pdev->brush_style) { case BS_DIBPATTERN: - if (pdev->brush_pattern_usage == DIB_PAL_COLORS) - { - dib_info pattern; - if (!init_dib_info_from_brush( &pattern, pdev->brush_pattern_info, - pdev->brush_pattern_bits, DIB_PAL_COLORS, pdev->dev.hdc )) - return FALSE; - select_pattern_brush( pdev, &pattern ); - free_dib_info( &pattern ); - } + if (!pdev->brush_dib.bits.ptr && !select_pattern_brush( pdev )) + return FALSE; if(!create_pattern_brush_bits(pdev)) return FALSE; break; @@ -1582,7 +1602,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE /* we need to recompute the bits each time for DIB_PAL_COLORS */ if (pdev->brush_style == BS_DIBPATTERN && pdev->brush_pattern_usage == DIB_PAL_COLORS) - free_pattern_brush_bits( pdev ); + free_pattern_brush( pdev ); return TRUE; } @@ -1614,38 +1634,14 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, if (bitmap || info) /* pattern brush */ { - dib_info pattern; - BOOL ret; - - if (!info) - { - BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); - - if (!bmp) return 0; - ret = init_dib_info_from_bitmapobj( &pattern, bmp, 0 ); - GDI_ReleaseObj( bitmap ); - if (!ret) return 0; - select_pattern_brush( pdev, &pattern ); - free_dib_info( &pattern ); - } - else if (usage != DIB_PAL_COLORS) - { - if (!init_dib_info_from_brush( &pattern, info, bits, DIB_RGB_COLORS, 0 )) return 0; - select_pattern_brush( pdev, &pattern ); - free_dib_info( &pattern ); - } - else - { - /* brush is actually selected only when it's used */ - free_pattern_brush( pdev ); - } - pdev->brush_rects = pattern_brush; pdev->brush_style = BS_DIBPATTERN; pdev->brush_pattern_info = info; pdev->brush_pattern_bits = bits; pdev->brush_pattern_usage = usage; + pdev->brush_pattern_bitmap = bitmap; pdev->defer &= ~DEFER_BRUSH; + free_pattern_brush( pdev ); /* brush is actually selected only when it's used */ return next->funcs->pSelectBrush( next, hbrush, bitmap, info, bits, usage ); }

1 0

Alexandre Julliard : gdi32: Add a flag to request a default color table from init_dib_info.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: d353c95d474e9891dcfc6000620add57b08c23c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d353c95d474e9891dcfc60006… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 11:44:11 2011 +0100 gdi32: Add a flag to request a default color table from init_dib_info. --- dlls/gdi32/bitblt.c | 14 -------------- dlls/gdi32/dib.c | 1 - dlls/gdi32/dibdrv/bitblt.c | 5 ++--- dlls/gdi32/dibdrv/dc.c | 19 +++++++++++-------- dlls/gdi32/dibdrv/dibdrv.h | 3 ++- 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 7167c4a..1638f46 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -321,20 +321,6 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); if (err == ERROR_BAD_FORMAT) { - /* 1-bpp source without a color table uses black & white */ - if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) - { - src_info->bmiColors[0].rgbRed = 0; - src_info->bmiColors[0].rgbGreen = 0; - src_info->bmiColors[0].rgbBlue = 0; - src_info->bmiColors[0].rgbReserved = 0; - src_info->bmiColors[1].rgbRed = 0xff; - src_info->bmiColors[1].rgbGreen = 0xff; - src_info->bmiColors[1].rgbBlue = 0xff; - src_info->bmiColors[1].rgbReserved = 0; - src_info->bmiHeader.biClrUsed = 2; - } - err = convert_bits( src_info, src, dst_info, &bits, TRUE ); if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 4d2ece9..d97b30f 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1155,7 +1155,6 @@ void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - if (info->bmiHeader.biBitCount <= 8) fill_default_color_table( info ); } BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 28e2fac..24ae1b2 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -927,7 +927,6 @@ static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) case 8: { RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); - if (!info->bmiHeader.biClrUsed) return FALSE; if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE; return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); } @@ -1327,7 +1326,7 @@ DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitbl if (!init_dib_info_from_bitmapinfo( &src_dib, src_info, src_bits, 0 ) ) return ERROR_BAD_FORMAT; - if (!init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, 0 ) ) + if (!init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, default_color_table ) ) return ERROR_BAD_FORMAT; return blend_rect( &dst_dib, &dst->visrect, &src_dib, &src->visrect, NULL, blend ); @@ -1345,7 +1344,7 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a DWORD ret = ERROR_SUCCESS; HRGN tmp_rgn = 0; - if (!init_dib_info_from_bitmapinfo( &dib, info, bits, 0 )) return ERROR_BAD_FORMAT; + if (!init_dib_info_from_bitmapinfo( &dib, info, bits, default_color_table )) return ERROR_BAD_FORMAT; switch (mode) { diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 2f06d62..6bcce26 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -153,6 +153,11 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD dib->color_table = color_table; dib->color_table_size = bi->biClrUsed; } + else if (flags & default_color_table) + { + dib->color_table = (RGBQUAD *)get_default_color_table( dib->bit_count ); + dib->color_table_size = dib->color_table ? (1 << dib->bit_count) : 0; + } else { dib->color_table = NULL; @@ -186,10 +191,9 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f { if (!bmp->dib) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)buffer; + BITMAPINFO info; - get_ddb_bitmapinfo( bmp, info ); + get_ddb_bitmapinfo( bmp, &info ); if (!bmp->bitmap.bmBits) { int width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); @@ -197,8 +201,7 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f bmp->bitmap.bmHeight * width_bytes ); if (!bmp->bitmap.bmBits) return FALSE; } - return init_dib_info_from_bitmapinfo( dib, info, bmp->bitmap.bmBits, - flags | private_color_table ); + return init_dib_info_from_bitmapinfo( dib, &info, bmp->bitmap.bmBits, flags ); } return init_dib_info( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->color_table, bmp->dib->dsBm.bmBits, flags ); @@ -261,9 +264,9 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit dib_info src_dib, dst_dib; DWORD ret; - if ( !init_dib_info_from_bitmapinfo( &src_dib, src_info, src_bits, 0 ) ) + if ( !init_dib_info_from_bitmapinfo( &src_dib, src_info, src_bits, default_color_table ) ) return ERROR_BAD_FORMAT; - if ( !init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, 0 ) ) + if ( !init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, default_color_table ) ) return ERROR_BAD_FORMAT; __TRY @@ -405,7 +408,7 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) free_dib_info(&pdev->dib); pdev->defer = 0; - if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, 0)) + if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, default_color_table)) pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 6f01a5e..2aa672d 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -20,7 +20,8 @@ enum dib_info_flags { - private_color_table = 1 + private_color_table = 1, + default_color_table = 2 }; typedef struct

1 0

Alexandre Julliard : gdi32: Use the default DIB color table to create system and halftone palettes.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: c5895ead6a778ecee4dd31f1549d6b730146a970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5895ead6a778ecee4dd31f15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 11:16:59 2011 +0100 gdi32: Use the default DIB color table to create system and halftone palettes. --- dlls/gdi32/palette.c | 151 +++++++++----------------------------------- dlls/gdi32/tests/palette.c | 39 +++++++++++ 2 files changed, 70 insertions(+), 120 deletions(-) diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index f172897..338d860 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -72,40 +72,6 @@ static UINT SystemPaletteUse = SYSPAL_STATIC; /* currently not considered */ static HPALETTE hPrimaryPalette = 0; /* used for WM_PALETTECHANGED */ static HPALETTE hLastRealizedPalette = 0; /* UnrealizeObject() needs it */ -#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ - -static const PALETTEENTRY sys_pal_template[NB_RESERVED_COLORS] = -{ - /* first 10 entries in the system palette */ - /* red green blue flags */ - { 0x00, 0x00, 0x00, 0 }, - { 0x80, 0x00, 0x00, 0 }, - { 0x00, 0x80, 0x00, 0 }, - { 0x80, 0x80, 0x00, 0 }, - { 0x00, 0x00, 0x80, 0 }, - { 0x80, 0x00, 0x80, 0 }, - { 0x00, 0x80, 0x80, 0 }, - { 0xc0, 0xc0, 0xc0, 0 }, - { 0xc0, 0xdc, 0xc0, 0 }, - { 0xa6, 0xca, 0xf0, 0 }, - - /* ... c_min/2 dynamic colorcells */ - - /* ... gap (for sparse palettes) */ - - /* ... c_min/2 dynamic colorcells */ - - { 0xff, 0xfb, 0xf0, 0 }, - { 0xa0, 0xa0, 0xa4, 0 }, - { 0x80, 0x80, 0x80, 0 }, - { 0xff, 0x00, 0x00, 0 }, - { 0x00, 0xff, 0x00, 0 }, - { 0xff, 0xff, 0x00, 0 }, - { 0x00, 0x00, 0xff, 0 }, - { 0xff, 0x00, 0xff, 0 }, - { 0x00, 0xff, 0xff, 0 }, - { 0xff, 0xff, 0xff, 0 } /* last 10 */ -}; /*********************************************************************** * PALETTE_Init @@ -114,21 +80,30 @@ static const PALETTEENTRY sys_pal_template[NB_RESERVED_COLORS] = */ HPALETTE PALETTE_Init(void) { - HPALETTE hpalette; - LOGPALETTE * palPtr; + const RGBQUAD *entries = get_default_color_table( 8 ); + char buffer[FIELD_OFFSET( LOGPALETTE, palPalEntry[20] )]; + LOGPALETTE *palPtr = (LOGPALETTE *)buffer; + int i; /* create default palette (20 system colors) */ - palPtr = HeapAlloc( GetProcessHeap(), 0, - sizeof(LOGPALETTE) + (NB_RESERVED_COLORS-1)*sizeof(PALETTEENTRY)); - if (!palPtr) return FALSE; - palPtr->palVersion = 0x300; - palPtr->palNumEntries = NB_RESERVED_COLORS; - memcpy( palPtr->palPalEntry, sys_pal_template, sizeof(sys_pal_template) ); - hpalette = CreatePalette( palPtr ); - HeapFree( GetProcessHeap(), 0, palPtr ); - return hpalette; + palPtr->palNumEntries = 20; + for (i = 0; i < 10; i++) + { + palPtr->palPalEntry[i].peRed = entries[i].rgbRed; + palPtr->palPalEntry[i].peGreen = entries[i].rgbGreen; + palPtr->palPalEntry[i].peBlue = entries[i].rgbBlue; + palPtr->palPalEntry[i].peFlags = 0; + } + for (i = 10; i < 20; i++) + { + palPtr->palPalEntry[i].peRed = entries[236 + i].rgbRed; + palPtr->palPalEntry[i].peGreen = entries[236 + i].rgbGreen; + palPtr->palPalEntry[i].peBlue = entries[236 + i].rgbBlue; + palPtr->palPalEntry[i].peFlags = 0; + } + return CreatePalette( palPtr ); } @@ -151,8 +126,6 @@ HPALETTE WINAPI CreatePalette( if (!palette) return 0; TRACE("entries=%i\n", palette->palNumEntries); - size = sizeof(LOGPALETTE) + (palette->palNumEntries - 1) * sizeof(PALETTEENTRY); - if (!(palettePtr = HeapAlloc( GetProcessHeap(), 0, sizeof(*palettePtr) ))) return 0; palettePtr->unrealize = NULL; palettePtr->version = palette->palVersion; @@ -191,83 +164,21 @@ HPALETTE WINAPI CreatePalette( HPALETTE WINAPI CreateHalftonePalette( HDC hdc) /* [in] Handle to device context */ { + const RGBQUAD *entries = get_default_color_table( 8 ); + char buffer[FIELD_OFFSET( LOGPALETTE, palPalEntry[256] )]; + LOGPALETTE *pal = (LOGPALETTE *)buffer; int i; - struct { - WORD Version; - WORD NumberOfEntries; - PALETTEENTRY aEntries[256]; - } Palette; - - Palette.Version = 0x300; - Palette.NumberOfEntries = 256; - GetSystemPaletteEntries(hdc, 0, 256, Palette.aEntries); - - Palette.NumberOfEntries = 20; - for (i = 0; i < Palette.NumberOfEntries; i++) + pal->palVersion = 0x300; + pal->palNumEntries = 256; + for (i = 0; i < 256; i++) { - Palette.aEntries[i].peRed=0xff; - Palette.aEntries[i].peGreen=0xff; - Palette.aEntries[i].peBlue=0xff; - Palette.aEntries[i].peFlags=0x00; + pal->palPalEntry[i].peRed = entries[i].rgbRed; + pal->palPalEntry[i].peGreen = entries[i].rgbGreen; + pal->palPalEntry[i].peBlue = entries[i].rgbBlue; + pal->palPalEntry[i].peFlags = 0; } - - Palette.aEntries[0].peRed=0x00; - Palette.aEntries[0].peBlue=0x00; - Palette.aEntries[0].peGreen=0x00; - - /* the first 6 */ - for (i=1; i <= 6; i++) - { - Palette.aEntries[i].peRed=(i%2)?0x80:0; - Palette.aEntries[i].peGreen=(i==2)?0x80:(i==3)?0x80:(i==6)?0x80:0; - Palette.aEntries[i].peBlue=(i>3)?0x80:0; - } - - for (i=7; i <= 12; i++) - { - switch(i) - { - case 7: - Palette.aEntries[i].peRed=0xc0; - Palette.aEntries[i].peBlue=0xc0; - Palette.aEntries[i].peGreen=0xc0; - break; - case 8: - Palette.aEntries[i].peRed=0xc0; - Palette.aEntries[i].peGreen=0xdc; - Palette.aEntries[i].peBlue=0xc0; - break; - case 9: - Palette.aEntries[i].peRed=0xa6; - Palette.aEntries[i].peGreen=0xca; - Palette.aEntries[i].peBlue=0xf0; - break; - case 10: - Palette.aEntries[i].peRed=0xff; - Palette.aEntries[i].peGreen=0xfb; - Palette.aEntries[i].peBlue=0xf0; - break; - case 11: - Palette.aEntries[i].peRed=0xa0; - Palette.aEntries[i].peGreen=0xa0; - Palette.aEntries[i].peBlue=0xa4; - break; - case 12: - Palette.aEntries[i].peRed=0x80; - Palette.aEntries[i].peGreen=0x80; - Palette.aEntries[i].peBlue=0x80; - } - } - - for (i=13; i <= 18; i++) - { - Palette.aEntries[i].peRed=(i%2)?0xff:0; - Palette.aEntries[i].peGreen=(i==14)?0xff:(i==15)?0xff:(i==18)?0xff:0; - Palette.aEntries[i].peBlue=(i>15)?0xff:0x00; - } - - return CreatePalette((LOGPALETTE *)&Palette); + return CreatePalette( pal ); } diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 039be59..4f14d7a 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -144,8 +144,47 @@ static void test_palette_entries(void) ok( palEntry.peFlags == getEntryResult.peFlags, "palEntry.peFlags (%#x) != getEntryResult.peFlags (%#x)\n", palEntry.peFlags, getEntryResult.peFlags ); } +static void test_halftone_palette(void) +{ + HDC hdc; + HPALETTE pal; + PALETTEENTRY entries[256]; + PALETTEENTRY defpal[20]; + int i, count; + + hdc = GetDC(0); + + count = GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 20, defpal ); + ok( count == 20, "wrong size %u\n", count ); + + pal = CreateHalftonePalette( hdc ); + count = GetPaletteEntries( pal, 0, 256, entries ); + ok( count == 256 || broken(count == 20), /* nt 4 */ + "wrong size %u\n", count ); + + /* first and last 10 match the default palette */ + for (i = 0; i < 10; i++) + ok( entries[i].peRed == defpal[i].peRed && + entries[i].peGreen == defpal[i].peGreen && + entries[i].peBlue == defpal[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags ); + for (i = count - 10; i < count; i++) + ok( entries[i].peRed == defpal[i - count + 20].peRed && + entries[i].peGreen == defpal[i - count + 20].peGreen && + entries[i].peBlue == defpal[i - count + 20].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags ); + + DeleteObject( pal ); + ReleaseDC( 0, hdc ); +} + START_TEST(palette) { test_DIB_PAL_COLORS(); test_palette_entries(); + test_halftone_palette(); }

1 0

Dmitry Timoshkov : user32: Strip WS_CAPTION|WS_SYSMENU when a dialog has DS_CONTROL style set.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

1 0

Piotr Caban : services: Move service cleanup code to separate function.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 01ef66cb1eeefa418bd4122b84c977e52490b350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ef66cb1eeefa418bd4122b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 12 11:04:46 2011 +0100 services: Move service cleanup code to separate function. --- programs/services/rpc.c | 5 +++++ programs/services/services.c | 37 +++++++++++++++++++++---------------- programs/services/services.h | 1 + 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 2337667..0de183a 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1062,6 +1062,11 @@ DWORD __cdecl svcctl_ControlService( break; } + if (result==ERROR_SUCCESS && !service->service_entry->control_mutex) { + result = ERROR_SERVICE_CANNOT_ACCEPT_CTRL; + service_terminate(service->service_entry); + } + if (result != ERROR_SUCCESS) { if (lpServiceStatus) diff --git a/programs/services/services.c b/programs/services/services.c index 865cb55..86d4d8c 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -847,22 +847,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * if (err == ERROR_SUCCESS) ReleaseMutex(service->control_mutex); else - { - CloseHandle(service->overlapped_event); - service->overlapped_event = NULL; - CloseHandle(service->status_changed_event); - service->status_changed_event = NULL; - CloseHandle(service->control_mutex); - service->control_mutex = NULL; - if (service->control_pipe != INVALID_HANDLE_VALUE) - CloseHandle(service->control_pipe); - service->control_pipe = INVALID_HANDLE_VALUE; - - service->status.dwProcessId = 0; - service_lock_exclusive(service); - service->status.dwCurrentState = SERVICE_STOPPED; - service_unlock(service); - } + service_terminate(service); scmdatabase_unlock_startup(service->db); WINE_TRACE("returning %d\n", err); @@ -870,6 +855,26 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * return err; } +void service_terminate(struct service_entry *service) +{ + service_lock_exclusive(service); + TerminateProcess(service->process, 0); + CloseHandle(service->process); + service->process = NULL; + CloseHandle(service->overlapped_event); + service->overlapped_event = NULL; + CloseHandle(service->status_changed_event); + service->status_changed_event = NULL; + CloseHandle(service->control_mutex); + service->control_mutex = NULL; + CloseHandle(service->control_pipe); + service->control_pipe = INVALID_HANDLE_VALUE; + + service->status.dwProcessId = 0; + service->status.dwCurrentState = SERVICE_STOPPED; + service_unlock(service); +} + static void load_registry_parameters(void) { static const WCHAR controlW[] = diff --git a/programs/services/services.h b/programs/services/services.h index 6a968d9..b4b895e 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -78,6 +78,7 @@ void service_lock_shared(struct service_entry *service); void service_lock_exclusive(struct service_entry *service); void service_unlock(struct service_entry *service); DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv); +void service_terminate(struct service_entry *service); BOOL service_send_command( struct service_entry *service, HANDLE pipe, const void *data, DWORD size, DWORD *result );

1 0

Piotr Caban : services: Fix SERVICE_STATUS initialization in svcctl_ControlService.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: c11e163eb789d099b70261afd3303d8ff8e826ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11e163eb789d099b70261afd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 12 11:03:55 2011 +0100 services: Fix SERVICE_STATUS initialization in svcctl_ControlService. --- programs/services/rpc.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 14 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 806e65d..5fe8585 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1048,29 +1048,35 @@ DWORD __cdecl svcctl_ControlService( service_lock_exclusive(service->service_entry); - if (lpServiceStatus) - { - lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; - lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; - lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; - lpServiceStatus->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; - lpServiceStatus->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; - lpServiceStatus->dwCheckPoint = service->service_entry->status.dwCheckPoint; - lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; - } - + result = ERROR_SUCCESS; switch (service->service_entry->status.dwCurrentState) { case SERVICE_STOPPED: - service_unlock(service->service_entry); - return ERROR_SERVICE_NOT_ACTIVE; + result = ERROR_SERVICE_NOT_ACTIVE; + break; case SERVICE_START_PENDING: if (dwControl==SERVICE_CONTROL_STOP) break; /* fall thru */ case SERVICE_STOP_PENDING: + result = ERROR_SERVICE_CANNOT_ACCEPT_CTRL; + break; + } + + if (result != ERROR_SUCCESS) + { + if (lpServiceStatus) + { + lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; + lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; + lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; + lpServiceStatus->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; + lpServiceStatus->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; + lpServiceStatus->dwCheckPoint = service->service_entry->status.dwCheckPoint; + lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; + } service_unlock(service->service_entry); - return ERROR_SERVICE_CANNOT_ACCEPT_CTRL; + return result; } if (!service_accepts_control(service->service_entry, dwControl)) @@ -1096,6 +1102,19 @@ DWORD __cdecl svcctl_ControlService( { service_send_control(service->service_entry, control_pipe, dwControl, &result); + if (lpServiceStatus) + { + service_lock_shared(service->service_entry); + lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; + lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; + lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; + lpServiceStatus->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; + lpServiceStatus->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; + lpServiceStatus->dwCheckPoint = service->service_entry->status.dwCheckPoint; + lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; + service_unlock(service->service_entry); + } + if (dwControl == SERVICE_CONTROL_STOP) { CloseHandle(control_mutex);

1 0