wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Jacek Caban : jscript: Get rid of num_set_nan hack.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: db737291fc1862ca825e95a1d9e059b91bdee250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db737291fc1862ca825e95a1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 29 12:54:11 2012 +0200 jscript: Get rid of num_set_nan hack. --- dlls/jscript/date.c | 6 ++-- dlls/jscript/global.c | 10 ++++---- dlls/jscript/jscript.h | 10 -------- dlls/jscript/math.c | 55 +++++++++++++++++++---------------------------- dlls/jscript/string.c | 5 +++- 5 files changed, 34 insertions(+), 52 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 6bcf9c1..d5824b7 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -1987,7 +1987,7 @@ static HRESULT Date_getYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP t = local_time(date->time, date); if(isnan(t)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -2023,7 +2023,7 @@ static HRESULT Date_setYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP if(isnan(year)) { date->time = year; if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -2414,7 +2414,7 @@ static HRESULT DateConstr_parse(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(!arg_cnt(dp)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 3fb169b..3732b65 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -456,7 +456,7 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, HRESULT hres; if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -468,7 +468,7 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(radix && (radix < 2 || radix > 36)) { WARN("radix %d out of range\n", radix); if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } } @@ -537,7 +537,7 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag if(!arg_cnt(dp)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -616,7 +616,7 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag if(ret_nan) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -1284,7 +1284,7 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - num_set_nan(&var); + num_set_val(&var, NAN); hres = jsdisp_propput_name(ctx->global, NaNW, &var, NULL/*FIXME*/); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c53e1a4..6207bbd 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -435,16 +435,6 @@ static inline void num_set_val(VARIANT *v, DOUBLE d) } } -static inline void num_set_nan(VARIANT *v) -{ - V_VT(v) = VT_R8; -#ifdef NAN - V_R8(v) = NAN; -#else - V_UI8(v) = (ULONGLONG)0x7ff80000<<32; -#endif -} - static inline void num_set_inf(VARIANT *v, BOOL positive) { V_VT(v) = VT_R8; diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 9c17967..d30e464 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -68,7 +68,7 @@ static HRESULT Math_abs(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA if(!arg_cnt(dp)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -90,7 +90,7 @@ static HRESULT Math_acos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -98,12 +98,8 @@ static HRESULT Math_acos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR if(FAILED(hres)) return hres; - if(retv) { - if(x < -1.0 || x > 1.0) - num_set_nan(retv); - else - num_set_val(retv, acos(x)); - } + if(retv) + num_set_val(retv, x < -1.0 || x > 1.0 ? NAN : acos(x)); return S_OK; } @@ -116,7 +112,7 @@ static HRESULT Math_asin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -124,12 +120,8 @@ static HRESULT Math_asin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR if(FAILED(hres)) return hres; - if(retv) { - if(x < -1.0 || x > 1.0) - num_set_nan(retv); - else - num_set_val(retv, asin(x)); - } + if(retv) + num_set_val(retv, x < -1.0 || x > 1.0 ? NAN : asin(x)); return S_OK; } @@ -142,7 +134,7 @@ static HRESULT Math_atan(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -163,7 +155,7 @@ static HRESULT Math_atan2(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA TRACE("\n"); if(arg_cnt(dp)<2) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -190,7 +182,7 @@ static HRESULT Math_ceil(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR if(!arg_cnt(dp)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -212,7 +204,7 @@ static HRESULT Math_cos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -233,7 +225,7 @@ static HRESULT Math_exp(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -255,7 +247,7 @@ static HRESULT Math_floor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA if(!arg_cnt(dp)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -278,7 +270,7 @@ static HRESULT Math_log(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA if(!arg_cnt(dp)) { if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; } @@ -286,12 +278,8 @@ static HRESULT Math_log(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA if(FAILED(hres)) return hres; - if(retv) { - if(x < -0.0) - num_set_nan(retv); - else - num_set_val(retv, log(x)); - } + if(retv) + num_set_val(retv, x < -0.0 ? NAN : log(x)); return S_OK; } @@ -373,7 +361,7 @@ static HRESULT Math_pow(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA TRACE("\n"); if(arg_cnt(dp) < 2) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -417,7 +405,8 @@ static HRESULT Math_round(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA TRACE("\n"); if(!arg_cnt(dp)) { - num_set_nan(retv); + if(retv) + num_set_val(retv, NAN); return S_OK; } @@ -439,7 +428,7 @@ static HRESULT Math_sin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -460,7 +449,7 @@ static HRESULT Math_sqrt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } @@ -481,7 +470,7 @@ static HRESULT Math_tan(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA TRACE("\n"); if(!arg_cnt(dp)) { - if(retv) num_set_nan(retv); + if(retv) num_set_val(retv, NAN); return S_OK; } diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index ea826c6..d1142ff 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include "jscript.h" #include "wine/debug.h" @@ -358,7 +361,7 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(!is_int32(d) || d < 0 || d >= length) { SysFreeString(val_str); if(retv) - num_set_nan(retv); + num_set_val(retv, NAN); return S_OK; }

1 0

Jacek Caban : jscript: Get rid of ret_nan hack.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: d0a719a79dae001df341db907fcae54118691d35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a719a79dae001df341db907… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 29 12:53:55 2012 +0200 jscript: Get rid of ret_nan hack. --- dlls/jscript/date.c | 28 ++++++++++++++-------------- dlls/jscript/error.c | 3 ++- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 7 ------- dlls/jscript/jsutils.c | 6 +++--- dlls/jscript/lex.c | 2 +- 6 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index d9c0d39..6bcf9c1 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -130,7 +130,7 @@ static inline DOUBLE days_in_year(DOUBLE year) int y; if(year != (int)year) - return ret_nan(); + return NAN; y = year; if(y%4 != 0) return 365; @@ -143,7 +143,7 @@ static inline DOUBLE days_in_year(DOUBLE year) static inline DOUBLE day_from_year(DOUBLE year) { if(year != (int)year) - return ret_nan(); + return NAN; return floor(365.0*(year-1970) + floor((year-1969)/4) - floor((year-1901)/100) + floor((year-1601)/400)); @@ -192,7 +192,7 @@ static inline DOUBLE year_from_time(DOUBLE time) int y; if(isnan(time)) - return ret_nan(); + return NAN; y = 1970 + time/365.25/MS_PER_DAY; @@ -225,7 +225,7 @@ static inline DOUBLE month_from_time(DOUBLE time) int dwy = day_within_year(time); if(isnan(time)) - return ret_nan(); + return NAN; if(0<=dwy && dwy<31) return 0; if(dwy < 59+ily) return 1; @@ -249,7 +249,7 @@ static inline DOUBLE date_from_time(DOUBLE time) int mft = month_from_time(time); if(isnan(time)) - return ret_nan(); + return NAN; if(mft==0) return dwy+1; if(mft==1) return dwy-30; @@ -271,7 +271,7 @@ static inline DOUBLE week_day(DOUBLE time) DOUBLE ret; if(isnan(time)) - return ret_nan(); + return NAN; ret = fmod(day(time)+4, 7); if(ret<0) ret += 7; @@ -285,7 +285,7 @@ static inline DOUBLE convert_time(int year, SYSTEMTIME st) int set_week_day; if(st.wMonth == 0) - return ret_nan(); + return NAN; if(st.wYear != 0) year = st.wYear; @@ -359,7 +359,7 @@ static inline DOUBLE hour_from_time(DOUBLE time) DOUBLE ret; if(isnan(time)) - return ret_nan(); + return NAN; ret = fmod(floor(time/MS_PER_HOUR), 24); if(ret<0) ret += 24; @@ -373,7 +373,7 @@ static inline DOUBLE min_from_time(DOUBLE time) DOUBLE ret; if(isnan(time)) - return ret_nan(); + return NAN; ret = fmod(floor(time/MS_PER_MINUTE), 60); if(ret<0) ret += 60; @@ -387,7 +387,7 @@ static inline DOUBLE sec_from_time(DOUBLE time) DOUBLE ret; if(isnan(time)) - return ret_nan(); + return NAN; ret = fmod(floor(time/1000), 60); if(ret<0) ret += 60; @@ -401,7 +401,7 @@ static inline DOUBLE ms_from_time(DOUBLE time) DOUBLE ret; if(isnan(time)) - return ret_nan(); + return NAN; ret = fmod(time, 1000); if(ret<0) ret += 1000; @@ -443,7 +443,7 @@ static inline DOUBLE make_date(DOUBLE day, DOUBLE time) static inline DOUBLE time_clip(DOUBLE time) { if(8.64e15 < time || time < -8.64e15) { - return ret_nan(); + return NAN; } return floor(time); @@ -2169,7 +2169,7 @@ static inline HRESULT date_parse(BSTR input, double *ret) { else if(input[i] == ')') { nest_level--; if(nest_level<0) { - *ret = ret_nan(); + *ret = NAN; return S_OK; } } @@ -2393,7 +2393,7 @@ static inline HRESULT date_parse(BSTR input, double *ret) { if(set_hour_adjust) *ret = utc(*ret, &di); }else { - *ret = ret_nan(); + *ret = NAN; } for(i=0; i<sizeof(string_ids)/sizeof(DWORD); i++) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index d242ce3..00560db 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "config.h" #include "wine/port.h" @@ -238,7 +239,7 @@ static HRESULT error_constr(script_ctx_t *ctx, WORD flags, DISPPARAMS *dp, hres = to_number(ctx, get_arg(dp, 0), ei, &n); if(FAILED(hres)) /* FIXME: really? */ - n = ret_nan(); + n = NAN; if(isnan(n)) hres = to_string(ctx, get_arg(dp, 0), ei, &msg); if(FAILED(hres)) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 63239c8..3fb169b 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -511,7 +511,7 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, i = char_to_int(*ptr++); }while(i < radix); }else if(empty) { - ret = ret_nan(); + ret = NAN; } SysFreeString(str); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index dcdd143..c53e1a4 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -445,13 +445,6 @@ static inline void num_set_nan(VARIANT *v) #endif } -static inline DOUBLE ret_nan(void) -{ - VARIANT v; - num_set_nan(&v); - return V_R8(&v); -} - static inline void num_set_inf(VARIANT *v, BOOL positive) { V_VT(v) = VT_R8; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index d19d71b..6a36613 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -349,7 +349,7 @@ static HRESULT str_to_number(BSTR str, double *ret) ptr++; if(*ptr) - *ret = ret_nan(); + *ret = NAN; else *ret = neg ? -ret_inf() : ret_inf(); return S_OK; @@ -403,7 +403,7 @@ static HRESULT str_to_number(BSTR str, double *ret) ptr++; if(*ptr) { - *ret = ret_nan(); + *ret = NAN; return S_OK; } @@ -419,7 +419,7 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, double *ret) { switch(V_VT(v)) { case VT_EMPTY: - *ret = ret_nan(); + *ret = NAN; break; case VT_NULL: *ret = 0; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 6842b58..022c06e 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -933,7 +933,7 @@ static int cc_token(parser_ctx_t *ctx, void *lval) var = find_cc_var(ctx->script->cc, ctx->ptr, id_len); ctx->ptr += id_len; if(!var || var->is_num) { - *(literal_t**)lval = new_double_literal(ctx, var ? var->u.n : ret_nan()); + *(literal_t**)lval = new_double_literal(ctx, var ? var->u.n : NAN); return tNumericLiteral; }

1 0

Jacek Caban : port.h: Added NAN macro.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 91b89133a9cdb8938416cd6c558e71df44f71ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b89133a9cdb8938416cd6c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 29 12:53:38 2012 +0200 port.h: Added NAN macro. --- include/wine/port.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 8281653..705716e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -199,6 +199,15 @@ struct statvfs #define M_PI_2 1.570796326794896619 #endif +#ifndef NAN +static float inline __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() +#endif + /**************************************************************** * Function definitions (only when using libwine_port)

1 0

Alexandre Julliard : gdi32: Add a helper function that implements PutImage on a bitmap.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 7c4c233d12e4d8fe1b85d4429b692d7605ce1ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c4c233d12e4d8fe1b85d4429… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 14:29:40 2012 +0200 gdi32: Add a helper function that implements PutImage on a bitmap. --- dlls/gdi32/bitmap.c | 5 +- dlls/gdi32/dib.c | 6 +-- dlls/gdi32/dibdrv/bitblt.c | 123 +++++++++++++++++++++---------------------- dlls/gdi32/gdi_private.h | 4 +- 4 files changed, 67 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c4c233d12e4d8fe1b85d…

1 0

Alexandre Julliard : gdi32: Add a helper function that implements GetImage on a bitmap.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: cf85fb14abcc60188bc77bb8adb4a5740cdf2537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf85fb14abcc60188bc77bb8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 14:24:11 2012 +0200 gdi32: Add a helper function that implements GetImage on a bitmap. --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/brush.c | 2 +- dlls/gdi32/dib.c | 2 +- dlls/gdi32/dibdrv/bitblt.c | 74 ++++++++++++++++++++++--------------------- dlls/gdi32/gdi_private.h | 2 + 5 files changed, 43 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index c0d6810..a8e4b2b 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -265,7 +265,7 @@ LONG WINAPI GetBitmapBits( src.width = src.visrect.right - src.visrect.left; src.height = src.visrect.bottom - src.visrect.top; - if (!bmp->funcs->pGetImage( NULL, hbitmap, info, &src_bits, &src )) + if (!get_image_from_bitmap( bmp, info, &src_bits, &src )) { const char *src_ptr = src_bits.ptr; int src_stride = get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 16440dc..0516a0f 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -69,7 +69,7 @@ static BOOL copy_bitmap( struct brush_pattern *brush, HBITMAP bitmap ) src.visrect.top = src.y = 0; src.visrect.right = src.width = bmp->dib.dsBm.bmWidth; src.visrect.bottom = src.height = bmp->dib.dsBm.bmHeight; - if (bmp->funcs->pGetImage( NULL, bitmap, info, &bits, &src )) goto done; + if (get_image_from_bitmap( bmp, info, &bits, &src )) goto done; brush->bits = bits; if (!bits.free) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2cd68be..5eaa48c 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1334,7 +1334,7 @@ INT WINAPI GetDIBits( lines = src.height; } - err = bmp->funcs->pGetImage( NULL, hbitmap, src_info, bits ? &src_bits : NULL, bits ? &src : NULL ); + err = get_image_from_bitmap( bmp, src_info, bits ? &src_bits : NULL, bits ? &src : NULL ); if (err) goto done; diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 5abfd75..a20bed5 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -808,46 +808,19 @@ static void set_color_info( const dib_info *dib, BITMAPINFO *info ) } } -/*********************************************************************** - * dibdrv_GetImage - */ -DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, - struct gdi_image_bits *bits, struct bitblt_coords *src ) +static DWORD get_image_dib_info( dib_info *dib, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) { - DWORD ret = ERROR_SUCCESS; - dib_info *dib = NULL, stand_alone; - - TRACE( "%p %p %p\n", dev, hbitmap, info ); - info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biPlanes = 1; info->bmiHeader.biCompression = BI_RGB; info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrImportant = 0; - - if (hbitmap) - { - BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); - - if (!bmp) return ERROR_INVALID_HANDLE; - if (!init_dib_info_from_bitmapobj( &stand_alone, bmp )) - { - ret = ERROR_OUTOFMEMORY; - goto done; - } - dib = &stand_alone; - } - else - { - dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - dib = &pdev->dib; - } - - info->bmiHeader.biWidth = dib->width; - info->bmiHeader.biHeight = dib->rect.bottom - dib->rect.top; - info->bmiHeader.biBitCount = dib->bit_count; - info->bmiHeader.biSizeImage = info->bmiHeader.biHeight * abs( dib->stride ); + info->bmiHeader.biWidth = dib->width; + info->bmiHeader.biHeight = dib->rect.bottom - dib->rect.top; + info->bmiHeader.biBitCount = dib->bit_count; + info->bmiHeader.biSizeImage = info->bmiHeader.biHeight * abs( dib->stride ); if (dib->stride > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; set_color_info( dib, info ); @@ -863,10 +836,39 @@ DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, src->x += dib->rect.left; offset_rect( &src->visrect, dib->rect.left, 0 ); } + return ERROR_SUCCESS; +} -done: - if (hbitmap) GDI_ReleaseObj( hbitmap ); - return ret; +DWORD get_image_from_bitmap( BITMAPOBJ *bmp, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) +{ + dib_info dib; + + if (!init_dib_info_from_bitmapobj( &dib, bmp )) return ERROR_OUTOFMEMORY; + return get_image_dib_info( &dib, info, bits, src ); +} + +/*********************************************************************** + * dibdrv_GetImage + */ +DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + TRACE( "%p %p %p\n", dev, hbitmap, info ); + + if (hbitmap) + { + DWORD ret; + BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); + if (!bmp) return ERROR_INVALID_HANDLE; + ret = get_image_from_bitmap( bmp, info, bits, src ); + GDI_ReleaseObj( hbitmap ); + return ret; + } + + return get_image_dib_info( &pdev->dib, info, bits, src ); } static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6872093..029937e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -269,6 +269,8 @@ extern COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct extern BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src, INT x, INT y, UINT flags, UINT aa_flags, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; +extern DWORD get_image_from_bitmap( BITMAPOBJ *bmp, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; /* driver.c */ extern const struct gdi_dc_funcs null_driver DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Remove the null driver Get/ PutImage fallbacks for bitmaps.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: b6f25e52506db727c3ddc1949bb1fcd4838ea913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f25e52506db727c3ddc1949… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 22:26:35 2012 +0200 gdi32: Remove the null driver Get/PutImage fallbacks for bitmaps. --- dlls/gdi32/bitmap.c | 20 -------------------- dlls/gdi32/driver.c | 13 +++++++++++++ dlls/gdi32/gdi_private.h | 4 ---- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8f6fbdb..c0d6810 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -46,26 +46,6 @@ static const struct gdi_obj_funcs bitmap_funcs = }; -/*********************************************************************** - * null driver fallback implementations - */ - -DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, - struct gdi_image_bits *bits, struct bitblt_coords *src ) -{ - if (!hbitmap) return ERROR_NOT_SUPPORTED; - return dib_driver.pGetImage( 0, hbitmap, info, bits, src ); -} - -DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) -{ - if (!hbitmap) return ERROR_SUCCESS; - return dib_driver.pPutImage( NULL, hbitmap, clip, info, bits, src, dst, rop ); -} - - /****************************************************************************** * CreateBitmap [GDI32.@] * diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d4eae73..8fc94b0 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -385,6 +385,12 @@ static BOOL nulldrv_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) return FALSE; } +static DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) +{ + return ERROR_NOT_SUPPORTED; +} + static DWORD nulldrv_GetKerningPairs( PHYSDEV dev, DWORD count, LPKERNINGPAIR pairs ) { return 0; @@ -496,6 +502,13 @@ static BOOL nulldrv_Polyline( PHYSDEV dev, const POINT *points, INT count ) return PolyPolyline( dev->hdc, points, counts, 1 ); } +static DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) +{ + return ERROR_SUCCESS; +} + static UINT nulldrv_RealizeDefaultPalette( PHYSDEV dev ) { return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 1fa9395..6872093 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -371,7 +371,6 @@ extern BOOL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) DECLSPEC_HIDD extern BOOL nulldrv_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height ) DECLSPEC_HIDDEN; extern LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN; -extern DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, @@ -386,9 +385,6 @@ extern BOOL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) extern BOOL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN; extern BOOL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) DECLSPEC_HIDDEN; -extern DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; extern INT nulldrv_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Always use the DIB engine for DDB rendering.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 592bfd52c94adb2c16cb751e07f8cdd343701c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=592bfd52c94adb2c16cb751e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 17:21:36 2012 +0200 gdi32: Always use the DIB engine for DDB rendering. --- dlls/gdi32/bitmap.c | 107 ++------------------------------------------- dlls/gdi32/dc.c | 11 ++++- dlls/gdi32/dib.c | 19 +------- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/tests/bitmap.c | 1 + 5 files changed, 16 insertions(+), 123 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index cc6a409..8f6fbdb 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -230,7 +230,7 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) bmpobj->dib.dsBm = bm; bmpobj->dib.dsBm.bmBits = NULL; - bmpobj->funcs = &null_driver; + bmpobj->funcs = &dib_driver; if (!(hbitmap = alloc_gdi_handle( &bmpobj->header, OBJ_BITMAP, &bitmap_funcs ))) { @@ -431,48 +431,6 @@ LONG WINAPI SetBitmapBits( } -static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) -{ - char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *src_info = (BITMAPINFO *)src_bmibuf; - char dst_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *dst_info = (BITMAPINFO *)dst_bmibuf; - DWORD err; - struct gdi_image_bits bits; - struct bitblt_coords src, dst; - - if (!bmp->dib.dsBm.bmBits) return; - if (bmp->funcs->pPutImage == nulldrv_PutImage) return; - - get_ddb_bitmapinfo( bmp, src_info ); - - bits.ptr = bmp->dib.dsBm.bmBits; - bits.is_copy = FALSE; - bits.free = NULL; - bits.param = NULL; - - src.x = 0; - src.y = 0; - src.width = bmp->dib.dsBm.bmWidth; - src.height = bmp->dib.dsBm.bmHeight; - src.visrect.left = 0; - src.visrect.top = 0; - src.visrect.right = bmp->dib.dsBm.bmWidth; - src.visrect.bottom = bmp->dib.dsBm.bmHeight; - dst = src; - - copy_bitmapinfo( dst_info, src_info ); - - err = bmp->funcs->pPutImage( NULL, hbitmap, 0, dst_info, &bits, &src, &dst, 0 ); - if (err == ERROR_BAD_FORMAT) - { - err = convert_bits( src_info, &src, dst_info, &bits, FALSE ); - if (!err) err = bmp->funcs->pPutImage( NULL, hbitmap, 0, dst_info, &bits, &src, &dst, 0 ); - if (bits.free) bits.free( &bits ); - } -} - - /*********************************************************************** * BITMAP_SelectObject */ @@ -481,7 +439,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) HGDIOBJ ret; BITMAPOBJ *bitmap; DC *dc; - PHYSDEV physdev = NULL, old_physdev = NULL, createdev; + PHYSDEV physdev; if (!(dc = get_dc_ptr( hdc ))) return 0; @@ -516,51 +474,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) goto done; } - if (dc->dibdrv) old_physdev = pop_dc_driver( dc, dc->dibdrv ); - - if (bitmap->dib.dsBm.bmBitsPixel > 1) - { - physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); - createdev = GET_DC_PHYSDEV( dc, pCreateBitmap ); - } - else physdev = createdev = &dc->nulldrv; /* force use of the DIB engine for 1-bpp */ - - if (physdev->funcs == &null_driver) - { - physdev = dc->dibdrv; - if (physdev) push_dc_driver( &dc->physDev, physdev, physdev->funcs ); - else - { - if (!dib_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) goto done; - dc->dibdrv = physdev = dc->physDev; - } - } - - /* never set the owner of the stock bitmap since it can be selected in multiple DCs */ - if (handle != GetStockObject(DEFAULT_BITMAP) && bitmap->funcs != createdev->funcs) - { - /* we can only change from the null driver to some other driver */ - if (bitmap->funcs != &null_driver) - { - FIXME( "Trying to select bitmap %p in different DC type\n", handle ); - GDI_ReleaseObj( handle ); - ret = 0; - goto done; - } - if (createdev->funcs != &null_driver) - { - if (!createdev->funcs->pCreateBitmap( createdev, handle )) - { - GDI_ReleaseObj( handle ); - ret = 0; - goto done; - } - bitmap->funcs = createdev->funcs; - set_initial_bitmap_bits( handle, bitmap ); - } - else bitmap->funcs = &dib_driver; /* use the DIB driver to emulate DDB support */ - } - + physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); if (!physdev->funcs->pSelectBitmap( physdev, handle )) { GDI_ReleaseObj( handle ); @@ -582,11 +496,6 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) } done: - if(!ret) - { - if (physdev && physdev == dc->dibdrv) pop_dc_driver( dc, dc->dibdrv ); - if (old_physdev) push_dc_driver( &dc->physDev, old_physdev, old_physdev->funcs ); - } release_dc_ptr( dc ); return ret; } @@ -597,17 +506,9 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) */ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) { - const struct gdi_dc_funcs *funcs; - BITMAPOBJ *bmp = GDI_GetObjPtr( handle, OBJ_BITMAP ); + BITMAPOBJ *bmp = free_gdi_handle( handle ); if (!bmp) return FALSE; - funcs = bmp->funcs; - GDI_ReleaseObj( handle ); - - funcs->pDeleteBitmap( handle ); - - if (!(bmp = free_gdi_handle( handle ))) return FALSE; - HeapFree( GetProcessHeap(), 0, bmp->dib.dsBm.bmBits ); return HeapFree( GetProcessHeap(), 0, bmp ); } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index b7c20a1..3caa120 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -159,9 +159,7 @@ void free_dc_ptr( DC *dc ) PHYSDEV physdev = dc->physDev; dc->physDev = physdev->next; physdev->funcs->pDeleteDC( physdev ); - if (physdev == dc->dibdrv) dc->dibdrv = NULL; } - if (dc->dibdrv) dc->dibdrv->funcs->pDeleteDC( dc->dibdrv ); free_gdi_handle( dc->hSelf ); free_dc_state( dc ); } @@ -709,6 +707,15 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) free_dc_ptr( dc ); return 0; } + + if (!dib_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) + { + free_dc_ptr( dc ); + return 0; + } + physDev = GET_DC_PHYSDEV( dc, pSelectBitmap ); + physDev->funcs->pSelectBitmap( physDev, dc->hBitmap ); + DC_InitDC( dc ); release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index f4aea59..2cd68be 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1570,7 +1570,7 @@ static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ) HGDIOBJ ret; BITMAPOBJ *bitmap; DC *dc; - PHYSDEV physdev = NULL, old_physdev = NULL; + PHYSDEV physdev; if (!(dc = get_dc_ptr( hdc ))) return 0; @@ -1596,18 +1596,7 @@ static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ) goto done; } - old_physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); - physdev = dc->dibdrv; - if (old_physdev != dc->dibdrv) - { - if (physdev) push_dc_driver( &dc->physDev, physdev, physdev->funcs ); - else - { - if (!dib_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) goto done; - dc->dibdrv = physdev = dc->physDev; - } - } - + physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); if (!physdev->funcs->pSelectBitmap( physdev, handle )) { GDI_ReleaseObj( handle ); @@ -1629,10 +1618,6 @@ static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ) } done: - if(!ret) - { - if (old_physdev && old_physdev != dc->dibdrv) pop_dc_driver( dc, dc->dibdrv ); - } release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 42bdcf6..1fa9395 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -80,7 +80,6 @@ typedef struct tagDC GDIOBJHDR header; HDC hSelf; /* Handle to this DC */ struct gdi_physdev nulldrv; /* physdev for the null driver */ - PHYSDEV dibdrv; /* physdev for the dib driver */ PHYSDEV physDev; /* current top of the physdev stack */ DWORD thread; /* thread owning the DC */ LONG refcount; /* thread refcount */ diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 60dfecb..b27b85c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3576,6 +3576,7 @@ static void test_GdiAlphaBlend(void) SetViewportExtEx(hdcDst, -1, -1, NULL); SetLastError(0xdeadbeef); ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 50, 50, blend); + todo_wine ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pGdiAlphaBlend(hdcDst, -20, -20, 20, 20, hdcSrc, 0, -1, 50, 50, blend);

1 0

Alexandre Julliard : gdi32/tests: Add some more tests for monochrome bitmap blits.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 77ee0b56bb8bcfe83c9bc7a81f91ec09241fcd97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ee0b56bb8bcfe83c9bc7a81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 15:40:49 2012 +0200 gdi32/tests: Add some more tests for monochrome bitmap blits. --- dlls/gdi32/tests/bitmap.c | 78 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 2abf237..60dfecb 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1530,11 +1530,16 @@ static int is_black_pen( COLORREF fg, COLORREF bg, int r, int g, int b ) static void test_bitmap_colors( HDC hdc, COLORREF fg, COLORREF bg, int r, int g, int b ) { static const WORD pattern_bits[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + RGBQUAD *colors = info->bmiColors; WORD bits[16]; + void *bits_ptr; COLORREF res; HBRUSH old_brush; HPEN old_pen; - HBITMAP pattern; + HBITMAP bitmap; + HDC memdc; res = SetPixel( hdc, 0, 0, RGB(r,g,b) ); ok( res == get_nearest( r, g, b ), @@ -1559,14 +1564,79 @@ static void test_bitmap_colors( HDC hdc, COLORREF fg, COLORREF bg, int r, int g, DeleteObject( SelectObject( hdc, old_pen )); /* mono DDB pattern brush */ - pattern = CreateBitmap( 16, 8, 1, 1, pattern_bits ); - old_brush = SelectObject( hdc, CreatePatternBrush( pattern )); + bitmap = CreateBitmap( 16, 8, 1, 1, pattern_bits ); + old_brush = SelectObject( hdc, CreatePatternBrush( bitmap )); PatBlt( hdc, 0, 0, 16, 16, PATCOPY ); GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); ok( bits[0] == 0x5555, "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); DeleteObject( SelectObject( hdc, old_brush )); - DeleteObject( pattern ); + + /* mono DDB bitmap */ + memdc = CreateCompatibleDC( hdc ); + SelectObject( memdc, bitmap ); + BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0x5555, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + SetTextColor( memdc, RGB(255,255,255) ); + SetBkColor( memdc, RGB(0,0,0) ); + BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0x5555, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + + /* mono DIB section */ + memset( buffer, 0, sizeof(buffer) ); + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biHeight = -16; + info->bmiHeader.biWidth = 16; + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biCompression = BI_RGB; + colors[0].rgbRed = 0xff; + colors[0].rgbGreen = 0xff; + colors[0].rgbBlue = 0xf0; + colors[1].rgbRed = 0x20; + colors[1].rgbGreen = 0x0; + colors[1].rgbBlue = 0x0; + bitmap = CreateDIBSection( 0, info, DIB_RGB_COLORS, &bits_ptr, NULL, 0 ); + memset( bits_ptr, 0x55, 64 ); + DeleteObject( SelectObject( memdc, bitmap )); + BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0x5555, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + + colors[0].rgbRed = 0x0; + colors[0].rgbGreen = 0x0; + colors[0].rgbBlue = 0x10; + colors[1].rgbRed = 0xff; + colors[1].rgbGreen = 0xf0; + colors[1].rgbBlue = 0xff; + bitmap = CreateDIBSection( 0, info, DIB_RGB_COLORS, &bits_ptr, NULL, 0 ); + memset( bits_ptr, 0x55, 64 ); + DeleteObject( SelectObject( memdc, bitmap )); + BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0xaaaa, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + + SetTextColor( memdc, RGB(0,20,0) ); + SetBkColor( memdc, RGB(240,240,240) ); + BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0x5555, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + + SetTextColor( memdc, RGB(250,250,250) ); + SetBkColor( memdc, RGB(10,10,10) ); + BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0xaaaa, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + DeleteDC( memdc ); + DeleteObject( bitmap ); } static void test_mono_bitmap(void)

1 0

Alexandre Julliard : gdi32: Fix StretchBlt color mapping for monochrome bitmaps without a color table.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: df924f6a8ca6d4835c579141d16d866a574b380a URL: http://source.winehq.org/git/wine.git/?a=commit;h=df924f6a8ca6d4835c579141d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 13:53:30 2012 +0200 gdi32: Fix StretchBlt color mapping for monochrome bitmaps without a color table. --- dlls/gdi32/bitblt.c | 64 +++++++++++++++++++++++++++++--------------------- 1 files changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 6b99e43..5029128 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -218,6 +218,27 @@ static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits return blend_bitmapinfo( src_info, src_bits->ptr, src, dst_info, dst_bits->ptr, dst, blend ); } +/* helper to retrieve either both colors or only the background color for monochrome blits */ +static void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) +{ + COLORREF color = GetBkColor( hdc ); + + info->bmiColors[count - 1].rgbRed = GetRValue( color ); + info->bmiColors[count - 1].rgbGreen = GetGValue( color ); + info->bmiColors[count - 1].rgbBlue = GetBValue( color ); + info->bmiColors[count - 1].rgbReserved = 0; + + if (count > 1) + { + color = GetTextColor( hdc ); + info->bmiColors[0].rgbRed = GetRValue( color ); + info->bmiColors[0].rgbGreen = GetGValue( color ); + info->bmiColors[0].rgbBlue = GetBValue( color ); + info->bmiColors[0].rgbReserved = 0; + } + info->bmiHeader.biClrUsed = count; +} + /*********************************************************************** * null driver fallback implementations */ @@ -239,43 +260,32 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, release_dc_ptr( dc_src ); if (err) return FALSE; - /* 1-bpp source without a color table uses the destination DC colors */ - if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) - { - COLORREF color = GetTextColor( dst_dev->hdc ); - src_info->bmiColors[0].rgbRed = GetRValue( color ); - src_info->bmiColors[0].rgbGreen = GetGValue( color ); - src_info->bmiColors[0].rgbBlue = GetBValue( color ); - src_info->bmiColors[0].rgbReserved = 0; - color = GetBkColor( dst_dev->hdc ); - src_info->bmiColors[1].rgbRed = GetRValue( color ); - src_info->bmiColors[1].rgbGreen = GetGValue( color ); - src_info->bmiColors[1].rgbBlue = GetBValue( color ); - src_info->bmiColors[1].rgbReserved = 0; - src_info->bmiHeader.biClrUsed = 2; - } - dst_dev = GET_DC_PHYSDEV( dc_dst, pPutImage ); copy_bitmapinfo( dst_info, src_info ); err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); if (err == ERROR_BAD_FORMAT) { - /* 1-bpp destination without a color table requires a fake 1-entry table - * that contains only the background color */ - if (dst_info->bmiHeader.biBitCount == 1 && !dst_info->bmiHeader.biClrUsed) + DWORD dst_colors = dst_info->bmiHeader.biClrUsed; + + /* 1-bpp source without a color table uses the destination DC colors */ + if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) + get_mono_dc_colors( dst_dev->hdc, src_info, 2 ); + + if (dst_info->bmiHeader.biBitCount == 1 && !dst_colors) { - COLORREF color = GetBkColor( src_dev->hdc ); - dst_info->bmiColors[0].rgbRed = GetRValue( color ); - dst_info->bmiColors[0].rgbGreen = GetGValue( color ); - dst_info->bmiColors[0].rgbBlue = GetBValue( color ); - dst_info->bmiColors[0].rgbReserved = 0; - dst_info->bmiHeader.biClrUsed = 1; + /* 1-bpp destination without a color table requires a fake 1-entry table + * that contains only the background color; except with a 1-bpp source, + * in which case it uses the source colors */ + if (src_info->bmiHeader.biBitCount > 1) + get_mono_dc_colors( src_dev->hdc, dst_info, 1 ); + else + get_mono_dc_colors( src_dev->hdc, dst_info, 2 ); } if (!(err = convert_bits( src_info, src, dst_info, &bits, FALSE ))) { - /* get rid of the fake 1-bpp table */ - if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; + /* get rid of the fake destination table */ + dst_info->bmiHeader.biClrUsed = dst_colors; err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); } }

1 0

Alexandre Julliard : gdi32: Improve support of bitmaps without a color table in PutImage.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: c2784e08fcac04ff0e6106292c1b9bf93acfc27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2784e08fcac04ff0e6106292… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 13:53:30 2012 +0200 gdi32: Improve support of bitmaps without a color table in PutImage. --- dlls/gdi32/dibdrv/bitblt.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index d6849bd..5abfd75 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -871,16 +871,25 @@ done: static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) { + const RGBQUAD *color_table = info->bmiColors; + switch (info->bmiHeader.biBitCount) { case 1: + if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE; + return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); + case 4: case 8: - { - RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); - if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE; + if (!info->bmiHeader.biClrUsed) + { + if (!dib->color_table_size) return TRUE; + if (dib->color_table_size != 1 << info->bmiHeader.biBitCount) return FALSE; + color_table = get_default_color_table( info->bmiHeader.biBitCount ); + } + else if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE; + return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); - } case 16: {

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012