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

Józef Kucia : wined3d: Handle SM4 if instruction modifiers.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: 422bf938cdd38d6dba3a80e3ed557dee4871a7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=422bf938cdd38d6dba3a80e3e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 25 10:51:20 2016 +0200 wined3d: Handle SM4 if instruction modifiers. 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 | 3 ++- dlls/wined3d/shader.c | 11 ++++++++++- dlls/wined3d/shader_sm4.c | 14 +++++++++++++- dlls/wined3d/wined3d_private.h | 6 ++++++ 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8a6215f..98d179e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4156,10 +4156,11 @@ static void shader_glsl_rep(const struct wined3d_shader_instruction *ins) static void shader_glsl_if(const struct wined3d_shader_instruction *ins) { + const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; struct glsl_src_param src0_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - shader_addline(ins->ctx->buffer, "if (bool(%s)) {\n", src0_param.param_str); + shader_addline(ins->ctx->buffer, "if (%s(%s)) {\n", condition, src0_param.param_str); } static void shader_glsl_ifc(const struct wined3d_shader_instruction *ins) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c843bc1..b410277 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2259,7 +2259,16 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); - if (ins.handler_idx == WINED3DSIH_IFC + if (ins.handler_idx == WINED3DSIH_IF) + { + switch (ins.flags) + { + case WINED3D_SHADER_CONDITIONAL_OP_NZ: shader_addline(&buffer, "_nz"); break; + case WINED3D_SHADER_CONDITIONAL_OP_Z: shader_addline(&buffer, "_z"); break; + default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); break; + } + } + else if (ins.handler_idx == WINED3DSIH_IFC || ins.handler_idx == WINED3DSIH_BREAKC) { switch (ins.flags) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b922012..96ea274 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -103,6 +103,8 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_FLAG_SATURATE 0x4 +#define WINED3D_SM4_CONDITIONAL_NZ (0x1u << 18) + enum wined3d_sm4_opcode { WINED3D_SM4_OP_ADD = 0x00, @@ -379,6 +381,15 @@ static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD **ptr, enum wined3d_data_type data_type, struct wined3d_shader_dst_param *dst_param); +static void shader_sm4_read_if(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_src_param(priv, &tokens, WINED3D_DATA_UINT, &priv->src_param[0]); + ins->flags = (opcode_token & WINED3D_SM4_CONDITIONAL_NZ) ? + WINED3D_SHADER_CONDITIONAL_OP_NZ : WINED3D_SHADER_CONDITIONAL_OP_Z; +} + static void shader_sm4_read_shader_data(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -627,7 +638,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_FTOU, WINED3DSIH_FTOU, "u", "f"}, {WINED3D_SM4_OP_GE, WINED3DSIH_GE, "u", "ff"}, {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, "i", "ii"}, - {WINED3D_SM4_OP_IF, WINED3DSIH_IF, "", "u"}, + {WINED3D_SM4_OP_IF, WINED3DSIH_IF, "", "u", + shader_sm4_read_if}, {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "u", "ii"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "u", "ii"}, {WINED3D_SM4_OP_ILT, WINED3DSIH_ILT, "u", "ii"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5a2732..6a8bbcb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -497,6 +497,12 @@ enum wined3d_shader_rel_op WINED3D_SHADER_REL_OP_LE = 6, }; +enum wined3d_shader_conditional_op +{ + WINED3D_SHADER_CONDITIONAL_OP_NZ = 0, + WINED3D_SHADER_CONDITIONAL_OP_Z = 1 +}; + #define WINED3D_SM1_VS 0xfffeu #define WINED3D_SM1_PS 0xffffu #define WINED3D_SM4_PS 0x0000u

1 0

Józef Kucia : wined3d: Clean up SM1 frontend.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: 8d48454a363946270699dc90d79af92bba7bbc75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d48454a363946270699dc90d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 25 10:51:19 2016 +0200 wined3d: Clean up SM1 frontend. 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/shader_sm1.c | 56 ++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 2a1f4a4..fc79f6b 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -202,8 +202,8 @@ enum wined3d_sm1_opcode struct wined3d_sm1_opcode_info { enum wined3d_sm1_opcode opcode; - UINT dst_count; - UINT param_count; + unsigned int dst_count; + unsigned int param_count; enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; DWORD min_version; DWORD max_version; @@ -398,9 +398,10 @@ static const enum wined3d_shader_resource_type resource_type_table[] = /* Read a parameter opcode from the input stream, * and possibly a relative addressing token. * Return the number of tokens read */ -static int shader_get_param(const struct wined3d_sm1_data *priv, const DWORD *ptr, DWORD *token, DWORD *addr_token) +static unsigned int shader_get_param(const struct wined3d_sm1_data *priv, const DWORD *ptr, + DWORD *token, DWORD *addr_token) { - UINT count = 1; + unsigned int count = 1; *token = *ptr; @@ -427,15 +428,15 @@ static int shader_get_param(const struct wined3d_sm1_data *priv, const DWORD *pt return count; } -static const struct wined3d_sm1_opcode_info *shader_get_opcode(const struct wined3d_sm1_data *priv, DWORD code) +static const struct wined3d_sm1_opcode_info *shader_get_opcode(const struct wined3d_sm1_data *priv, DWORD token) { DWORD shader_version = WINED3D_SHADER_VERSION(priv->shader_version.major, priv->shader_version.minor); const struct wined3d_sm1_opcode_info *opcode_table = priv->opcode_table; - DWORD i = 0; + unsigned int i = 0; while (opcode_table[i].handler_idx != WINED3DSIH_TABLE_SIZE) { - if ((code & WINED3D_SM1_OPCODE_MASK) == opcode_table[i].opcode + if ((token & WINED3D_SM1_OPCODE_MASK) == opcode_table[i].opcode && shader_version >= opcode_table[i].min_version && (!opcode_table[i].max_version || shader_version <= opcode_table[i].max_version)) { @@ -444,19 +445,20 @@ static const struct wined3d_sm1_opcode_info *shader_get_opcode(const struct wine ++i; } - FIXME("Unsupported opcode %#x(%d) masked %#x, shader version %#x\n", - code, code, code & WINED3D_SM1_OPCODE_MASK, shader_version); + FIXME("Unsupported opcode %#x, token 0x%08x, shader version %#x.\n", + token & WINED3D_SM1_OPCODE_MASK, token, shader_version); return NULL; } /* Return the number of parameters to skip for an opcode */ -static int shader_skip_opcode(const struct wined3d_sm1_data *priv, +static unsigned int shader_skip_opcode(const struct wined3d_sm1_data *priv, const struct wined3d_sm1_opcode_info *opcode_info, DWORD opcode_token) { + unsigned int length; /* Shaders >= 2.0 may contain address tokens, but fortunately they * have a useful length mask - use it here. Shaders 1.0 contain no such tokens */ - DWORD length = (opcode_token & WINED3D_SM1_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM1_INSTRUCTION_LENGTH_SHIFT; + length = (opcode_token & WINED3D_SM1_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM1_INSTRUCTION_LENGTH_SHIFT; return (priv->shader_version.major >= 2) ? length : opcode_info->param_count; } @@ -495,10 +497,9 @@ static void shader_parse_dst_param(DWORD param, const struct wined3d_shader_src_ * Note: This function assumes source or destination token format. * It will not work with specially-formatted tokens like DEF or DCL, * but hopefully those would be recognized */ -static int shader_skip_unrecognized(const struct wined3d_sm1_data *priv, const DWORD *ptr) +static unsigned int shader_skip_unrecognized(const struct wined3d_sm1_data *priv, const DWORD *ptr) { - int tokens_read = 0; - int i = 0; + unsigned int tokens_read = 0, i = 0; /* TODO: Think of a good name for 0x80000000 and replace it with a constant */ while (*ptr & 0x80000000) @@ -509,9 +510,10 @@ static int shader_skip_unrecognized(const struct wined3d_sm1_data *priv, const D tokens_read += shader_get_param(priv, ptr, &token, &addr_token); ptr += tokens_read; - FIXME("Unrecognized opcode param: token=0x%08x addr_token=0x%08x name=", token, addr_token); + FIXME("Unrecognized opcode param: token=0x%08x addr_token=0x%08x.\n", token, addr_token); - if (token & WINED3D_SM1_ADDRESS_MODE_RELATIVE) shader_parse_src_param(addr_token, NULL, &rel_addr); + if (token & WINED3D_SM1_ADDRESS_MODE_RELATIVE) + shader_parse_src_param(addr_token, NULL, &rel_addr); if (!i) { @@ -525,7 +527,6 @@ static int shader_skip_unrecognized(const struct wined3d_sm1_data *priv, const D shader_parse_src_param(token, token & WINED3D_SM1_ADDRESS_MODE_RELATIVE ? &rel_addr : NULL, &src); } - FIXME("\n"); ++i; } return tokens_read; @@ -544,14 +545,11 @@ static void *shader_sm1_init(const DWORD *byte_code, const struct wined3d_shader return NULL; } - priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); - if (!priv) + if (!(priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)))) return NULL; if (output_signature->element_count) - { FIXME("SM 1-3 shader shouldn't have output signatures.\n"); - } switch (*byte_code >> 16) { @@ -566,7 +564,7 @@ static void *shader_sm1_init(const DWORD *byte_code, const struct wined3d_shader break; default: - FIXME("Unrecognized shader type %#x\n", *byte_code >> 16); + FIXME("Unrecognized shader type %#x.\n", *byte_code >> 16); HeapFree(GetProcessHeap(), 0, priv); return NULL; } @@ -585,7 +583,7 @@ static void shader_sm1_read_header(void *data, const DWORD **ptr, struct wined3d DWORD version_token; version_token = *(*ptr)++; - TRACE("version: 0x%08x\n", version_token); + TRACE("Version: 0x%08x.\n", version_token); priv->shader_version.major = WINED3D_SM1_VERSION_MAJOR(version_token); priv->shader_version.minor = WINED3D_SM1_VERSION_MINOR(version_token); @@ -651,7 +649,7 @@ static void shader_sm1_read_semantic(const DWORD **ptr, struct wined3d_shader_se static void shader_sm1_read_immconst(const DWORD **ptr, struct wined3d_shader_src_param *src_param, enum wined3d_immconst_type type, enum wined3d_data_type data_type) { - UINT count = type == WINED3D_IMMCONST_VEC4 ? 4 : 1; + unsigned int count = type == WINED3D_IMMCONST_VEC4 ? 4 : 1; src_param->reg.type = WINED3DSPR_IMMCONST; src_param->reg.data_type = data_type; src_param->reg.idx[0].offset = ~0U; @@ -762,15 +760,15 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi shader_sm1_read_dst_param(priv, &p, &priv->dst_param, &priv->dst_rel_addr); shader_sm1_read_immconst(&p, &priv->src_param[0], WINED3D_IMMCONST_VEC4, WINED3D_DATA_FLOAT); } - else if (ins->handler_idx == WINED3DSIH_DEFI) + else if (ins->handler_idx == WINED3DSIH_DEFB) { shader_sm1_read_dst_param(priv, &p, &priv->dst_param, &priv->dst_rel_addr); - shader_sm1_read_immconst(&p, &priv->src_param[0], WINED3D_IMMCONST_VEC4, WINED3D_DATA_INT); + shader_sm1_read_immconst(&p, &priv->src_param[0], WINED3D_IMMCONST_SCALAR, WINED3D_DATA_UINT); } - else if (ins->handler_idx == WINED3DSIH_DEFB) + else if (ins->handler_idx == WINED3DSIH_DEFI) { shader_sm1_read_dst_param(priv, &p, &priv->dst_param, &priv->dst_rel_addr); - shader_sm1_read_immconst(&p, &priv->src_param[0], WINED3D_IMMCONST_SCALAR, WINED3D_DATA_UINT); + shader_sm1_read_immconst(&p, &priv->src_param[0], WINED3D_IMMCONST_VEC4, WINED3D_DATA_INT); } else { @@ -784,9 +782,7 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi /* Other source tokens */ for (i = 0; i < ins->src_count; ++i) - { shader_sm1_read_src_param(priv, &p, &priv->src_param[i], &priv->src_rel_addr[i]); - } } shader_sm1_validate_instruction(ins);

1 0

Andrey Gusev : msxml3/tests: Fix a typo in variable name.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: 73152bd347a4047f02d1bb200ceedd69f99afc13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73152bd347a4047f02d1bb200… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 22 20:18:40 2016 +0300 msxml3/tests: Fix a typo in variable name. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index de28a70..f6e33d3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6704,9 +6704,9 @@ static void test_TransformWithLoadingLocalFile(void) BSTR sPart1 = _bstr_(szBasicTransformSSXMLPart1); BSTR sPart2 = _bstr_(szBasicTransformSSXMLPart2); BSTR sFileName = _bstr_(lpPathBuffer); - int nLegnth = lstrlenW(sPart1) + lstrlenW(sPart2) + lstrlenW(sFileName) + 1; + int nLength = lstrlenW(sPart1) + lstrlenW(sPart2) + lstrlenW(sFileName) + 1; - sXSL = SysAllocStringLen(NULL, nLegnth); + sXSL = SysAllocStringLen(NULL, nLength); lstrcpyW(sXSL, sPart1); lstrcatW(sXSL, sFileName); lstrcatW(sXSL, sPart2);

1 0

Jeremy Newman : update requirements
by Jeremy Newman May 24, 2016

May 24, 2016

Module: website Branch: master Commit: debbdf0dd315f88974e072e3b25b2a90c8c87d5e URL: http://source.winehq.org/git/website.git/?a=commit;h=debbdf0dd315f88974e072… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue May 24 15:01:45 2016 -0500 update requirements --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 6e8761f..bca104c 100644 --- a/README +++ b/README @@ -4,9 +4,9 @@ by Jeremy Newman <jnewman(a)codeweavers.com> ----------------------------------------------------------------------- Installation Requirements: - * Apache 2.0 or higher + * Apache 2.4 or higher * mod_rewrite enabled in Apache config - * PHP 5.4 or higher + * PHP 5.6 or higher Setting Up: -----------------------------------------------------------------------

1 0

Hugh McMaster : reg: Inform users about the 'add/delete/query /?' command.
by Alexandre Julliard May 24, 2016

May 24, 2016

1 0

Fabian Maurer : msacm32: Added converter for ADPCM to PCM 8 bit mono.
by Alexandre Julliard May 24, 2016

May 24, 2016

Module: wine Branch: master Commit: 351bd33f2cd1edd680176ef777d77a3d1256ab6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=351bd33f2cd1edd680176ef77… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon May 23 22:35:30 2016 +0200 msacm32: Added converter for ADPCM to PCM 8 bit mono. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 85 ++++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 30 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index c5c65f6..4684f30 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -179,6 +179,25 @@ static inline void W16(unsigned char* dst, short s) dst[1] = HIBYTE(s); } +/*********************************************************************** + * W8 + * + * Write a 8 bit sample + */ +static inline void W8(unsigned char* dst, short s) +{ + dst[0] = (unsigned char)((s + 32768) >> 8); +} + + +static inline void W8_16(unsigned char* dst, short s, int bytes) +{ + if(bytes == 1) + W8(dst, s); + else + W16(dst, s); +} + /* IMA (or DVI) APDCM codec routines */ static const unsigned IMA_StepTable[89] = @@ -339,43 +358,43 @@ static void cvtSSima16K(PACMDRVSTREAMINSTANCE adsi, } } -static void cvtMMima16K(PACMDRVSTREAMINSTANCE adsi, - const unsigned char* src, LPDWORD nsrc, - unsigned char* dst, LPDWORD ndst) +static void cvtMMimaK(PACMDRVSTREAMINSTANCE adsi, + const unsigned char* src, LPDWORD nsrc, + unsigned char* dst, LPDWORD ndst) { - int sample; - int stepIndex; - int nsamp_blk = ((LPIMAADPCMWAVEFORMAT)adsi->pwfxSrc)->wSamplesPerBlock; - int nsamp; + int sample; + int stepIndex; + int nsamp_blk = ((LPIMAADPCMWAVEFORMAT)adsi->pwfxSrc)->wSamplesPerBlock; + int nsamp; + int bytesPerSample = adsi->pwfxDst->wBitsPerSample / 8; /* compute the number of entire blocks we can decode... * it's the min of the number of entire blocks in source buffer and the number * of entire blocks in destination buffer */ - DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, - *ndst / (nsamp_blk * 2)); + DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, *ndst / (nsamp_blk * bytesPerSample)); *nsrc = nblock * adsi->pwfxSrc->nBlockAlign; - *ndst = nblock * nsamp_blk * 2; + *ndst = nblock * nsamp_blk * bytesPerSample; nsamp_blk--; /* remove the sample in block header */ for (; nblock > 0; nblock--) { - const unsigned char* in_src = src; + const unsigned char* in_src = src; - /* handle header first */ - sample = R16(src); - stepIndex = (unsigned)*(src + 2); + /* handle header first */ + sample = R16(src); + stepIndex = (unsigned)*(src + 2); clamp_step_index(&stepIndex); - src += 4; - W16(dst, sample); dst += 2; + src += 4; + W8_16(dst, sample, bytesPerSample); dst += bytesPerSample; - for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) { process_nibble(*src, &stepIndex, &sample); - W16(dst, sample); dst += 2; + W8_16(dst, sample, bytesPerSample); dst += bytesPerSample; process_nibble(*src++ >> 4, &stepIndex, &sample); - W16(dst, sample); dst += 2; - } + W8_16(dst, sample, bytesPerSample); dst += bytesPerSample; + } /* we have now to realign the source pointer on block */ src = in_src + adsi->pwfxSrc->nBlockAlign; } @@ -733,13 +752,14 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_IMA_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - /* resampling or mono <=> stereo not available + /* resampling or mono <=> stereo not available * ADPCM algo only define 16 bit per sample output + * (The API seems to still allow 8 bit per sample output) */ - if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec || - adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || - adsi->pwfxDst->wBitsPerSample != 16) - goto theEnd; + if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec || + adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || + (adsi->pwfxDst->wBitsPerSample != 16 && adsi->pwfxDst->wBitsPerSample != 8)) + goto theEnd; nspb = ((LPIMAADPCMWAVEFORMAT)adsi->pwfxSrc)->wSamplesPerBlock; TRACE("spb=%u\n", nspb); @@ -752,11 +772,16 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) if ((((nspb - 1) / 2) + 4) * adsi->pwfxSrc->nChannels < adsi->pwfxSrc->nBlockAlign) goto theEnd; - /* adpcm decoding... */ - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) - aad->convert = cvtSSima16K; - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) - aad->convert = cvtMMima16K; + /* adpcm decoding... */ + if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) + aad->convert = cvtSSima16K; + if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) + aad->convert = cvtMMimaK; + if (adsi->pwfxDst->wBitsPerSample == 8 && adsi->pwfxDst->nChannels == 1) + aad->convert = cvtMMimaK; + /* FIXME: Stereo support for 8bit samples*/ + if (adsi->pwfxDst->wBitsPerSample == 8 && adsi->pwfxDst->nChannels == 2) + goto theEnd; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_IMA_ADPCM)

1 0

Alexandre Julliard : secur32/tests: Relax the certificate check a little.
by Alexandre Julliard May 24, 2016

May 24, 2016

Module: wine Branch: master Commit: a0fe286174912551c7d1fc552455abb0577d0a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0fe286174912551c7d1fc552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 23:11:08 2016 +0900 secur32/tests: Relax the certificate check a little. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 51c22d5..f5cfd50 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -640,7 +640,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 2 || cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Hugh McMaster : reg: Update the general usage message.
by Alexandre Julliard May 24, 2016

May 24, 2016

Module: wine Branch: master Commit: 859ff854a1249f3ab671bbdc168261d82f210009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859ff854a1249f3ab671bbdc1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue May 24 12:48:37 2016 +0000 reg: Update the general usage message. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 73 ++++++++++++++++++++++++----------------------- po/bg.po | 69 +++++++++++++++++++++++--------------------- po/ca.po | 73 ++++++++++++++++++++++++----------------------- po/cs.po | 69 +++++++++++++++++++++++--------------------- po/da.po | 73 ++++++++++++++++++++++++----------------------- po/de.po | 73 ++++++++++++++++++++++++----------------------- po/el.po | 69 +++++++++++++++++++++++--------------------- po/en.po | 80 +++++++++++++++++++++++++++++----------------------- po/en_US.po | 80 +++++++++++++++++++++++++++++----------------------- po/eo.po | 69 +++++++++++++++++++++++--------------------- po/es.po | 73 ++++++++++++++++++++++++----------------------- po/fa.po | 69 +++++++++++++++++++++++--------------------- po/fi.po | 73 ++++++++++++++++++++++++----------------------- po/fr.po | 73 ++++++++++++++++++++++++----------------------- po/he.po | 73 ++++++++++++++++++++++++----------------------- po/hi.po | 69 +++++++++++++++++++++++--------------------- po/hr.po | 73 ++++++++++++++++++++++++----------------------- po/hu.po | 73 ++++++++++++++++++++++++----------------------- po/it.po | 73 ++++++++++++++++++++++++----------------------- po/ja.po | 73 ++++++++++++++++++++++++----------------------- po/ko.po | 73 ++++++++++++++++++++++++----------------------- po/lt.po | 73 ++++++++++++++++++++++++----------------------- po/ml.po | 69 +++++++++++++++++++++++--------------------- po/nb_NO.po | 73 ++++++++++++++++++++++++----------------------- po/nl.po | 73 ++++++++++++++++++++++++----------------------- po/or.po | 69 +++++++++++++++++++++++--------------------- po/pa.po | 69 +++++++++++++++++++++++--------------------- po/pl.po | 73 ++++++++++++++++++++++++----------------------- po/pt_BR.po | 73 ++++++++++++++++++++++++----------------------- po/pt_PT.po | 73 ++++++++++++++++++++++++----------------------- po/rm.po | 69 +++++++++++++++++++++++--------------------- po/ro.po | 73 ++++++++++++++++++++++++----------------------- po/ru.po | 73 ++++++++++++++++++++++++----------------------- po/sk.po | 69 +++++++++++++++++++++++--------------------- po/sl.po | 73 ++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 69 +++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 69 +++++++++++++++++++++++--------------------- po/sv.po | 73 ++++++++++++++++++++++++----------------------- po/te.po | 69 +++++++++++++++++++++++--------------------- po/th.po | 69 +++++++++++++++++++++++--------------------- po/tr.po | 73 ++++++++++++++++++++++++----------------------- po/uk.po | 73 ++++++++++++++++++++++++----------------------- po/wa.po | 69 +++++++++++++++++++++++--------------------- po/wine.pot | 69 +++++++++++++++++++++++--------------------- po/zh_CN.po | 73 ++++++++++++++++++++++++----------------------- po/zh_TW.po | 73 ++++++++++++++++++++++++----------------------- programs/reg/reg.rc | 7 ++++- 47 files changed, 1724 insertions(+), 1587 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=859ff854a1249f3ab671b…

1 0

Hugh McMaster : reg: Update general help logic.
by Alexandre Julliard May 24, 2016

May 24, 2016

1 0

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

May 24, 2016

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