May 2016 - Wine-commits - list.winehq.org

Markus Heidelberg : jscript: Date.parse: make "UTC"/"GMT" optional before the timezone offset.
by Alexandre Julliard 24 May '16

24 May '16

Module: wine Branch: master Commit: 74257d59405898730eac3dffbdd9f7c4ec3b2935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74257d59405898730eac3dffb… Author: Markus Heidelberg <markus.heidelberg(a)web.de> Date: Sat May 21 12:41:40 2016 +0200 jscript: Date.parse: make "UTC"/"GMT" optional before the timezone offset. Signed-off-by: Markus Heidelberg <markus.heidelberg(a)web.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 38 ++++++++++++++++++++++---------------- dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 6d98fcd..a80690c 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2174,6 +2174,28 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { year = tmp; } } + else if(parse[i]=='+' || parse[i]=='-') { + /* Timezone offset */ + BOOL positive = TRUE; + + if(set_offset && set_hour_adjust) break; + set_offset = TRUE; + set_hour_adjust = FALSE; + + if(parse[i] == '-') positive = FALSE; + + i++; + while(isspaceW(parse[i])) i++; + if(parse[i]<'0' || parse[i]>'9') break; + offset = atoiW(&parse[i]); + while(parse[i]>='0' && parse[i]<='9') i++; + + if(offset<24) offset *= 60; + else offset = (offset/100)*60 + offset%100; + + if(positive) offset = -offset; + + } else { if(parse[i]<'A' || parse[i]>'Z') break; else if(parse[i]=='B' && (parse[i+1]=='C' || @@ -2230,27 +2252,11 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { else if((parse[i]=='U' && parse[i+1]=='T' && parse[i+2]=='C') || (parse[i]=='G' && parse[i+1]=='M' && parse[i+2]=='T')) { /* Timezone */ - BOOL positive = TRUE; - if(set_offset) break; set_offset = TRUE; set_hour_adjust = FALSE; i += 3; - while(isspaceW(parse[i])) i++; - if(parse[i] == '-') positive = FALSE; - else if(parse[i] != '+') continue; - - i++; - while(isspaceW(parse[i])) i++; - if(parse[i]<'0' || parse[i]>'9') break; - offset = atoiW(&parse[i]); - while(parse[i]>='0' && parse[i]<='9') i++; - - if(offset<24) offset *= 60; - else offset = (offset/100)*60 + offset%100; - - if(positive) offset = -offset; } else { /* Month or garbage */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index dacacc4..e5e6350 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2108,6 +2108,10 @@ ok(Date.parse("71 11:32AM Dec 12 UTC BC ") === -64346358480000, "Date.parse(\"71 ok(Date.parse("23/71/2000 11::32::UTC") === 1010662320000, "Date.parse(\"23/71/2000 11::32::UTC\") = " + Date.parse("23/71/2000 11::32::UTC")); ok(Date.parse("1970/01/01") === Date.parse("01/01/1970"), "Date.parse(\"1970/01/01\") = " + Date.parse("1970/01/01")); ok(Date.parse("71/12/14") === Date.parse("12/14/1971"), "Date.parse(\"71/12/14\") = " + Date.parse("71/12/14")); +ok(Date.parse("Tue, 22 Mar 2016 09:57:55 -0300") === Date.parse("Tue, 22 Mar 2016 09:57:55 GMT-0300"), + "Date.parse(\"Tue, 22 Mar 2016 09:57:55 -0300\") = " + Date.parse("Tue, 22 Mar 2016 09:57:55 -0300")); +ok(Date.parse("Tue, 22 Mar 2016 09:57:55 +0400") === Date.parse("Tue, 22 Mar 2016 09:57:55 UTC+0400"), + "Date.parse(\"Tue, 22 Mar 2016 09:57:55 +0400\") = " + Date.parse("Tue, 22 Mar 2016 09:57:55 +0400")); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Hugh McMaster : reg: Avoid using strlenW to check if a string is valid.
by Alexandre Julliard 24 May '16

24 May '16

Module: wine Branch: master Commit: ccbbb928886b415d10498e5b5faebfdf4d6ffbc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccbbb928886b415d10498e5b5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue May 24 12:48:15 2016 +0000 reg: Avoid using strlenW to check if a string is valid. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7852e74..f8c6103 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -159,7 +159,7 @@ static BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info) LoadStringW(hmod, STRING_NO, Nbuffer, ARRAY_SIZE(Nbuffer)); LoadStringW(hmod, STRING_DEFAULT_VALUE, defval, ARRAY_SIZE(defval)); - str = (reg_info && strlenW(reg_info)) ? reg_info : defval; + str = (reg_info && *reg_info) ? reg_info : defval; while (1) {

1 0

Henri Verbeet : wined3d: Properly cleanup on failure in wined3d_cs_create( ).
by Alexandre Julliard 24 May '16

24 May '16

Module: wine Branch: master Commit: 10e601ba3ce0f32127d3abeb501b3cda624f8bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e601ba3ce0f32127d3abeb5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 23 18:06:26 2016 +0200 wined3d: Properly cleanup on failure in wined3d_cs_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index edb5cf2..254a1f7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1144,6 +1144,8 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) cs->data_size = WINED3D_INITIAL_CS_SIZE; if (!(cs->data = HeapAlloc(GetProcessHeap(), 0, cs->data_size))) { + state_cleanup(&cs->state); + HeapFree(GetProcessHeap(), 0, cs->fb.render_targets); HeapFree(GetProcessHeap(), 0, cs); return NULL; }

1 0

Józef Kucia : wined3d: Inverse logic for applying half float vertex format fixups.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 270d09d008e7a64fb448803213d1681570f1f43d URL: http://source.winehq.org/git/wine.git/?a=commit;h=270d09d008e7a64fb44880321… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 23 00:41:56 2016 +0200 wined3d: Inverse logic for applying half float vertex format fixups. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5c045d6..2012218 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -340,8 +340,8 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, 4, GL_UNSIGNED_SHORT, 4, GL_TRUE, sizeof(short int)}, {WINED3DFMT_R10G10B10A2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT, 3, GL_FALSE, sizeof(short int)}, {WINED3DFMT_R10G10B10A2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, 3, GL_TRUE, sizeof(short int)}, - {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_FLOAT, 2, GL_FALSE, sizeof(GLhalfNV)}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_FLOAT, 4, GL_FALSE, sizeof(GLhalfNV)}, + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_HALF_FLOAT, 2, GL_FALSE, sizeof(GLhalfNV)}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_HALF_FLOAT, 4, GL_FALSE, sizeof(GLhalfNV)}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, 4, GL_TRUE, sizeof(BYTE)}, {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, 4, GL_FALSE, sizeof(BYTE)}, {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT, 4, GL_FALSE, sizeof(short int)}, @@ -2977,15 +2977,15 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].gl_vtx_format = GL_BGRA; } - if (gl_info->supported[ARB_HALF_FLOAT_VERTEX]) + if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) { /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. * It is the job of the vertex buffer code to make sure that the vbos have the right format */ idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - gl_info->formats[idx].gl_vtx_type = GL_HALF_FLOAT; /* == GL_HALF_FLOAT_NV */ + gl_info->formats[idx].gl_vtx_type = GL_FLOAT; idx = get_format_idx(WINED3DFMT_R16G16B16A16_FLOAT); - gl_info->formats[idx].gl_vtx_type = GL_HALF_FLOAT; + gl_info->formats[idx].gl_vtx_type = GL_FLOAT; } if (!gl_info->supported[ARB_HALF_FLOAT_PIXEL])

1 0

Józef Kucia : wined3d: Simplify "format_vertex_info" table.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 9a8ee50f2e4b9a7611fde8b3be4efa60cd475aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8ee50f2e4b9a7611fde8b3b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 23 00:41:57 2016 +0200 wined3d: Simplify "format_vertex_info" table. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 89 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2012218..370acce 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -316,39 +316,37 @@ struct wined3d_format_vertex_info { enum wined3d_format_id id; enum wined3d_ffp_emit_idx emit_idx; - GLint component_count; + unsigned int component_count; GLenum gl_vtx_type; - GLint gl_vtx_format; GLboolean gl_normalized; - unsigned int component_size; }; static const struct wined3d_format_vertex_info format_vertex_info[] = { - {WINED3DFMT_R32_FLOAT, WINED3D_FFP_EMIT_FLOAT1, 1, GL_FLOAT, 1, GL_FALSE, sizeof(float)}, - {WINED3DFMT_R32G32_FLOAT, WINED3D_FFP_EMIT_FLOAT2, 2, GL_FLOAT, 2, GL_FALSE, sizeof(float)}, - {WINED3DFMT_R32G32B32_FLOAT, WINED3D_FFP_EMIT_FLOAT3, 3, GL_FLOAT, 3, GL_FALSE, sizeof(float)}, - {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, 4, GL_FLOAT, 4, GL_FALSE, sizeof(float)}, - {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, 4, GL_UNSIGNED_BYTE, 4, GL_TRUE, sizeof(BYTE)}, - {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, 4, GL_UNSIGNED_BYTE, 4, GL_FALSE, sizeof(BYTE)}, - {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, 2, GL_SHORT, 2, GL_FALSE, sizeof(short int)}, - {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, 4, GL_SHORT, 4, GL_FALSE, sizeof(short int)}, - {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, 4, GL_UNSIGNED_BYTE, 4, GL_TRUE, sizeof(BYTE)}, - {WINED3DFMT_R16G16_SNORM, WINED3D_FFP_EMIT_SHORT2N, 2, GL_SHORT, 2, GL_TRUE, sizeof(short int)}, - {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, 4, GL_SHORT, 4, GL_TRUE, sizeof(short int)}, - {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, 2, GL_UNSIGNED_SHORT, 2, GL_TRUE, sizeof(short int)}, - {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, 4, GL_UNSIGNED_SHORT, 4, GL_TRUE, sizeof(short int)}, - {WINED3DFMT_R10G10B10A2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT, 3, GL_FALSE, sizeof(short int)}, - {WINED3DFMT_R10G10B10A2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, 3, GL_TRUE, sizeof(short int)}, - {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_HALF_FLOAT, 2, GL_FALSE, sizeof(GLhalfNV)}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_HALF_FLOAT, 4, GL_FALSE, sizeof(GLhalfNV)}, - {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, 4, GL_TRUE, sizeof(BYTE)}, - {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, 4, GL_FALSE, sizeof(BYTE)}, - {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT, 4, GL_FALSE, sizeof(short int)}, - {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT, 1, GL_FALSE, sizeof(UINT)}, - {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT, 2, GL_FALSE, sizeof(UINT)}, - {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, 3, GL_FALSE, sizeof(UINT)}, - {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT, 4, GL_FALSE, sizeof(UINT)}, + {WINED3DFMT_R32_FLOAT, WINED3D_FFP_EMIT_FLOAT1, 1, GL_FLOAT, GL_FALSE}, + {WINED3DFMT_R32G32_FLOAT, WINED3D_FFP_EMIT_FLOAT2, 2, GL_FLOAT, GL_FALSE}, + {WINED3DFMT_R32G32B32_FLOAT, WINED3D_FFP_EMIT_FLOAT3, 3, GL_FLOAT, GL_FALSE}, + {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, 4, GL_FLOAT, GL_FALSE}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE }, + {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, 4, GL_UNSIGNED_BYTE, GL_FALSE}, + {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, 2, GL_SHORT, GL_FALSE}, + {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, 4, GL_SHORT, GL_FALSE}, + {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, 4, GL_UNSIGNED_BYTE, GL_TRUE }, + {WINED3DFMT_R16G16_SNORM, WINED3D_FFP_EMIT_SHORT2N, 2, GL_SHORT, GL_TRUE }, + {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, 4, GL_SHORT, GL_TRUE }, + {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, 2, GL_UNSIGNED_SHORT, GL_TRUE }, + {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, 4, GL_UNSIGNED_SHORT, GL_TRUE }, + {WINED3DFMT_R10G10B10A2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT, GL_FALSE}, + {WINED3DFMT_R10G10B10A2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, GL_TRUE }, + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_HALF_FLOAT, GL_FALSE}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_HALF_FLOAT, GL_FALSE}, + {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_TRUE }, + {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_FALSE}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT, GL_FALSE}, + {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT, GL_FALSE}, + {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT, GL_FALSE}, + {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, GL_FALSE}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT, GL_FALSE}, }; struct wined3d_format_texture_info @@ -3096,11 +3094,37 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } +static unsigned int gl_type_size(GLenum type) +{ + switch (type) + { + case GL_HALF_FLOAT: + return sizeof(GLhalfNV); + case GL_FLOAT: + return sizeof(GLfloat); + case GL_BYTE: + return sizeof(GLbyte); + case GL_UNSIGNED_BYTE: + return sizeof(GLubyte); + case GL_SHORT: + return sizeof(GLshort); + case GL_UNSIGNED_SHORT: + return sizeof(GLushort); + case GL_INT: + return sizeof(GLint); + case GL_UNSIGNED_INT: + return sizeof(GLuint); + default: + FIXME("Unhandled GL type %#x.\n", type); + return 0; + } +} + static BOOL init_format_vertex_info(struct wined3d_gl_info *gl_info) { unsigned int i; - for (i = 0; i < (sizeof(format_vertex_info) / sizeof(*format_vertex_info)); ++i) + for (i = 0; i < ARRAY_SIZE(format_vertex_info); ++i) { struct wined3d_format *format; int fmt_idx = get_format_idx(format_vertex_info[i].id); @@ -3116,9 +3140,14 @@ static BOOL init_format_vertex_info(struct wined3d_gl_info *gl_info) format->emit_idx = format_vertex_info[i].emit_idx; format->component_count = format_vertex_info[i].component_count; format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; - format->gl_vtx_format = format_vertex_info[i].gl_vtx_format; + format->gl_vtx_format = format_vertex_info[i].component_count; format->gl_normalized = format_vertex_info[i].gl_normalized; - format->component_size = format_vertex_info[i].component_size; + if (!(format->component_size = gl_type_size(format_vertex_info[i].gl_vtx_type))) + { + ERR("Invalid component size for vertex format %s (%#x).\n", + debug_d3dformat(format_vertex_info[i].id), format_vertex_info[i].id); + return FALSE; + } } return TRUE;

1 0

Andrey Gusev : dinput: Fix a typo in WARN() messages.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 3321a7faec108d19eeb426ab6ff7ae41642f56b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3321a7faec108d19eeb426ab6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed May 18 16:15:30 2016 +0300 dinput: Fix a typo in WARN() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 261cee1..5b02df4 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -163,7 +163,7 @@ static INT find_joystick_devices(void) #ifdef JSIOCGAXES if (ioctl(fd, JSIOCGAXES, &joydev.axis_count) < 0) { - WARN("ioctl(%s,JSIOCGAXES) failed: %s, defauting to 2\n", joydev.device, strerror(errno)); + WARN("ioctl(%s,JSIOCGAXES) failed: %s, defaulting to 2\n", joydev.device, strerror(errno)); joydev.axis_count = 2; } #else @@ -173,7 +173,7 @@ static INT find_joystick_devices(void) #ifdef JSIOCGBUTTONS if (ioctl(fd, JSIOCGBUTTONS, &joydev.button_count) < 0) { - WARN("ioctl(%s,JSIOCGBUTTONS) failed: %s, defauting to 2\n", joydev.device, strerror(errno)); + WARN("ioctl(%s,JSIOCGBUTTONS) failed: %s, defaulting to 2\n", joydev.device, strerror(errno)); joydev.button_count = 2; } #else

1 0

Andrey Gusev : include: Fix a typo in IDirectShowStream interface.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 698d4114677205c3e5a0df659d230fe982578757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=698d4114677205c3e5a0df659… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed May 18 16:49:35 2016 +0300 include: Fix a typo in IDirectShowStream interface. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/amstream.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/amstream.idl b/include/amstream.idl index 2f32d44..d4e5e35 100644 --- a/include/amstream.idl +++ b/include/amstream.idl @@ -76,9 +76,9 @@ interface IDirectShowStream : IDispatch [propget, id(1), helpstring("property FileName")] HRESULT FileName([out, retval] BSTR *pVal); [propput, id(1), helpstring("property FileName")] HRESULT FileName([in] BSTR newVal); [propget, id(2), helpstring("property Video")] HRESULT Video([out, retval] OUTPUT_STATE *pVal); - [propput, id(2), helpstring("propetry Video")] HRESULT Video([in] OUTPUT_STATE newVal); + [propput, id(2), helpstring("property Video")] HRESULT Video([in] OUTPUT_STATE newVal); [propget, id(3), helpstring("property Audio")] HRESULT Audio([out, retval] OUTPUT_STATE *pVal); - [propput, id(3), helpstring("propetry Audio")] HRESULT Audio([in] OUTPUT_STATE newVal); + [propput, id(3), helpstring("property Audio")] HRESULT Audio([in] OUTPUT_STATE newVal); }; [

1 0

Andrey Gusev : d3d8/tests: Fix a typo in ok() message.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 2e11e6e1f8f4ada9fb4d5fb62f3d73578feaeec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e11e6e1f8f4ada9fb4d5fb62… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 22 12:59:07 2016 +0300 d3d8/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 580b444..cd28e82 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3185,7 +3185,7 @@ static void depth_clamp_test(void) ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); - ok(SUCCEEDED(hr), "SetVertexSahder failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(*quad1)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr);

1 0

Andrey Gusev : mshtml/tests: Fix a typo in ok() messages.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 92890ac993475d14ca734a1e916ce11745e10826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92890ac993475d14ca734a1e9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 22 12:43:16 2016 +0300 mshtml/tests: Fix a typo in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/activex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 783b976..bd1a0cd 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -1569,7 +1569,7 @@ static void test_iface_wrapping(IHTMLObjectElement *elem) SET_EXPECT(wrapped_Release); unk = (void*)0xdeadbeef; hres = IHTMLObjectElement_QueryInterface(elem, &IID_ITestActiveX, (void**)&unk); - ok(hres == S_OK, "QueryInerface(IID_ITestActiveX failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_ITestActiveX failed: %08x\n", hres); CHECK_CALLED(QI_ITestActiveX); CHECK_CALLED(wrapped_AddRef); CHECK_CALLED(wrapped_Release); @@ -1605,7 +1605,7 @@ static void test_iface_wrapping(IHTMLObjectElement *elem) SET_EXPECT(wrapped_Release); unk = (void*)0xdeadbeef; hres = IHTMLObjectElement_QueryInterface(elem, &IID_ITestActiveX, (void**)&unk2); - ok(hres == S_OK, "QueryInerface(IID_ITestActiveX failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_ITestActiveX failed: %08x\n", hres); CHECK_CALLED(QI_ITestActiveX); CHECK_CALLED(wrapped_AddRef); CHECK_CALLED(wrapped_Release);

1 0

Andrey Gusev : user32/tests: Fix a typo in ok() message.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 5a0596ed101c11f07a4be7e112251d7bc165c6b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a0596ed101c11f07a4be7e11… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 22 12:54:02 2016 +0300 user32/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index c9e31f7..8f92ff8 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1672,7 +1672,7 @@ static void test_text_position_style(DWORD style) /* Get a stock font for which we can determine the metrics */ font = GetStockObject(SYSTEM_FONT); - ok (font != NULL, "GetStockObjcet SYSTEM_FONT failed\n"); + ok (font != NULL, "GetStockObject SYSTEM_FONT failed\n"); dc = GetDC(NULL); ok (dc != NULL, "GetDC() failed\n"); oldFont = SelectObject(dc, font);

1 0