September 2011 - Wine-commits

Jacek Caban : vbscript: Added beginning interpreter implementation.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 8906a4aa622ff3de4f6306ce518e10b6f6428b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8906a4aa622ff3de4f6306ce5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 7 14:07:24 2011 +0200 vbscript: Added beginning interpreter implementation. --- dlls/vbscript/Makefile.in | 1 + dlls/vbscript/interp.c | 77 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 34 +++++++++++++++++--- dlls/vbscript/vbscript.h | 1 + 4 files changed, 108 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 977bcde..9e27dd4 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -2,6 +2,7 @@ MODULE = vbscript.dll C_SRCS = \ compile.c \ + interp.c \ lex.c \ vbdisp.c \ vbscript.c \ diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c new file mode 100644 index 0000000..7cee9c7 --- /dev/null +++ b/dlls/vbscript/interp.c @@ -0,0 +1,77 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#include "vbscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + + +typedef struct { + vbscode_t *code; + instr_t *instr; +} exec_ctx_t; + + +typedef HRESULT (*instr_func_t)(exec_ctx_t*); + +static HRESULT interp_ret(exec_ctx_t *ctx) +{ + TRACE("\n"); + + ctx->instr = NULL; + return S_OK; +} + +static const instr_func_t op_funcs[] = { +#define X(x,n) interp_ ## x, +OP_LIST +#undef X +}; + +static const unsigned op_move[] = { +#define X(x,n) n, +OP_LIST +#undef X +}; + +HRESULT exec_script(script_ctx_t *ctx, function_t *func) +{ + exec_ctx_t exec; + vbsop_t op; + HRESULT hres = S_OK; + + exec.code = func->code_ctx; + exec.instr = exec.code->instrs + func->code_off; + + while(exec.instr) { + op = exec.instr->op; + hres = op_funcs[op](&exec); + if(FAILED(hres)) { + FIXME("Failed %08x\n", hres); + break; + } + + exec.instr += op_move[op]; + } + + return hres; +} diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index ff9d2c9..f6891c7 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -63,9 +63,34 @@ static void change_state(VBScript *This, SCRIPTSTATE state) IActiveScriptSite_OnStateChange(This->site, state); } -static void exec_queued_code(VBScript *This) +static inline BOOL is_started(VBScript *This) { - FIXME("\n"); + return This->state == SCRIPTSTATE_STARTED + || This->state == SCRIPTSTATE_CONNECTED + || This->state == SCRIPTSTATE_DISCONNECTED; +} + +static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code) +{ + HRESULT hres; + + code->global_executed = TRUE; + + IActiveScriptSite_OnEnterScript(ctx->site); + hres = exec_script(ctx, &code->global_code); + IActiveScriptSite_OnLeaveScript(ctx->site); + + return hres; +} + +static void exec_queued_code(script_ctx_t *ctx) +{ + vbscode_t *iter; + + LIST_FOR_EACH_ENTRY(iter, &ctx->code_list, vbscode_t, entry) { + if(!iter->global_executed) + exec_global_code(ctx, iter); + } } static HRESULT set_ctx_site(VBScript *This) @@ -264,7 +289,7 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE if(This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - exec_queued_code(This); + exec_queued_code(This->ctx); break; case SCRIPTSTATE_INITIALIZED: FIXME("unimplemented SCRIPTSTATE_INITIALIZED\n"); @@ -530,8 +555,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, if(FAILED(hres)) return hres; - FIXME("executing script not implemented\n"); - return E_NOTIMPL; + return is_started(This) ? exec_global_code(This->ctx, code) : S_OK; } static const IActiveScriptParseVtbl VBScriptParseVtbl = { diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 88f7552..99ed4ba 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -93,6 +93,7 @@ struct _vbscode_t { void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; +HRESULT exec_script(script_ctx_t*,function_t*) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);

1 0

Jacek Caban : vbscript: Added beginning script running tests.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: c03cecab39b1d50b3f6b136c8e5c59dc3fd90918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03cecab39b1d50b3f6b136c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 7 14:07:42 2011 +0200 vbscript: Added beginning script running tests. --- dlls/vbscript/tests/Makefile.in | 3 +- dlls/vbscript/tests/run.c | 498 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 500 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c03cecab39b1d50b3f6b1…

1 0

Jacek Caban : vbscript: Added lexer support for newlines and comments.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 9f8492692c1b241e3b55d6bb0cab8edbdc1b29c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8492692c1b241e3b55d6bb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 7 14:07:54 2011 +0200 vbscript: Added lexer support for newlines and comments. --- dlls/vbscript/lex.c | 19 +++++++++++++++++-- dlls/vbscript/tests/run.c | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 0e7ecce..f3dc8ee 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -36,8 +36,23 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) return ctx->last_token == tNL ? tEOF : tNL; c = *ctx->ptr; - FIXME("Unhandled char %c in %s\n", *ctx->ptr, debugstr_w(ctx->ptr)); - return c; + + switch(c) { + case '\n': + ctx->ptr++; + return tNL; + case '\'': + ctx->ptr = strchrW(ctx->ptr, '\n'); + if(ctx->ptr) + ctx->ptr++; + else + ctx->ptr = ctx->end; + return tNL; + default: + FIXME("Unhandled char %c in %s\n", *ctx->ptr, debugstr_w(ctx->ptr)); + } + + return 0; } int parser_lex(void *lval, parser_ctx_t *ctx) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6ccd466..d61b81f 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -462,6 +462,7 @@ static void run_tests(void) strict_dispid_check = TRUE; parse_script_a(""); + parse_script_a("' empty ;"); } static BOOL check_vbscript(void)

1 0

Jacek Caban : vbscript: Added identifiers support to lexer.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 91cc7bd7197bbe51edb4ee71efde0eb779a473a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91cc7bd7197bbe51edb4ee71e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 7 14:08:07 2011 +0200 vbscript: Added identifiers support to lexer. --- dlls/vbscript/lex.c | 28 ++++++++++++++++++++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 16 +++++++++++++--- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index f3dc8ee..d481e6a 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -26,6 +26,31 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +static inline BOOL is_identifier_char(WCHAR c) +{ + return isalnumW(c) || c == '_'; +} + +static int parse_identifier(parser_ctx_t *ctx, const WCHAR **ret) +{ + const WCHAR *ptr = ctx->ptr++; + WCHAR *str; + int len; + + while(ctx->ptr < ctx->end && is_identifier_char(*ctx->ptr)) + ctx->ptr++; + len = ctx->ptr-ptr; + + str = parser_alloc(ctx, (len+1)*sizeof(WCHAR)); + if(!str) + return 0; + + memcpy(str, ptr, (len+1)*sizeof(WCHAR)); + str[len] = 0; + *ret = str; + return tIdentifier; +} + static int parse_next_token(void *lval, parser_ctx_t *ctx) { WCHAR c; @@ -37,6 +62,9 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) c = *ctx->ptr; + if(isalphaW(c)) + return parse_identifier(ctx, lval); + switch(c) { case '\n': ctx->ptr++; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index d6dfbbc..fa6424f 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -30,3 +30,4 @@ typedef struct { HRESULT parse_script(parser_ctx_t*,const WCHAR*) DECLSPEC_HIDDEN; int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN; +void *parser_alloc(parser_ctx_t*,size_t) DECLSPEC_HIDDEN; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index e895cfd..0ae6008 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -38,13 +38,12 @@ static void parse_complete(parser_ctx_t*); %pure_parser %start Program -%token tEOF - %union { const WCHAR *string; } -%token tNL +%token tEOF tNL +%token <string> tIdentifier %% @@ -62,6 +61,17 @@ static void parse_complete(parser_ctx_t *ctx) ctx->parse_complete = TRUE; } +void *parser_alloc(parser_ctx_t *ctx, size_t size) +{ + void *ret; + + /* FIXME: leaks! */ + ret = heap_alloc(size); + if(!ret) + ctx->hres = E_OUTOFMEMORY; + return ret; +} + HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) { ctx->code = ctx->ptr = code;

1 0

Jacek Caban : vbscript: Added function call statement parsing beginning implementation.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 6c5570297e34fce58be2ebe6236bf793cae4cfcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5570297e34fce58be2ebe62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 7 14:08:21 2011 +0200 vbscript: Added function call statement parsing beginning implementation. --- dlls/vbscript/compile.c | 9 ++++- dlls/vbscript/parse.h | 33 +++++++++++++++++ dlls/vbscript/parser.y | 93 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 131 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c51dd97..4ac760b 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -53,13 +53,18 @@ static unsigned push_instr(compile_ctx_t *ctx, vbsop_t op) return ctx->instr_cnt++; } -static HRESULT compile_func(compile_ctx_t *ctx, function_t *func) +static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *func) { func->code_off = ctx->instr_cnt; if(push_instr(ctx, OP_ret) == -1) return E_OUTOFMEMORY; + if(stat) { + FIXME("statements compilation not implemented\n"); + return E_NOTIMPL; + } + return S_OK; } @@ -113,7 +118,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) if(!ctx.code) return E_OUTOFMEMORY; - hres = compile_func(&ctx, &ctx.code->global_code); + hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->global_code); if(FAILED(hres)) { release_vbscode(ctx.code); return hres; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index fa6424f..7c9ab26 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -16,6 +16,36 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +typedef enum { + EXPR_MEMBER +} expression_type_t; + +typedef struct _expression_t { + expression_type_t type; + struct _expression_t *next; +} expression_t; + +typedef struct { + expression_t expr; + expression_t *obj_expr; + const WCHAR *identifier; + expression_t *args; +} member_expression_t; + +typedef enum { + STAT_CALL +} statement_type_t; + +typedef struct _statement_t { + statement_type_t type; + struct _statement_t *next; +} statement_t; + +typedef struct { + statement_t stat; + member_expression_t *expr; +} call_statement_t; + typedef struct { const WCHAR *code; const WCHAR *ptr; @@ -26,6 +56,9 @@ typedef struct { int last_token; unsigned last_nl; + + statement_t *stats; + statement_t *stats_tail; } parser_ctx_t; HRESULT parse_script(parser_ctx_t*,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 0ae6008..5fb6bd2 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -33,6 +33,12 @@ static int parser_error(const char*); static void parse_complete(parser_ctx_t*); +static void source_add_statement(parser_ctx_t*,statement_t*); + +static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); + +static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); + %} %pure_parser @@ -40,14 +46,34 @@ static void parse_complete(parser_ctx_t*); %union { const WCHAR *string; + statement_t *statement; + member_expression_t *member; } -%token tEOF tNL +%token tEOF tNL blah %token <string> tIdentifier +%type <statement> Statement StatementNl +%type <member> MemberExpression + %% -Program : tEOF { parse_complete(ctx); } +Program + : SourceElements tEOF { parse_complete(ctx); } + +SourceElements + : /* empty */ + | SourceElements StatementNl { source_add_statement(ctx, $2); } + +StatementNl + : Statement tNL { $$ = $1; } + +Statement + : MemberExpression /* FIXME: Arguments_opt */ { $$ = new_call_statement(ctx, $1); } + +MemberExpression + : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); } + /* FIXME: MemberExpressionArgs '.' tIdentifier */ %% @@ -56,11 +82,73 @@ static int parser_error(const char *str) return 0; } +static void source_add_statement(parser_ctx_t *ctx, statement_t *stat) +{ + if(ctx->stats) { + ctx->stats_tail->next = stat; + ctx->stats_tail = stat; + }else { + ctx->stats = ctx->stats_tail = stat; + } +} + static void parse_complete(parser_ctx_t *ctx) { ctx->parse_complete = TRUE; } +static void *new_expression(parser_ctx_t *ctx, expression_type_t type, unsigned size) +{ + expression_t *expr; + + expr = parser_alloc(ctx, size ? size : sizeof(*expr)); + if(expr) { + expr->type = type; + expr->next = NULL; + } + + return expr; +} + +static member_expression_t *new_member_expression(parser_ctx_t *ctx, expression_t *obj_expr, const WCHAR *identifier) +{ + member_expression_t *expr; + + expr = new_expression(ctx, EXPR_MEMBER, sizeof(*expr)); + if(!expr) + return NULL; + + expr->obj_expr = obj_expr; + expr->identifier = identifier; + expr->args = NULL; + return expr; +} + +static void *new_statement(parser_ctx_t *ctx, statement_type_t type, unsigned size) +{ + statement_t *stat; + + stat = parser_alloc(ctx, size); + if(stat) { + stat->type = type; + stat->next = NULL; + } + + return stat; +} + +static statement_t *new_call_statement(parser_ctx_t *ctx, member_expression_t *expr) +{ + call_statement_t *stat; + + stat = new_statement(ctx, STAT_CALL, sizeof(*stat)); + if(!stat) + return NULL; + + stat->expr = expr; + return &stat->stat; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret; @@ -82,6 +170,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) ctx->last_token = tNL; ctx->last_nl = 0; + ctx->stats = ctx->stats_tail = NULL; parser_parse(ctx);

1 0

Jacek Caban : vbscript: Added call statement compilation implementation.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 5ecf4364493623054f9c7ea524e3a36157f17479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ecf4364493623054f9c7ea52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 7 14:08:47 2011 +0200 vbscript: Added call statement compilation implementation. --- dlls/vbscript/compile.c | 70 ++++++++++++++++++++++++++++++++++++++++++--- dlls/vbscript/interp.c | 10 +++++- dlls/vbscript/vbscript.h | 18 ++++++++++-- 3 files changed, 88 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 4ac760b..d57abcf 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -34,6 +34,12 @@ typedef struct { vbscode_t *code; } compile_ctx_t; +static inline instr_t *instr_ptr(compile_ctx_t *ctx, unsigned id) +{ + assert(id < ctx->instr_cnt); + return ctx->code->instrs + id; +} + static unsigned push_instr(compile_ctx_t *ctx, vbsop_t op) { assert(ctx->instr_size && ctx->instr_size >= ctx->instr_cnt); @@ -53,18 +59,72 @@ static unsigned push_instr(compile_ctx_t *ctx, vbsop_t op) return ctx->instr_cnt++; } -static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *func) +static HRESULT push_instr_str(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) { - func->code_off = ctx->instr_cnt; + unsigned instr; - if(push_instr(ctx, OP_ret) == -1) + instr = push_instr(ctx, op); + if(instr == -1) return E_OUTOFMEMORY; - if(stat) { - FIXME("statements compilation not implemented\n"); + instr_ptr(ctx, instr)->arg1.str = arg; + return S_OK; +} + +static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t *expr) +{ + HRESULT hres; + + if(expr->args) { + FIXME("arguments not implemented\n"); return E_NOTIMPL; } + if(expr->obj_expr) { + FIXME("obj_expr not implemented\n"); + hres = E_NOTIMPL; + }else { + hres = push_instr_str(ctx, OP_icallv, expr->identifier); + } + + return hres; +} + +static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) +{ + HRESULT hres; + + while(stat) { + switch(stat->type) { + case STAT_CALL: + hres = compile_member_expression(ctx, ((call_statement_t*)stat)->expr); + break; + default: + FIXME("Unimplemented statement type %d\n", stat->type); + hres = E_NOTIMPL; + } + + if(FAILED(hres)) + return hres; + stat = stat->next; + } + + return S_OK; +} + +static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *func) +{ + HRESULT hres; + + func->code_off = ctx->instr_cnt; + + hres = compile_statement(ctx, stat); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_ret) == -1) + return E_OUTOFMEMORY; + return S_OK; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 7cee9c7..3ff6bbd 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -33,6 +33,12 @@ typedef struct { typedef HRESULT (*instr_func_t)(exec_ctx_t*); +static HRESULT interp_icallv(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); @@ -42,13 +48,13 @@ static HRESULT interp_ret(exec_ctx_t *ctx) } static const instr_func_t op_funcs[] = { -#define X(x,n) interp_ ## x, +#define X(x,n,a,b) interp_ ## x, OP_LIST #undef X }; static const unsigned op_move[] = { -#define X(x,n) n, +#define X(x,n,a,b) n, OP_LIST #undef X }; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 99ed4ba..bca630a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -62,18 +62,30 @@ typedef struct { HRESULT init_global(script_ctx_t*); -#define OP_LIST \ - X(ret, 0) +typedef enum { + ARG_NONE = 0, + ARG_STR +} instr_arg_type_t; + +#define OP_LIST \ + X(icallv, 1, ARG_STR, 0) \ + X(ret, 0, 0, 0) typedef enum { -#define X(x,n) OP_##x, +#define X(x,n,a,b) OP_##x, OP_LIST #undef X OP_LAST } vbsop_t; +typedef union { + const WCHAR *str; +} instr_arg_t; + typedef struct { vbsop_t op; + instr_arg_t arg1; + instr_arg_t arg2; } instr_t; struct _function_t {

1 0

Jörg Höhle : include: Define KSAUDIO_SPEAKER_5|7POINT1_SURROUND.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 4441a7aaff0b8e565eeeac071b4fb80197f77eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4441a7aaff0b8e565eeeac071… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Sep 2 22:22:58 2011 +0200 include: Define KSAUDIO_SPEAKER_5|7POINT1_SURROUND. --- include/ksmedia.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ksmedia.h b/include/ksmedia.h index 4027596..44834bb 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -34,7 +34,9 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0 #define KSAUDIO_SPEAKER_QUAD (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) #define KSAUDIO_SPEAKER_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER) #define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define KSAUDIO_SPEAKER_5POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) #define KSAUDIO_SPEAKER_7POINT1 (KSAUDIO_SPEAKER_5POINT1 | SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER) +#define KSAUDIO_SPEAKER_7POINT1_SURROUND (KSAUDIO_SPEAKER_5POINT1 | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) #ifndef REFERENCE_TIME_DEFINED #define REFERENCE_TIME_DEFINED

1 0

Jörg Höhle : mmdevapi: Accept up to 8 channels.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: df201d3ef3a485ab8899de22f2c5594dfc5057ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=df201d3ef3a485ab8899de22f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Sep 2 22:49:20 2011 +0200 mmdevapi: Accept up to 8 channels. --- dlls/winealsa.drv/mmdevdrv.c | 24 ++++++++++-------------- dlls/winecoreaudio.drv/mmdevdrv.c | 22 +++++++++------------- dlls/wineoss.drv/mmdevdrv.c | 22 +++++++++------------- 3 files changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 180dbc7..e471e2c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1139,25 +1139,21 @@ static DWORD get_channel_mask(unsigned int channels) case 0: return 0; case 1: - return SPEAKER_FRONT_CENTER; + return KSAUDIO_SPEAKER_MONO; case 2: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + return KSAUDIO_SPEAKER_STEREO; case 3: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | - SPEAKER_LOW_FREQUENCY; + return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; case 4: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | - SPEAKER_BACK_RIGHT; + return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ case 5: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | - SPEAKER_BACK_RIGHT | SPEAKER_LOW_FREQUENCY; + return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; case 6: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | - SPEAKER_BACK_RIGHT | SPEAKER_LOW_FREQUENCY | SPEAKER_FRONT_CENTER; + return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ case 7: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | - SPEAKER_BACK_RIGHT | SPEAKER_LOW_FREQUENCY | SPEAKER_FRONT_CENTER | - SPEAKER_BACK_CENTER; + return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; + case 8: + return KSAUDIO_SPEAKER_7POINT1; /* not 7POINT1_SURROUND */ } FIXME("Unknown speaker configuration: %u\n", channels); return 0; @@ -1296,7 +1292,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, WARN("Unable to get max channels: %d (%s)\n", err, snd_strerror(err)); goto exit; } - if(max > 7) + if(max > 8) max = 2; if(fmt->nChannels > max){ hr = S_FALSE; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index a951673..6fd336f 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -568,25 +568,21 @@ static DWORD get_channel_mask(unsigned int channels) case 0: return 0; case 1: - return SPEAKER_FRONT_CENTER; + return KSAUDIO_SPEAKER_MONO; case 2: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + return KSAUDIO_SPEAKER_STEREO; case 3: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | - SPEAKER_LOW_FREQUENCY; + return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; case 4: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | - SPEAKER_BACK_RIGHT; + return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ case 5: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | - SPEAKER_BACK_RIGHT | SPEAKER_LOW_FREQUENCY; + return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; case 6: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | - SPEAKER_BACK_RIGHT | SPEAKER_LOW_FREQUENCY | SPEAKER_FRONT_CENTER; + return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ case 7: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | - SPEAKER_BACK_RIGHT | SPEAKER_LOW_FREQUENCY | SPEAKER_FRONT_CENTER | - SPEAKER_BACK_CENTER; + return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; + case 8: + return KSAUDIO_SPEAKER_7POINT1; /* not 7POINT1_SURROUND */ } FIXME("Unknown speaker configuration: %u\n", channels); return 0; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index fe0c1d8..ed3e2ba 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -592,25 +592,21 @@ static DWORD get_channel_mask(unsigned int channels) case 0: return 0; case 1: - return SPEAKER_FRONT_CENTER; + return KSAUDIO_SPEAKER_MONO; case 2: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + return KSAUDIO_SPEAKER_STEREO; case 3: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | - SPEAKER_LOW_FREQUENCY; + return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; case 4: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | - SPEAKER_BACK_RIGHT; + return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ case 5: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | - SPEAKER_BACK_RIGHT | SPEAKER_LOW_FREQUENCY; + return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; case 6: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | - SPEAKER_BACK_RIGHT | SPEAKER_LOW_FREQUENCY | SPEAKER_FRONT_CENTER; + return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ case 7: - return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | - SPEAKER_BACK_RIGHT | SPEAKER_LOW_FREQUENCY | SPEAKER_FRONT_CENTER | - SPEAKER_BACK_CENTER; + return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; + case 8: + return KSAUDIO_SPEAKER_7POINT1; /* not 7POINT1_SURROUND */ } FIXME("Unknown speaker configuration: %u\n", channels); return 0;

1 0

Jörg Höhle : winecoreaudio: Fix AudioRenderClient Get/ReleaseBuffer protocol.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 57cbb01f0cd63f6864fe98ed06ebef81332ce85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=57cbb01f0cd63f6864fe98ed0… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Aug 7 07:06:48 2011 +0200 winecoreaudio: Fix AudioRenderClient Get/ReleaseBuffer protocol. --- dlls/winecoreaudio.drv/mmdevdrv.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 6fd336f..78daa8c 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -127,7 +127,7 @@ struct ACImpl { UINT32 period_ms, bufsize_frames, inbuf_frames, written_frames; UINT64 last_time; AudioQueueBufferRef public_buffer; - BOOL getbuf_last; + UINT32 getbuf_last; int playing; AudioSession *session; @@ -1602,6 +1602,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, if(!data) return E_POINTER; + *data = NULL; OSSpinLockLock(&This->lock); @@ -1611,7 +1612,6 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, } if(!frames){ - This->getbuf_last = TRUE; OSSpinLockUnlock(&This->lock); return S_OK; } @@ -1656,7 +1656,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, *data = This->public_buffer->mAudioData; - This->getbuf_last = TRUE; + This->getbuf_last = frames; OSSpinLockUnlock(&This->lock); @@ -1673,11 +1673,27 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( OSSpinLockLock(&This->lock); + if(!frames){ + This->getbuf_last = 0; + if(This->public_buffer){ + AQBuffer *buf = This->public_buffer->mUserData; + list_add_tail(&This->avail_buffers, &buf->entry); + This->public_buffer = NULL; + } + OSSpinLockUnlock(&This->lock); + return S_OK; + } + if(!This->getbuf_last){ OSSpinLockUnlock(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } + if(frames > This->getbuf_last){ + OSSpinLockUnlock(&This->lock); + return AUDCLNT_E_INVALID_SIZE; + } + if(flags & AUDCLNT_BUFFERFLAGS_SILENT){ WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || @@ -1704,7 +1720,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( AudioQueuePrime(This->aqueue, 0, NULL); This->public_buffer = NULL; - This->getbuf_last = FALSE; + This->getbuf_last = 0; This->written_frames += frames; This->inbuf_frames += frames; @@ -1795,7 +1811,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, *flags = 0; This->written_frames += *frames; This->inbuf_frames -= *frames; - This->getbuf_last = TRUE; + This->getbuf_last = 1; if(devpos || qpcpos) AudioClock_GetPosition_nolock(This, devpos, qpcpos, FALSE); @@ -1809,8 +1825,7 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( IAudioCaptureClient *iface, UINT32 done) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - UINT32 pbuf_frames = - This->public_buffer->mAudioDataByteSize / This->fmt->nBlockAlign; + UINT32 pbuf_frames; OSStatus sc; TRACE("(%p)->(%u)\n", This, done); @@ -1822,6 +1837,7 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( return AUDCLNT_E_OUT_OF_ORDER; } + pbuf_frames = This->public_buffer->mAudioDataByteSize / This->fmt->nBlockAlign; if(done != 0 && done != pbuf_frames){ OSSpinLockUnlock(&This->lock); return AUDCLNT_E_INVALID_SIZE; @@ -1835,7 +1851,7 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( This->public_buffer = NULL; } - This->getbuf_last = FALSE; + This->getbuf_last = 0; OSSpinLockUnlock(&This->lock);

1 0

Nikolay Sivov : comctl32/monthcal: Make day drawing helpers aware of multiple calendars.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 354d41685f62523e8008d8e38a1f737b6a3d92f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=354d41685f62523e8008d8e38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 4 19:48:28 2011 +0400 comctl32/monthcal: Make day drawing helpers aware of multiple calendars. --- dlls/comctl32/monthcal.c | 163 ++++++++++++++++++++++++++-------------------- 1 files changed, 92 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=354d41685f62523e8008d…

1 0