January 2017 - Wine-commits

Bruno Jesus : mciqtz32: Implement MCI_DGV_PLAY_REPEAT.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 71fbaba42690efd8363e0c9f5fac2158b07a977c URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fbaba42690efd8363e0c9f5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 25 23:01:25 2017 -0200 mciqtz32: Implement MCI_DGV_PLAY_REPEAT. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 41 +++++++++++++++++++++++++++++------------ dlls/mciqtz32/mciqtz_private.h | 3 +++ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 54f3b78..1aec326 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -359,6 +359,18 @@ static DWORD CALLBACK MCIQTZ_notifyThread(LPVOID parm) } } while (hr == S_OK && event_code != EC_COMPLETE); if (hr == S_OK && event_code == EC_COMPLETE) { + /* Repeat the music by seeking and running again */ + if (wma->mci_flags & MCI_DGV_PLAY_REPEAT) { + TRACE("repeat media as requested\n"); + IMediaControl_Stop(wma->pmctrl); + IMediaSeeking_SetPositions(wma->seek, + &wma->seek_start, + AM_SEEKING_AbsolutePositioning, + &wma->seek_stop, + AM_SEEKING_AbsolutePositioning); + IMediaControl_Run(wma->pmctrl); + continue; + } old = InterlockedExchangePointer(&wma->callback, NULL); if (old) mciDriverNotify(old, wma->notify_devid, MCI_NOTIFY_SUCCESSFUL); @@ -387,9 +399,8 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms { WINE_MCIQTZ* wma; HRESULT hr; - REFERENCE_TIME time1 = 0, time2 = 0; GUID format; - DWORD pos1; + DWORD start_flags; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -408,23 +419,29 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms mciDriverNotify(old, wma->notify_devid, MCI_NOTIFY_ABORTED); } + wma->mci_flags = dwFlags; IMediaSeeking_GetTimeFormat(wma->seek, &format); if (dwFlags & MCI_FROM) { if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) - time1 = lpParms->dwFrom * 10000; + wma->seek_start = lpParms->dwFrom * 10000; else - time1 = lpParms->dwFrom; - pos1 = AM_SEEKING_AbsolutePositioning; - } else - pos1 = AM_SEEKING_NoPositioning; + wma->seek_start = lpParms->dwFrom; + start_flags = AM_SEEKING_AbsolutePositioning; + } else { + wma->seek_start = 0; + start_flags = AM_SEEKING_NoPositioning; + } if (dwFlags & MCI_TO) { if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) - time2 = lpParms->dwTo * 10000; + wma->seek_stop = lpParms->dwTo * 10000; else - time2 = lpParms->dwTo; - } else - IMediaSeeking_GetDuration(wma->seek, &time2); - IMediaSeeking_SetPositions(wma->seek, &time1, pos1, &time2, AM_SEEKING_AbsolutePositioning); + wma->seek_stop = lpParms->dwTo; + } else { + wma->seek_stop = 0; + IMediaSeeking_GetDuration(wma->seek, &wma->seek_stop); + } + IMediaSeeking_SetPositions(wma->seek, &wma->seek_start, start_flags, + &wma->seek_stop, AM_SEEKING_AbsolutePositioning); hr = IMediaControl_Run(wma->pmctrl); if (FAILED(hr)) { diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index 27939aa..aa6fad9 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -37,6 +37,9 @@ typedef struct { IBasicVideo* vidbasic; IBasicAudio* audio; DWORD time_format; + DWORD mci_flags; + REFERENCE_TIME seek_start; + REFERENCE_TIME seek_stop; UINT command_table; HWND parent; MCIDEVICEID notify_devid;

1 0

Józef Kucia : wined3d: Implement SM5 bfi instruction.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: f7b619d7ce09ed5130e30cf34e55db1848568e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b619d7ce09ed5130e30cf34… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:07 2017 +0100 wined3d: Implement SM5 bfi instruction. 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/d3d11/tests/d3d11.c | 40 +++++++++++++++++++--------------------- dlls/wined3d/glsl_shader.c | 26 +++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ccecaf3..32355d9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10731,29 +10731,28 @@ static void test_uint_shader_instructions(void) const struct shader *ps; unsigned int bits[4]; struct uvec4 expected_result; - BOOL todo; } tests[] = { - {&ps_bfi, { 0, 0, 0, 0}, { 0, 0, 0, 0}, TRUE}, - {&ps_bfi, { 0, 0, 0, 1}, { 1, 1, 1, 1}, TRUE}, - {&ps_bfi, { ~0u, 0, ~0u, 0}, {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}, TRUE}, - {&ps_bfi, { ~0u, ~0u, ~0u, 0}, {0x80000000, 0x80000000, 0x80000000, 0x80000000}, TRUE}, - {&ps_bfi, { ~0u, 0x1fu, ~0u, 0}, {0x80000000, 0x80000000, 0x80000000, 0x80000000}, TRUE}, - {&ps_bfi, { ~0u, ~0x1fu, ~0u, 0}, {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}, TRUE}, - {&ps_bfi, { 0, 0, 0xff, 1}, { 1, 1, 1, 1}, TRUE}, - {&ps_bfi, { 0, 0, 0xff, 2}, { 2, 2, 2, 2}, TRUE}, - {&ps_bfi, { 16, 16, 0xff, 0xff}, {0x00ff00ff, 0x00ff00ff, 0x00ff00ff, 0x00ff00ff}, TRUE}, - {&ps_bfi, { 0, 0, ~0u, ~0u}, { ~0u, ~0u, ~0u, ~0u}, TRUE}, - {&ps_bfi, {~0x1fu, 0, ~0u, 0}, { 0, 0, 0, 0}, TRUE}, - {&ps_bfi, {~0x1fu, 0, ~0u, 1}, { 1, 1, 1, 1}, TRUE}, - {&ps_bfi, {~0x1fu, 0, ~0u, 2}, { 2, 2, 2, 2}, TRUE}, - {&ps_bfi, { 0, ~0x1fu, ~0u, 0}, { 0, 0, 0, 0}, TRUE}, - {&ps_bfi, { 0, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}, TRUE}, - {&ps_bfi, { 0, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}, TRUE}, - {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 0}, { 0, 0, 0, 0}, TRUE}, - {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}, TRUE}, - {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}, TRUE}, + {&ps_bfi, { 0, 0, 0, 0}, { 0, 0, 0, 0}}, + {&ps_bfi, { 0, 0, 0, 1}, { 1, 1, 1, 1}}, + {&ps_bfi, { ~0u, 0, ~0u, 0}, {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}}, + {&ps_bfi, { ~0u, ~0u, ~0u, 0}, {0x80000000, 0x80000000, 0x80000000, 0x80000000}}, + {&ps_bfi, { ~0u, 0x1fu, ~0u, 0}, {0x80000000, 0x80000000, 0x80000000, 0x80000000}}, + {&ps_bfi, { ~0u, ~0x1fu, ~0u, 0}, {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}}, + {&ps_bfi, { 0, 0, 0xff, 1}, { 1, 1, 1, 1}}, + {&ps_bfi, { 0, 0, 0xff, 2}, { 2, 2, 2, 2}}, + {&ps_bfi, { 16, 16, 0xff, 0xff}, {0x00ff00ff, 0x00ff00ff, 0x00ff00ff, 0x00ff00ff}}, + {&ps_bfi, { 0, 0, ~0u, ~0u}, { ~0u, ~0u, ~0u, ~0u}}, + {&ps_bfi, {~0x1fu, 0, ~0u, 0}, { 0, 0, 0, 0}}, + {&ps_bfi, {~0x1fu, 0, ~0u, 1}, { 1, 1, 1, 1}}, + {&ps_bfi, {~0x1fu, 0, ~0u, 2}, { 2, 2, 2, 2}}, + {&ps_bfi, { 0, ~0x1fu, ~0u, 0}, { 0, 0, 0, 0}}, + {&ps_bfi, { 0, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}}, + {&ps_bfi, { 0, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}}, + {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 0}, { 0, 0, 0, 0}}, + {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}}, + {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}}, {&ps_bfrev, {0x12345678}, {0x1e6a2c48, 0x12345678, 0x1e6a0000, 0x2c480000}}, {&ps_bfrev, {0xffff0000}, {0x0000ffff, 0xffff0000, 0x00000000, 0xffff0000}}, @@ -10809,7 +10808,6 @@ static void test_uint_shader_instructions(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, tests[i].bits, 0, 0); draw_quad(&test_context); - todo_wine_if(tests[i].todo) check_texture_uvec4(texture, &tests[i].expected_result); ID3D11PixelShader_Release(ps); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6f83563..e550318 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3791,6 +3791,30 @@ static void shader_glsl_float16(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_bitwise_op(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_dst_param dst; + struct glsl_src_param src[4]; + unsigned int i, j; + DWORD write_mask; + + dst = ins->dst[0]; + for (i = 0; i < 4; ++i) + { + write_mask = WINED3DSP_WRITEMASK_0 << i; + dst.write_mask = ins->dst[0].write_mask & write_mask; + + if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, + &dst, dst.reg.data_type))) + continue; + + for (j = 0; j < ARRAY_SIZE(src); ++j) + shader_glsl_add_src_param(ins, &ins->src[j], write_mask, &src[j]); + shader_addline(ins->ctx->buffer, "bitfieldInsert(%s, %s, %s & 0x1f, %s & 0x1f));\n", + src[3].param_str, src[2].param_str, src[1].param_str, src[0].param_str); + } +} + static void shader_glsl_nop(const struct wined3d_shader_instruction *ins) {} static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) @@ -8844,7 +8868,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ATOMIC_UMIN */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_BEM */ shader_glsl_bem, - /* WINED3DSIH_BFI */ NULL, + /* WINED3DSIH_BFI */ shader_glsl_bitwise_op, /* WINED3DSIH_BFREV */ shader_glsl_map2gl, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc,

1 0

Józef Kucia : wined3d: Implement SM5 ubfe instruction.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 5f57848911e5eecdfe8f9f53fd478aa42c8f9b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f57848911e5eecdfe8f9f53f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:08 2017 +0100 wined3d: Implement SM5 ubfe instruction. 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/glsl_shader.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e550318..785cd76 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3793,11 +3793,22 @@ static void shader_glsl_float16(const struct wined3d_shader_instruction *ins) static void shader_glsl_bitwise_op(const struct wined3d_shader_instruction *ins) { + struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct wined3d_shader_dst_param dst; struct glsl_src_param src[4]; + const char *instruction; unsigned int i, j; DWORD write_mask; + switch (ins->handler_idx) + { + case WINED3DSIH_BFI: instruction = "bitfieldInsert"; break; + case WINED3DSIH_UBFE: instruction = "bitfieldExtract"; break; + default: + ERR("Unhandled opcode %#x.\n", ins->handler_idx); + return; + } + dst = ins->dst[0]; for (i = 0; i < 4; ++i) { @@ -3808,10 +3819,12 @@ static void shader_glsl_bitwise_op(const struct wined3d_shader_instruction *ins) &dst, dst.reg.data_type))) continue; - for (j = 0; j < ARRAY_SIZE(src); ++j) + for (j = 0; j < ins->src_count; ++j) shader_glsl_add_src_param(ins, &ins->src[j], write_mask, &src[j]); - shader_addline(ins->ctx->buffer, "bitfieldInsert(%s, %s, %s & 0x1f, %s & 0x1f));\n", - src[3].param_str, src[2].param_str, src[1].param_str, src[0].param_str); + shader_addline(buffer, "%s(", instruction); + for (j = 0; j < ins->src_count - 2; ++j) + shader_addline(buffer, "%s, ", src[ins->src_count - j - 1].param_str); + shader_addline(buffer, "%s & 0x1f, %s & 0x1f));\n", src[1].param_str, src[0].param_str); } } @@ -9066,7 +9079,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2AR */ shader_glsl_texreg2ar, /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, - /* WINED3DSIH_UBFE */ NULL, + /* WINED3DSIH_UBFE */ shader_glsl_bitwise_op, /* WINED3DSIH_UDIV */ shader_glsl_udiv, /* WINED3DSIH_UGE */ shader_glsl_relop, /* WINED3DSIH_ULT */ shader_glsl_relop,

1 0

Józef Kucia : d3d11/tests: Add test for SM5 ubfe instruction.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 9dbfe8b5af0f064f6e55fce2ab6bf783a9d43ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbfe8b5af0f064f6e55fce2a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:09 2017 +0100 d3d11/tests: Add test for SM5 ubfe instruction. 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/d3d11/tests/d3d11.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 32355d9..06f736e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10622,6 +10622,25 @@ static void test_uint_shader_instructions(void) 0x0f00008c, 0x001020f2, 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x00208556, 0x00000000, 0x00000000, 0x00208aa6, 0x00000000, 0x00000000, 0x00208ff6, 0x00000000, 0x00000000, 0x0100003e, }; + static const DWORD ps_ubfe_code[] = + { +#if 0 + uint u; + + uint4 main() : SV_Target + { + return uint4((u & 0xf0) >> 4, (u & 0x7fffff00) >> 8, (u & 0xfe) >> 1, (u & 0x7fffffff) >> 1); + } +#endif + 0x43425844, 0xc4ac0509, 0xaea83154, 0xf1fb3b80, 0x4c22e3cc, 0x00000001, 0x000000e4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000006c, 0x00000050, 0x0000001b, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x1000008a, 0x001020f2, 0x00000000, 0x00004002, 0x00000004, 0x00000017, 0x00000007, 0x0000001e, + 0x00004002, 0x00000004, 0x00000008, 0x00000001, 0x00000001, 0x00208006, 0x00000000, 0x00000000, + 0x0100003e, + }; static const DWORD ps_bfrev_code[] = { #if 0 @@ -10721,6 +10740,7 @@ static void test_uint_shader_instructions(void) 0x00000000, 0x0600003b, 0x00102042, 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x0100003e, }; static const struct shader ps_bfi = {ps_bfi_code, sizeof(ps_bfi_code), D3D_FEATURE_LEVEL_11_0}; + static const struct shader ps_ubfe = {ps_ubfe_code, sizeof(ps_ubfe_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_bfrev = {ps_bfrev_code, sizeof(ps_bfrev_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_ftou = {ps_ftou_code, sizeof(ps_ftou_code), D3D_FEATURE_LEVEL_10_0}; static const struct shader ps_f16tof32 = {ps_f16tof32_code, sizeof(ps_f16tof32_code), D3D_FEATURE_LEVEL_11_0}; @@ -10754,6 +10774,14 @@ static void test_uint_shader_instructions(void) {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}}, {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}}, + {&ps_ubfe, {0x00000000}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, + {&ps_ubfe, {0xffffffff}, {0x0000000f, 0x007fffff, 0x0000007f, 0x3fffffff}}, + {&ps_ubfe, {0xff000000}, {0x00000000, 0x007f0000, 0x00000000, 0x3f800000}}, + {&ps_ubfe, {0x00ff0000}, {0x00000000, 0x0000ff00, 0x00000000, 0x007f8000}}, + {&ps_ubfe, {0x000000ff}, {0x0000000f, 0x00000000, 0x0000007f, 0x0000007f}}, + {&ps_ubfe, {0x80000001}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, + {&ps_ubfe, {0xc0000003}, {0x00000000, 0x00400000, 0x00000001, 0x20000001}}, + {&ps_bfrev, {0x12345678}, {0x1e6a2c48, 0x12345678, 0x1e6a0000, 0x2c480000}}, {&ps_bfrev, {0xffff0000}, {0x0000ffff, 0xffff0000, 0x00000000, 0xffff0000}}, {&ps_bfrev, {0xffffffff}, {0xffffffff, 0xffffffff, 0xffff0000, 0xffff0000}},

1 0

André Hentschel : cmd: Remove dead assignments (clang ).
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: c9903aedcbdbba4424344f4a7d9bd7e8efe61d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9903aedcbdbba4424344f4a7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:04 2017 +0100 cmd: Remove dead assignments (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f3dbe3a..7301f54 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4109,7 +4109,7 @@ void WCMD_setshow_env (WCHAR *s) { if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ WINE_TRACE("set /p: Setting var '%s' to '%s'\n", wine_dbgstr_w(s), wine_dbgstr_w(string)); - status = SetEnvironmentVariableW(s, string); + SetEnvironmentVariableW(s, string); } /* See if /A supplied, and if so calculate the results of all the expressions */ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 87f5387..1aa3c1c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2527,8 +2527,6 @@ int wmain (int argc, WCHAR *argvW[]) /* Otherwise we now need to look in the path to see if we can find it */ } else { - p = thisArg + strlenW(thisArg); - /* Does file exist with this name? */ if (SearchPathW(NULL, thisArg, NULL, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string));

1 0

André Hentschel : shell32: Remove dead assignments ( clang).
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 1c98bc14c95ccd6bbf25be08c3d4ffdae1685e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c98bc14c95ccd6bbf25be08c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:03 2017 +0100 shell32: Remove dead assignments (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 6aa3eec..474a1bc 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1720,7 +1720,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } HeapFree(GetProcessHeap(), 0, wszApplicationName); - dwApplicationNameLen = lstrlenW(buf) + 1; wszApplicationName = buf; sei_tmp.lpFile = wszApplicationName; } @@ -1734,7 +1733,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) ExpandEnvironmentStringsW(sei_tmp.lpFile, buf, len + 1); HeapFree(GetProcessHeap(), 0, wszApplicationName); - dwApplicationNameLen = len + 1; wszApplicationName = buf; sei_tmp.lpFile = wszApplicationName;

1 0

Aric Stewart : hidclass.sys: BSize will never be negative.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: b46e15568c90a6123ed9e55d441204422d9fb608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46e15568c90a6123ed9e55d4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 30 09:00:29 2017 -0600 hidclass.sys: BSize will never be negative. Found by Bruno Jesus and cppcheck. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 8064e34..ee13055 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -410,7 +410,7 @@ static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, unsigned int *feature_index, struct feature *feature) { - if (bSize <= 0) + if (bSize == 0) { return; }

1 0

Bruno Jesus : shlwapi/tests: Test NULL handle duplication in SHMapHandle() .
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 57b83e1459316ff3e04809f2f8655e458a14322e URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b83e1459316ff3e04809f2f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 30 21:42:28 2017 -0200 shlwapi/tests: Test NULL handle duplication in SHMapHandle(). Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index ad3048b..004c75d 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -568,6 +568,12 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); /* test SHMapHandle */ + SetLastError(0xdeadbeef); + hmem2 = pSHMapHandle(NULL, procid, GetCurrentProcessId(), 0, 0); + ok(hmem2 == NULL, "expected NULL, got new handle\n"); +todo_wine + ok(GetLastError() == 0xdeadbeef, "last error should not have changed, got %u\n", GetLastError()); + hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0); /* It seems like Windows Vista/2008 uses a different internal implementation

1 0

Bruno Jesus : notepad: Only skip valid command options.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: bd19402b6d3f6efa30e3b7d088c4bbebd716a2c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd19402b6d3f6efa30e3b7d08… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 31 01:31:33 2017 -0200 notepad: Only skip valid command options. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/main.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 20e887b..6f567a9 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -615,7 +615,7 @@ static int AlertFileDoesNotExist(LPCWSTR szFileName) static void HandleCommandLine(LPWSTR cmdline) { - WCHAR delimiter; + WCHAR delimiter, *ptr; BOOL opt_print = FALSE; /* skip white space */ @@ -630,22 +630,29 @@ static void HandleCommandLine(LPWSTR cmdline) if (*cmdline == delimiter) cmdline++; - while (*cmdline == ' ' || *cmdline == '-' || *cmdline == '/') + ptr = cmdline; + while (*ptr == ' ' || *ptr == '-' || *ptr == '/') { WCHAR option; - if (*cmdline++ == ' ') continue; + if (*ptr++ == ' ') continue; - option = *cmdline; - if (option) cmdline++; - while (*cmdline == ' ') cmdline++; + option = *ptr; + if (option) ptr++; + while (*ptr == ' ') ptr++; switch(option) { case 'p': case 'P': - opt_print = TRUE; + { + if (!opt_print) + { + opt_print = TRUE; + cmdline = ptr; + } break; + } } }

1 0

Nikolay Sivov : regedit: Always show treeview selection.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 7dea6fef61a51af0be16444e9d95f63bea807728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dea6fef61a51af0be16444e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 28 16:37:51 2017 +0300 regedit: Always show treeview selection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 07e9b41..9d9fa6d 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -696,7 +696,8 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id) /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, TreeView, - WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS, + WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | + TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, ULongToHandle(id), hInst, NULL); SendMessageW(hwndTV, TVM_SETUNICODEFORMAT, TRUE, 0);

1 0