January 2014 - Wine-Commits

Ken Thomases : winemac: Fix search for clipboard format matching a pasteboard type so it can fail when it should.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 23a717b298f8035e5afd511301bb5d2a074b19be URL: http://source.winehq.org/git/wine.git/?a=commit;h=23a717b298f8035e5afd51130… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 6 06:58:42 2013 -0600 winemac: Fix search for clipboard format matching a pasteboard type so it can fail when it should. It had been acting as though the last registered clipboard format always matched any pasteboard type. (cherry picked from commit 7c0c30b4d650d663770e0bbf683946005506bb8d) --- dlls/winemac.drv/clipboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index ee63c10..5d765f4 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -367,6 +367,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty } } + format = NULL; if (!current) { LPWSTR name;

1 0

Andrey Zhezherun : msvcp: Fixed complex division.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 28e90bcfb447d080c11cbe8a0af47bdd45bf53fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e90bcfb447d080c11cbe8a0… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Mon Nov 4 09:41:25 2013 +0000 msvcp: Fixed complex division. (cherry picked from commit 44bf8dc4295c12b954a166aa72811fee022e0135) --- dlls/msvcp71/math.c | 40 ++++++++++++++++++++++------------------ dlls/msvcp90/math.c | 40 ++++++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 36 deletions(-) diff --git a/dlls/msvcp71/math.c b/dlls/msvcp71/math.c index 69e4509..7d56c70 100644 --- a/dlls/msvcp71/math.c +++ b/dlls/msvcp71/math.c @@ -1087,6 +1087,7 @@ complex_float* __cdecl complex_float_add_cf(complex_float *ret, const complex_fl /* ??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z */ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float *l, const complex_float *r) { + float tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_float_quiet_NaN(); @@ -1094,15 +1095,16 @@ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabsf(r->real) >= fabsf(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; } @@ -1705,6 +1707,7 @@ complex_double* __cdecl complex_double_add_cd(complex_double *ret, const complex /* ??$?KO(a)std@@YA?AV?$complex(a)O@0(a)AEBV10@0(a)Z */ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_double *l, const complex_double *r) { + double tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_double_quiet_NaN(); @@ -1712,15 +1715,16 @@ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_do return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabs(r->real) >= fabs(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; } diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index e049d69..f804ac9 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1087,6 +1087,7 @@ complex_float* __cdecl complex_float_add_cf(complex_float *ret, const complex_fl /* ??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z */ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float *l, const complex_float *r) { + float tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_float_quiet_NaN(); @@ -1094,15 +1095,16 @@ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabsf(r->real) >= fabsf(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; } @@ -1705,6 +1707,7 @@ complex_double* __cdecl complex_double_add_cd(complex_double *ret, const complex /* ??$?KO(a)std@@YA?AV?$complex(a)O@0(a)AEBV10@0(a)Z */ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_double *l, const complex_double *r) { + double tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_double_quiet_NaN(); @@ -1712,15 +1715,16 @@ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_do return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabs(r->real) >= fabs(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; }

1 0

Hans Leidekker : wbemprox: Implement Win32_BIOS.IdentificationCode and Win32_BIOS.SMBIOSBIOSVersion.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: d79ab7e8e40e1cda8862bc332d66c4978d81d123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79ab7e8e40e1cda8862bc332… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 4 11:54:10 2013 +0100 wbemprox: Implement Win32_BIOS.IdentificationCode and Win32_BIOS.SMBIOSBIOSVersion. (cherry picked from commit 1eefe9dd8eb04234f86369974c629e0a78c6b311) --- dlls/wbemprox/builtin.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5242cf4..4d1d787 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -152,6 +152,8 @@ static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_idW[] = {'I','D',0}; +static const WCHAR prop_identificationcodeW[] = + {'I','d','e','n','t','i','f','i','c','a','t','i','o','n','C','o','d','e',0}; static const WCHAR prop_indexW[] = {'I','n','d','e','x',0}; static const WCHAR prop_interfaceindexW[] = @@ -214,6 +216,8 @@ static const WCHAR prop_servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; +static const WCHAR prop_smbiosbiosversionW[] = + {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = {'S','t','a','r','t','M','o','d','e',0}; static const WCHAR prop_sizeW[] = @@ -258,11 +262,13 @@ static const struct column col_baseboard[] = }; static const struct column col_bios[] = { - { prop_descriptionW, CIM_STRING }, - { prop_manufacturerW, CIM_STRING }, - { prop_releasedateW, CIM_DATETIME }, - { prop_serialnumberW, CIM_STRING }, - { prop_versionW, CIM_STRING|COL_FLAG_KEY } + { prop_descriptionW, CIM_STRING }, + { prop_identificationcodeW, CIM_STRING }, + { prop_manufacturerW, CIM_STRING }, + { prop_releasedateW, CIM_DATETIME }, + { prop_serialnumberW, CIM_STRING }, + { prop_smbiosbiosversionW, CIM_STRING }, + { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_cdromdrive[] = { @@ -454,6 +460,8 @@ static const WCHAR bios_releasedateW[] = {'2','0','1','2','0','6','0','8','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; static const WCHAR bios_serialnumberW[] = {'0',0}; +static const WCHAR bios_smbiosbiosversionW[] = + {'W','i','n','e',0}; static const WCHAR bios_versionW[] = {'W','I','N','E',' ',' ',' ','-',' ','1',0}; static const WCHAR cdromdrive_nameW[] = @@ -513,9 +521,11 @@ struct record_baseboard struct record_bios { const WCHAR *description; + const WCHAR *identificationcode; const WCHAR *manufacturer; const WCHAR *releasedate; const WCHAR *serialnumber; + const WCHAR *smbiosbiosversion; const WCHAR *version; }; struct record_cdromdrive @@ -701,7 +711,8 @@ static const struct record_baseboard data_baseboard[] = }; static const struct record_bios data_bios[] = { - { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_versionW } + { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, + bios_smbiosbiosversionW, bios_versionW } }; static const struct record_diskdrive data_diskdrive[] = {

1 0

Hans Leidekker : wbemprox: Implement Win32_BaseBoard.Model and Win32_BaseBoard.Name.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 13e45236674cc33245753d1ae14120d768123303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e45236674cc33245753d1ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 4 11:53:46 2013 +0100 wbemprox: Implement Win32_BaseBoard.Model and Win32_BaseBoard.Name. (cherry picked from commit 796d4d0ccf780842a0f4b2e098add56df0288fac) --- dlls/wbemprox/builtin.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d310704..5242cf4 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -251,6 +251,8 @@ static const WCHAR prop_versionW[] = static const struct column col_baseboard[] = { { prop_manufacturerW, CIM_STRING }, + { prop_modelW, CIM_STRING }, + { prop_nameW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, { prop_tagW, CIM_STRING|COL_FLAG_KEY } }; @@ -503,6 +505,8 @@ static const WCHAR videocontroller_deviceidW[] = struct record_baseboard { const WCHAR *manufacturer; + const WCHAR *model; + const WCHAR *name; const WCHAR *serialnumber; const WCHAR *tag; }; @@ -693,7 +697,7 @@ struct record_videocontroller static const struct record_baseboard data_baseboard[] = { - { baseboard_manufacturerW, baseboard_serialnumberW, baseboard_tagW } + { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_tagW } }; static const struct record_bios data_bios[] = {

1 0

Rico Schüller : wined3d: Use GL_ARB_texture_mirror_clamp_to_edge when available.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 447e483ff216d163c7f77c64f16965b1577cd5f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=447e483ff216d163c7f77c64f… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Nov 5 23:08:30 2013 +0100 wined3d: Use GL_ARB_texture_mirror_clamp_to_edge when available. (cherry picked from commit de9e1cdcae3ededfa20fb6d85f1785fe01b454de) --- dlls/wined3d/directx.c | 12 +++++++++--- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ae3f0db..aa4d710 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -133,6 +133,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, + {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, @@ -2947,6 +2948,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (!counter_bits) gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; } + if (!gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] && gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + { + TRACE(" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).\n"); + gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] = TRUE; + } wined3d_adapter_init_limits(gl_info); @@ -3064,7 +3070,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->wrap_lookup[WINED3D_TADDRESS_BORDER - WINED3D_TADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = - gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; + gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] ? GL_MIRROR_CLAMP_TO_EDGE : GL_REPEAT; adapter->d3d_info.valid_rt_mask = 0; for (i = 0; i < gl_info->limits.buffers; ++i) @@ -4376,7 +4382,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte { caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; } - if (gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) { caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; } @@ -4394,7 +4400,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte { caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; } - if (gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) { caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 9c4af05..50d9bab 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -84,6 +84,7 @@ enum wined3d_gl_extension ARB_TEXTURE_ENV_DOT3, ARB_TEXTURE_FLOAT, ARB_TEXTURE_MIRRORED_REPEAT, + ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG,

1 0

Huw Davies : riched20: Revert to the default paragraph style when all text is deleted.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 56f05cfa51645621e2ba64cc42f95b052ef146bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f05cfa51645621e2ba64cc4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 4 14:23:53 2013 +0000 riched20: Revert to the default paragraph style when all text is deleted. (cherry picked from commit 58e83ebdea14dbc3e4839b17ec4cbcd59fa67293) --- dlls/riched20/caret.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b39a8c7..fd7034d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -284,13 +284,15 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, BOOL bForce) { ME_Cursor c = *start; - int nOfs = ME_GetCursorOfs(start); + int nOfs = ME_GetCursorOfs(start), text_len = ME_GetTextLength( editor ); int shift = 0; int totalChars = nChars; ME_DisplayItem *start_para; + BOOL delete_all = FALSE; /* Prevent deletion past last end of paragraph run. */ - nChars = min(nChars, ME_GetTextLength(editor) - nOfs); + nChars = min(nChars, text_len - nOfs); + if (nChars == text_len) delete_all = TRUE; start_para = c.pPara; if (!bForce) @@ -424,6 +426,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, continue; } } + if (delete_all) ME_SetDefaultParaFormat( start_para->member.para.pFmt ); return TRUE; }

1 0

Andrey Zhezherun : msvcp: Added missing casts to unsigned char in streambuf functions.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 9eb0f54db1244041229b7050e587fdbb36cef0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb0f54db1244041229b7050e… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Thu Oct 31 23:38:29 2013 +0000 msvcp: Added missing casts to unsigned char in streambuf functions. (cherry picked from commit c1a5b06d49e5e39c649b5f9aa231ad4c89aae54f) --- dlls/msvcp100/ios.c | 2 +- dlls/msvcp60/ios.c | 6 +++--- dlls/msvcp71/ios.c | 6 +++--- dlls/msvcp90/ios.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 16677f2..abf9d10 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -978,7 +978,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index e985e07..7ce3694 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -1409,7 +1409,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3447,7 +3447,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3484,7 +3484,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAEHH(a)Z */ diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 8fe6000..d9b7bc9 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -1451,7 +1451,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3697,7 +3697,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3734,7 +3734,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAEHH(a)Z */ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 87ad06e..735c140 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1406,7 +1406,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3702,7 +3702,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3739,7 +3739,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAEHH(a)Z */

1 0

Jacek Caban : jscript: Added support for octal literals.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 546b51c411c326ee932dbd7fdf6e3af8dbf7836f URL: http://source.winehq.org/git/wine.git/?a=commit;h=546b51c411c326ee932dbd7fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 6 17:18:28 2013 +0100 jscript: Added support for octal literals. (cherry picked from commit 4d9ea4b5635654cfcd65478a1cc47363ee1798ad) --- dlls/jscript/lex.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 54c8fcf..d6a0ba1 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -486,15 +486,37 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) return tNumericLiteral; } + if(isdigitW(*ctx->ptr)) { + unsigned base = 8; + const WCHAR *ptr; + double val = 0; + + for(ptr = ctx->ptr; ptr < ctx->end && isdigitW(*ptr); ptr++) { + if(*ptr > '7') { + base = 10; + break; + } + } + + do { + val = val*base + *ctx->ptr-'0'; + }while(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr)); + + /* FIXME: Do we need it here? */ + if(ctx->ptr < ctx->end && (is_identifier_char(*ctx->ptr) || *ctx->ptr == '.')) { + WARN("wrong char after octal literal: '%c'\n", *ctx->ptr); + return lex_error(ctx, JS_E_MISSING_SEMICOLON); + } + + *literal = new_double_literal(ctx, val); + return tNumericLiteral; + } + if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); return lex_error(ctx, E_FAIL); } - if(isdigitW(*ctx->ptr)) { - FIXME("octal literals not implemented\n"); - return lex_error(ctx, E_NOTIMPL); - } } return parse_double_literal(ctx, l, literal);

1 0

Rico Schüller : opengl32: Fix some style issues.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: d63936d548c906672860063060c55400342f6deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d63936d548c90667286006306… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:14 2013 +0100 opengl32: Fix some style issues. (cherry picked from commit 465673a3d6906d32119e546f568d07e47b6ff4b7) --- dlls/opengl32/make_opengl | 108 ++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 56 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 9817f8c..18d5107 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -210,10 +210,9 @@ sub ConvertType($) ); foreach my $org (reverse sort keys %hash) { - if ($type =~ /$org/) { - my ($before, $after) = ($type =~ /^(.*)$org(.*)$/); - return "$before$hash{$org}$after"; - } + if ($type =~ /^(.*)$org(.*)$/) { + return "$1$hash{$org}$2"; + } } return $type; } @@ -229,10 +228,9 @@ sub ConvertVarName($) "far" => "farParam" ); foreach my $org (keys %hash) { - if ($type =~ /$org/) { - my ($before, $after) = ($type =~ /^(.*)$org(.*)$/); - return "$before$hash{$org}$after"; - } + if ($type =~ /^(.*)$org(.*)$/) { + return "$1$hash{$org}$2"; + } } return $type; } @@ -255,22 +253,20 @@ sub GenerateThunk($$$$) # If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-) # Patrik says: Well I would be even happier if a (OPENGL32.@) was added as well. Done. :-) if ($comment eq 1) { - $ret = "$ret/***********************************************************************\n"; - $ret = "$ret * $name (OPENGL32.\@)\n"; - $ret = "$ret */\n"; + $ret .= "/***********************************************************************\n"; + $ret .= " * $name (OPENGL32.\@)\n"; + $ret .= " */\n"; } - $ret = $ret . ConvertType($func_ref->[0]) . " WINAPI $name( "; + $ret .= ConvertType($func_ref->[0]) . " WINAPI $name( "; for (my $i = 0; $i < @{$func_ref->[1]}; $i++) { - ## Quick debug code :-) - ## print $func_ref->[1]->[$i]->[1] . "\n"; - my $type = $func_ref->[1]->[$i]->[0]; - my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); - $ret .= ConvertType($type) . " $name"; - $call_arg .= $name; - if ($type =~ /\*/) { - $trace_arg .= "%p"; + my $type = $func_ref->[1]->[$i]->[0]; + my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); + $ret .= ConvertType($type) . " $name"; + $call_arg .= $name; + if ($type =~ /\*/) { + $trace_arg .= "%p"; $trace_call_arg .= $name; - } elsif (defined $debug_conv{$type}) { + } elsif (defined $debug_conv{$type}) { if ($debug_conv{$type} =~ /(.*),(.*)/) { $trace_arg .= $1; @@ -281,40 +277,40 @@ sub GenerateThunk($$$$) $trace_arg .= $debug_conv{$type}; $trace_call_arg .= $name; } - } - else { printf "Unknown type %s\n", $type; } - if ($i+1 < @{$func_ref->[1]}) { - $ret .= ", "; - $call_arg .= ", "; - $trace_call_arg .= ", "; - $trace_arg .= ", "; - } else { - $ret .= " "; - $call_arg .= " "; - $trace_call_arg .= " "; - } + } + else { printf "Unknown type %s\n", $type; } + if ($i+1 < @{$func_ref->[1]}) { + $ret .= ", "; + $call_arg .= ", "; + $trace_call_arg .= ", "; + $trace_arg .= ", "; + } else { + $ret .= " "; + $call_arg .= " "; + $trace_call_arg .= " "; + } } $ret .= 'void ' if (!@{$func_ref->[1]}); $ret .= ") {\n"; $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; if ($func_ref->[0] ne "void" && $gen_thread_safe) { - $ret = "$ret " . ConvertType($func_ref->[0]) . " ret_value;\n"; + $ret .= " " . ConvertType($func_ref->[0]) . " ret_value;\n"; } if ($gen_traces) { - $ret = "$ret TRACE(\"($trace_arg)\\n\""; - if ($trace_arg ne "") { - $ret .= ", $trace_call_arg"; - } - $ret = "$ret);\n"; + $ret .= " TRACE(\"($trace_arg)\\n\""; + if ($trace_arg ne "") { + $ret .= ", $trace_call_arg"; + } + $ret .= ");\n"; } if ($gen_thread_safe) { - $ret .= " ENTER_GL();\n"; + $ret .= " ENTER_GL();\n"; $ret .= " "; if ($func_ref->[0] ne "void") { $ret .= "ret_value = "; } $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; - $ret .= " LEAVE_GL();\n"; + $ret .= " LEAVE_GL();\n"; if ($func_ref->[0] ne "void") { $ret .= " return ret_value;\n" } @@ -326,7 +322,7 @@ sub GenerateThunk($$$$) } $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; } - $ret = "$ret}\n"; + $ret .= "}\n"; # Return this string.... return $ret; @@ -341,10 +337,10 @@ sub generate_null_func($$) $ret = "static " . ConvertType($func_ref->[0]) . " null_$name( "; for (my $i = 0; $i < @{$func_ref->[1]}; $i++) { - my $type = $func_ref->[1]->[$i]->[0]; - my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); - $ret .= ConvertType($type) . " $name"; - $ret .= "," if ($i+1 < @{$func_ref->[1]}); + my $type = $func_ref->[1]->[$i]->[0]; + my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); + $ret .= ConvertType($type) . " $name"; + $ret .= "," if ($i+1 < @{$func_ref->[1]}); $ret .= " "; } $ret .= 'void ' if (!@{$func_ref->[1]}); @@ -368,7 +364,7 @@ sub get_func_proto($$$) $ret .= " " . sprintf($format,$name) . "("; for (my $i = 0; $i < @{$func->[1]}; $i++) { - $ret .= ConvertType($func->[1]->[$i]->[0]); + $ret .= ConvertType($func->[1]->[$i]->[0]); $ret .= "," if ($i+1 < @{$func->[1]}); } $ret .= "void" unless @{$func->[1]}; @@ -882,14 +878,14 @@ open(SPEC, ">$spec_file"); foreach (sort keys %norm_functions) { my $args=" "; for (my $i = 0; $i < @{$norm_functions{$_}->[1]}; $i++) { - my $type = $norm_functions{$_}->[1]->[$i]->[0]; - if ($type =~ /\*/) { - $args .= "ptr "; - } elsif (defined($arg_conv{$type})) { - $args .= "$@$arg_conv{$type}[0] "; - } else { - die "No conversion for GL type $type...\n"; - } + my $type = $norm_functions{$_}->[1]->[$i]->[0]; + if ($type =~ /\*/) { + $args .= "ptr "; + } elsif (defined($arg_conv{$type})) { + $args .= "$@$arg_conv{$type}[0] "; + } else { + die "No conversion for GL type $type...\n"; + } } $args = substr($args,1,-1); print SPEC "@ stdcall $_($args)\n"; @@ -1003,7 +999,7 @@ foreach (sort keys %ext_functions) { my $func_ref = $ext_functions{$_}; print EXT " { \"$_\", \"$func_ref->[2]\", $_ }"; if ($i != $count-1) { - print EXT ","; + print EXT ","; } $i++; print EXT "\n";

1 0

Ken Thomases : winemac: Reduce duplicated code by consolidating exit paths from format_for_type() .
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: edf4aac3d2c0757c0975b8cdabc1d1488efb68d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf4aac3d2c0757c0975b8cda… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 6 06:59:00 2013 -0600 winemac: Reduce duplicated code by consolidating exit paths from format_for_type(). (cherry picked from commit aa53603135fa8699b1465dca40556c14ed332551) --- dlls/winemac.drv/clipboard.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 5d765f4..f97faea 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -361,10 +361,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty { format = LIST_ENTRY(ptr, WINE_CLIPFORMAT, entry); if (CFEqual(format->type, type)) - { - TRACE(" -> %p/%s\n", format, debugstr_format(format->format_id)); - return format; - } + goto done; } format = NULL; @@ -376,7 +373,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty { ERR("Shouldn't happen. Built-in type %s should have matched something in format list.\n", debugstr_cf(type)); - return NULL; + goto done; } else if (CFStringHasPrefix(type, registered_name_type_prefix)) { @@ -403,6 +400,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty HeapFree(GetProcessHeap(), 0, name); } +done: TRACE(" -> %p/%s\n", format, debugstr_format(format ? format->format_id : 0)); return format; }

1 0