April 2012 - Wine-commits - list.winehq.org

Henri Verbeet : d3d8: Get rid of IDirect3DVolumeTexture8Impl.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 98696724b787e55a6ef2bf33bbca9623bfc89be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98696724b787e55a6ef2bf33b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 17 20:49:14 2012 +0200 d3d8: Get rid of IDirect3DVolumeTexture8Impl. --- dlls/d3d8/d3d8_private.h | 18 +---- dlls/d3d8/device.c | 4 +- dlls/d3d8/volumetexture.c | 196 +++++++++++++++++++++----------------------- 3 files changed, 97 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98696724b787e55a6ef2b…

1 0

Henri Verbeet : d3d8: Merge cubetexture.c into texture.c.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: eaaf089213595f7a0d04c6b4d2682d24409ce574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaaf089213595f7a0d04c6b4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 17 20:49:15 2012 +0200 d3d8: Merge cubetexture.c into texture.c. --- dlls/d3d8/Makefile.in | 1 - dlls/d3d8/cubetexture.c | 443 ----------------------------------------------- dlls/d3d8/texture.c | 411 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 409 insertions(+), 446 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaaf089213595f7a0d04c…

1 0

Frédéric Delanoy : vbscript: Fix a typo.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: c5bcfbc5c5c3ba25ba143e3d912ba258e19e8f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bcfbc5c5c3ba25ba143e3d9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Apr 17 22:09:01 2012 +0200 vbscript: Fix a typo. --- dlls/vbscript/vbdisp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 1e9245a..9005aa8 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -543,7 +543,7 @@ HRESULT disp_get_id(IDispatch *disp, BSTR name, vbdisp_invoke_type_t invoke_type hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(FAILED(hres)) { - TRACE("unsing IDispatch\n"); + TRACE("using IDispatch\n"); return IDispatch_GetIDsOfNames(disp, &IID_NULL, &name, 1, 0, id); }

1 0

Frédéric Delanoy : jscript: Assorted spelling fixes.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 69f3d23045eeafa63065bd8cbb394534c1559d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f3d23045eeafa63065bd8cb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Apr 17 22:09:00 2012 +0200 jscript: Assorted spelling fixes. --- dlls/jscript/dispex.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jsutils.c | 2 +- dlls/jscript/lex.c | 2 +- dlls/jscript/regexp.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 8518768..f214ea0 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); /* * This IID is used to get jsdisp_t objecto from interface. - * We might consider using private insteface instead. + * We might consider using private interface instead. */ static const IID IID_IDispatchJS = {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa6}}; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d1854f8..29425e5 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -364,7 +364,7 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, BSTR name, DWORD hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(FAILED(hres)) { - TRACE("unsing IDispatch\n"); + TRACE("using IDispatch\n"); *id = 0; return IDispatch_GetIDsOfNames(disp, &IID_NULL, &name, 1, 0, id); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index d0b7a9b..13b2cc9 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -99,7 +99,7 @@ static inline BOOL is_uri_unescaped(WCHAR c) return c < 128 && uri_char_table[c] == 2; } -/* Check that the character is one of the 69 nonblank characters as defined by ECMA-262 B.2.1 */ +/* Check that the character is one of the 69 non-blank characters as defined by ECMA-262 B.2.1 */ static inline BOOL is_ecma_nonblank(const WCHAR c) { return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 5e5121a..4773fc9 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -135,7 +135,7 @@ void *jsheap_grow(jsheap_t *heap, void *mem, DWORD size, DWORD inc) } ret = jsheap_alloc(heap, size+inc); - if(ret) /* FIXME: avoid coppying for custom blocks */ + if(ret) /* FIXME: avoid copying for custom blocks */ memcpy(ret, mem, size); return ret; } diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 4cf4d41..3bb2814 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -491,7 +491,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) if(!l) { if(*ctx->ptr == 'x' || *ctx->ptr == 'X') { if(++ctx->ptr == ctx->end) { - ERR("unexpexted end of file\n"); + ERR("unexpected end of file\n"); return 0; } diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 8e80f9b..94f3f6b 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3491,7 +3491,7 @@ static HRESULT RegExp_source(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS break; } default: - FIXME("Unimplemnted flags %x\n", flags); + FIXME("Unimplemented flags %x\n", flags); return E_NOTIMPL; }

1 0

André Hentschel : winedbg: Add shift operators to ARM disassembler.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 6235e6fd44ca42f39ca85e80f4c1c886bb5ff7e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6235e6fd44ca42f39ca85e80f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:01:57 2012 +0200 winedbg: Add shift operators to ARM disassembler. --- programs/winedbg/be_arm.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 93f12d6..670fd8a 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -62,6 +62,10 @@ static char const tbl_dataops[][4] = { "mov", "bic", "mvn" }; +static char const tbl_shifts[][4] = { + "lsl", "lsr", "asr", "ror" +}; + static char const tbl_hiops_t[][4] = { "add", "cmp", "mov", "bx" }; @@ -140,8 +144,16 @@ static UINT arm_disasm_dataprocessing(UINT inst) if (immediate) dbg_printf("%s, #%u", tbl_regs[get_nibble(inst, 4)], ROR32(inst & 0xff, 2 * get_nibble(inst, 2))); - else + else if (((inst >> 4) & 0xff) == 0x00) /* no shift */ dbg_printf("%s, %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + else if (((inst >> 4) & 0x09) == 0x01) /* register shift */ + dbg_printf("%s, %s, %s %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], + tbl_shifts[(inst >> 5) & 0x03], tbl_regs[(inst >> 8) & 0x0f]); + else if (((inst >> 4) & 0x01) == 0x00) /* immediate shift */ + dbg_printf("%s, %s, %s #%d", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], + tbl_shifts[(inst >> 5) & 0x03], (inst >> 7) & 0x1f); + else + return inst; } return 0; } @@ -165,15 +177,25 @@ static UINT arm_disasm_singletrans(UINT inst) { if (immediate) dbg_printf("[%s, #%d]", tbl_regs[get_nibble(inst, 4)], offset); - else + else if (((inst >> 4) & 0xff) == 0x00) /* no shift */ dbg_printf("[%s, %s]", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + else if (((inst >> 4) & 0x01) == 0x00) /* immediate shift (there's no register shift) */ + dbg_printf("[%s, %s, %s #%d]", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], + tbl_shifts[(inst >> 5) & 0x03], (inst >> 7) & 0x1f); + else + return inst; } else { if (immediate) dbg_printf("[%s], #%d", tbl_regs[get_nibble(inst, 4)], offset); - else + else if (((inst >> 4) & 0xff) == 0x00) /* no shift */ dbg_printf("[%s], %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + else if (((inst >> 4) & 0x01) == 0x00) /* immediate shift (there's no register shift) */ + dbg_printf("[%s], %s, %s #%d", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], + tbl_shifts[(inst >> 5) & 0x03], (inst >> 7) & 0x1f); + else + return inst; } return 0; }

1 0

Dmitry Timoshkov : include: Define MUTEX_ALL_ACCESS in a PSDK compatible way.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 64cf2db9a69ad08252acdd5896714338e336a79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64cf2db9a69ad08252acdd589… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 18 16:29:16 2012 +0900 include: Define MUTEX_ALL_ACCESS in a PSDK compatible way. --- include/winbase.h | 3 +++ include/winnt.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 492c63b..b87114f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -885,6 +885,9 @@ typedef DWORD (WINAPI *APPLICATION_RECOVERY_CALLBACK)(PVOID); #define FS_VOL_IS_COMPRESSED FILE_VOLUME_IS_COMPRESSED #define FS_FILE_COMPRESSION FILE_FILE_COMPRESSION +#define MUTEX_MODIFY_STATE MUTANT_QUERY_STATE +#define MUTEX_ALL_ACCESS MUTANT_ALL_ACCESS + #define EXCEPTION_ACCESS_VIOLATION STATUS_ACCESS_VIOLATION #define EXCEPTION_DATATYPE_MISALIGNMENT STATUS_DATATYPE_MISALIGNMENT #define EXCEPTION_BREAKPOINT STATUS_BREAKPOINT diff --git a/include/winnt.h b/include/winnt.h index a6b0cf2..ecac448 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4247,8 +4247,8 @@ typedef enum tagSID_NAME_USE { #define SEMAPHORE_MODIFY_STATE 0x0002 #define SEMAPHORE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) -#define MUTEX_MODIFY_STATE 0x0001 -#define MUTEX_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x1) +#define MUTANT_QUERY_STATE 0x0001 +#define MUTANT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|MUTANT_QUERY_STATE) #define JOB_OBJECT_ASSIGN_PROCESS 0x0001 #define JOB_OBJECT_SET_ATTRIBUTES 0x0002

1 0

Dmitry Timoshkov : include: Add some missing FILE_FLAG_xxx definitions.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 492732aa32009c0031851e40d6b07183bdd826a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=492732aa32009c0031851e40d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 18 16:29:35 2012 +0900 include: Add some missing FILE_FLAG_xxx definitions. --- include/winbase.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index b87114f..2cb3d1a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -707,6 +707,9 @@ typedef struct _TIME_ZONE_INFORMATION{ #define FILE_FLAG_BACKUP_SEMANTICS 0x02000000 #define FILE_FLAG_POSIX_SEMANTICS 0x01000000 #define FILE_FLAG_OPEN_REPARSE_POINT 0x00200000 +#define FILE_FLAG_OPEN_NO_RECALL 0x00100000 +#define FILE_FLAG_FIRST_PIPE_INSTANCE 0x00080000 + #define CREATE_NEW 1 #define CREATE_ALWAYS 2 #define OPEN_EXISTING 3

1 0

Jacek Caban : jscript: Pass correct cpbegin to InitMatch.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: e21588aef7a12c04e817735d2f298c9a5a357c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21588aef7a12c04e817735d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 18 13:50:08 2012 +0200 jscript: Pass correct cpbegin to InitMatch. --- dlls/jscript/regexp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 94f3f6b..b54348b 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3322,7 +3322,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D REGlobalData gData; DWORD matchlen; - gData.cpbegin = *cp; + gData.cpbegin = str; gData.cpend = str + len; gData.start = *cp-str; gData.skipped = 0; @@ -3384,7 +3384,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D (*parens)[i].str = NULL; (*parens)[i].len = 0; }else { - (*parens)[i].str = *cp + result->parens[i].index; + (*parens)[i].str = str + result->parens[i].index; (*parens)[i].len = result->parens[i].length; } }

1 0

Jacek Caban : jscript: Correctly handle empty matches in String.replace.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: c1cb8f29b022ca1a1cf9da560f70d4b83337a9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cb8f29b022ca1a1cf9da560… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 18 13:50:19 2012 +0200 jscript: Correctly handle empty matches in String.replace. --- dlls/jscript/string.c | 3 +++ dlls/jscript/tests/regexp.js | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 17f6c2f..e8b279c 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -868,6 +868,9 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI } if(FAILED(hres)) break; + + if(!match.len) + cp++; }else { match.str = strstrW(cp, match_str); if(!match.str) diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index c7f9363..d553bb6 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -583,4 +583,13 @@ ok(i === null, "' undefined '.search() = " + i); tmp = "=)".replace(/=/, "?"); ok(tmp === "?)", "'=)'.replace(/=/, '?') = " + tmp); +tmp = " ".replace(/^\s*|\s*$/g, "y"); +ok(tmp === "yy", '" ".replace(/^\s*|\s*$/g, "y") = ' + tmp); + +tmp = "xxx".replace(/^\s*|\s*$/g, ""); +ok(tmp === "xxx", '"xxx".replace(/^\s*|\s*$/g, "y") = ' + tmp); + +tmp = "xxx".replace(/^\s*|\s*$/g, "y"); +ok(tmp === "yxxxy", '"xxx".replace(/^\s*|\s*$/g, "y") = ' + tmp); + reportSuccess();

1 0

Lucas Fialho Zawacki : Add Portuguese translation for Wine 1.5.2 release
by Jeremy Newman 17 Apr '12

17 Apr '12

Module: website Branch: master Commit: 0916f39fd1b71961e3fc78f3b2eae090b19c8dd0 URL: http://source.winehq.org/git/website.git/?a=commit;h=0916f39fd1b71961e3fc78… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon Apr 16 16:54:40 2012 -0300 Add Portuguese translation for Wine 1.5.2 release --- news/pt/2012041301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pt/2012041301.xml b/news/pt/2012041301.xml new file mode 100644 index 0000000..4d43fc0 --- /dev/null +++ b/news/pt/2012041301.xml @@ -0,0 +1,17 @@ +<news> +<date>13 de Abril de 2012</date> +<title>Wine 1.5.2 Lançado</title> +<body> + A versão de desenvolvimento 1.5.2 já está disponível. + <a href="{$root}/announce/1.5.2">Novidades</a> desta versão: +<ul> + <li>Melhoria no sistema de nomeação de dispositivos de áudio.</li> + <li>Melhor suporte a encontrar fontes de sistema no Mac OS X.</li> + <li>Suporte inicial à codificação JPEG.</li> + <li>Várias correções na impressão.</li> + <li>Melhorias na cache URL.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.2.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0