September 2011 - Wine-commits

Alexandre Julliard : msvcrt: Synchronize the spec files.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: f127a2c0757b7886004d4a215ae8c74ec9df27be URL: http://source.winehq.org/git/wine.git/?a=commit;h=f127a2c0757b7886004d4a215… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 16:27:26 2011 +0200 msvcrt: Synchronize the spec files. --- dlls/crtdll/crtdll.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 16 ++++++++-------- dlls/msvcr70/msvcr70.spec | 12 ++++++------ dlls/msvcr71/msvcr71.spec | 12 ++++++------ dlls/msvcr80/msvcr80.spec | 16 ++++++++-------- dlls/msvcr90/msvcr90.spec | 16 ++++++++-------- dlls/msvcrt20/msvcrt20.spec | 12 ++++++------ dlls/msvcrt40/msvcrt40.spec | 12 ++++++------ dlls/msvcrtd/msvcrtd.spec | 12 ++++++------ 9 files changed, 60 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f127a2c0757b7886004d4…

1 0

Alexandre Julliard : make_specfiles: Support a magic comment to prevent forwarding an entry point.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: c0ac16403ff0b10f68ff34f7e9ffd3b6a38839a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ac16403ff0b10f68ff34f7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 16:29:35 2011 +0200 make_specfiles: Support a magic comment to prevent forwarding an entry point. --- tools/make_specfiles | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index ff21ca8..89af185 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -202,6 +202,7 @@ sub update_spec_file($) my %parent = %{$funcs{$func}}; goto done if $parent{spec} eq $descr{spec}; # the definition is in this spec file + goto done if $descr{comment} && $descr{comment} =~ /don't forward/; if ($descr{callconv} ne "stub" && $descr{target} !~ /\./ && !$commented_out) { printf "%s:%u: note: %s already defined in %s\n", $file, $., $func, $parent{spec} if $show_duplicates;

1 0

Piotr Caban : msvcp60: Remove incorrect forwards from spec file.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 565ece5ecc067d62171a66195ef9321432187d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=565ece5ecc067d62171a66195… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 14 15:57:43 2011 +0200 msvcp60: Remove incorrect forwards from spec file. --- dlls/msvcp60/msvcp60.spec | 916 ++++++++++++++++++++++---------------------- 1 files changed, 458 insertions(+), 458 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=565ece5ecc067d62171a6…

1 0

Maarten Lankhorst : winegstreamer: Use WAVE_FORMAT_PCM when possible for demux.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 6df92c11cabfd7d8c1289afe81442c7cb7669d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df92c11cabfd7d8c1289afe8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 13 15:32:31 2011 +0200 winegstreamer: Use WAVE_FORMAT_PCM when possible for demux. --- dlls/winegstreamer/gstdemux.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6670d6b..655a9f2 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -147,8 +147,13 @@ static int amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) { if (!strcmp(typename, "audio/x-raw-float")) { wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; wfx->wBitsPerSample = wfe->Samples.wValidBitsPerSample = 32; - } else + } else { wfe->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + if (wfx->nChannels <= 2 && bpp <= 16 && depth == bpp) { + wfx->wFormatTag = WAVE_FORMAT_PCM; + wfx->cbSize = 0; + } + } wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample/8; wfx->nAvgBytesPerSec = wfx->nSamplesPerSec * wfx->nBlockAlign; return 1;

1 0

Frédéric Delanoy : cmd: Make some variables static.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 9bf515974dc2f5c0328d2af341639b62b146d99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf515974dc2f5c0328d2af34… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 13 10:33:47 2011 +0200 cmd: Make some variables static. --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 716db4b..1e3defa 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -45,7 +45,7 @@ static void WCMD_part_execute(CMD_LIST **commands, const WCHAR *firstcmd, const WCHAR *variable, const WCHAR *value, BOOL isIF, BOOL conditionTRUE); -struct env_stack *saved_environment; +static struct env_stack *saved_environment; struct env_stack *pushd_directories; extern HINSTANCE hinst; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 840c5da..02260e3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -99,7 +99,7 @@ extern struct env_stack *pushd_directories; static const WCHAR *pagedMessage = NULL; static char *output_bufA = NULL; #define MAX_WRITECONSOLE_SIZE 65535 -BOOL unicodePipes = FALSE; +static BOOL unicodePipes = FALSE; /*******************************************************************

1 0

Frédéric Delanoy : cmd/tests: Add tests for SHIFT builtin.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: ad064b44ed7a773e4fdf6dab9cda240ae6172c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad064b44ed7a773e4fdf6dab9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 13 12:06:45 2011 +0200 cmd/tests: Add tests for SHIFT builtin. --- programs/cmd/tests/test_builtins.cmd | 20 ++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 7 +++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7551e57..cd30e4f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1256,6 +1256,26 @@ echo echo non-builtin dir> dir.cmd call dir /b cd .. & rd /s/q foobar +echo ------------ Testing SHIFT ------------ + +call :shiftFun p1 p2 p3 p4 p5 +goto :endShiftFun + +:shiftFun +echo '%1' '%2' '%3' '%4' '%5' +shift +echo '%1' '%2' '%3' '%4' '%5' +shift(a)tab@ /1 +echo '%1' '%2' '%3' '%4' '%5' +shift /2 +echo '%1' '%2' '%3' '%4' '%5' +shift /-1 +echo '%1' '%2' '%3' '%4' '%5' +shift /0 +echo '%1' '%2' '%3' '%4' '%5' +goto :eof +:endShiftFun + echo ------------ Testing cmd invocation ------------ rem FIXME: only a stub ATM echo ... a batch file can delete itself ... diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 733e1d5..19536fe 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -729,6 +729,13 @@ foo '' @todo_wine(a)1 @todo_wine(a)1 non-builtin dir +------------ Testing SHIFT ------------ +'p1' 'p2' 'p3' 'p4' 'p5' +'p2' 'p3' 'p4' 'p5' '' +'p3' 'p4' 'p5' '' '' +'p3' 'p5' '' '' '' +'p3' 'p5' '' '' '' +'p5' '' '' '' '' ------------ Testing cmd invocation ------------ ... a batch file can delete itself ... file correctly deleted

1 0

Hans Leidekker : msi: Ignore files if their path cannot be resolved in the RemoveFiles action.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: f13cafad4ac92836a7db3283cc2707983dfc0151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13cafad4ac92836a7db3283c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 14 12:04:15 2011 +0200 msi: Ignore files if their path cannot be resolved in the RemoveFiles action. --- dlls/msi/files.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 1f12fe2..9aa2098 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1164,8 +1164,10 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) dir = msi_dup_property(package->db, dirprop); if (!dir) - return ERROR_OUTOFMEMORY; - + { + WARN("directory property has no value\n"); + return ERROR_SUCCESS; + } size = 0; if ((filename = strdupW( MSI_RecordGetString(row, 3) ))) {

1 0

Hans Leidekker : ws2_32: Avoid a crash in WS2_recv_base.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 94f431e3eebe44a88752be72a795baf33e55a213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f431e3eebe44a88752be72a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 14 12:04:39 2011 +0200 ws2_32: Avoid a crash in WS2_recv_base. --- dlls/ws2_32/socket.c | 3 +- dlls/ws2_32/tests/sock.c | 65 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b6d17ff..f0313fc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5720,8 +5720,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, goto error; } } - else - *lpNumberOfBytesRecvd = n; + else if (lpNumberOfBytesRecvd) *lpNumberOfBytesRecvd = n; if ((lpOverlapped || lpCompletionRoutine) && !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 326b77d..b358250 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4031,18 +4031,37 @@ static void test_WSASendTo(void) "a successful call to WSASendTo()\n"); } +static DWORD WINAPI recv_thread(LPVOID arg) +{ + SOCKET sock = *(SOCKET *)arg; + char buffer[32]; + WSABUF wsa; + WSAOVERLAPPED ov; + DWORD flags = 0; + + wsa.buf = buffer; + wsa.len = sizeof(buffer); + ov.hEvent = WSACreateEvent(); + WSARecv(sock, &wsa, 1, NULL, &flags, &ov, NULL); + + WaitForSingleObject(ov.hEvent, 1000); + WSACloseEvent(ov.hEvent); + return 0; +} + static void test_WSARecv(void) { - SOCKET src, dest; + SOCKET src, dest, server = INVALID_SOCKET; char buf[20]; WSABUF bufs; WSAOVERLAPPED ov; - DWORD bytesReturned; - DWORD flags; + DWORD bytesReturned, flags, id; struct linger ling; - int iret; + struct sockaddr_in addr; + int iret, len; DWORD dwret; BOOL bret; + HANDLE thread; memset(&ov, 0, sizeof(ov)); @@ -4067,6 +4086,9 @@ static void test_WSARecv(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); + iret = WSARecv(dest, &bufs, 1, NULL, &flags, &ov, NULL); + ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError()); + iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, &ov, NULL); ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError()); @@ -4081,7 +4103,42 @@ static void test_WSARecv(void) "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned); + src = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0); + ok(src != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError()); + if (src == INVALID_SOCKET) goto end; + + server = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(server != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError()); + if (server == INVALID_SOCKET) goto end; + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(server, (struct sockaddr *)&addr, sizeof(addr)); + if (iret) goto end; + + len = sizeof(addr); + iret = getsockname(server, (struct sockaddr *)&addr, &len); + if (iret) goto end; + + iret = listen(server, 1); + if (iret) goto end; + + iret = connect(src, (struct sockaddr *)&addr, sizeof(addr)); + if (iret) goto end; + + len = sizeof(addr); + dest = accept(server, (struct sockaddr *)&addr, &len); + ok(dest != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError()); + if (dest == INVALID_SOCKET) goto end; + + send(src, "test message", sizeof("test message"), 0); + thread = CreateThread(NULL, 0, recv_thread, &dest, 0, &id); + CloseHandle(thread); + end: + if (server != INVALID_SOCKET) + closesocket(server); if (dest != INVALID_SOCKET) closesocket(dest); if (src != INVALID_SOCKET)

1 0

Jacek Caban : vbscript: Added sub statement parser implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: d220dd291e4488649a05ca25afd8545b5f6b7fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d220dd291e4488649a05ca25a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:54:50 2011 +0200 vbscript: Added sub statement parser implementation. --- dlls/vbscript/parse.h | 24 +++++++++++++- dlls/vbscript/parser.y | 75 ++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.h | 5 +++ 3 files changed, 100 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index cfeb8c0..9b837c2 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -85,8 +85,9 @@ typedef struct { typedef enum { STAT_ASSIGN, STAT_CALL, - STAT_IF, - STAT_DIM + STAT_DIM, + STAT_FUNC, + STAT_IF } statement_type_t; typedef struct _statement_t { @@ -115,6 +116,25 @@ typedef struct _dim_statement_t { dim_decl_t *dim_decls; } dim_statement_t; +typedef struct _arg_decl_t { + const WCHAR *name; + BOOL by_ref; + struct _arg_decl_t *next; +} arg_decl_t; + +typedef struct _function_decl_t { + const WCHAR *name; + function_type_t type; + arg_decl_t *args; + statement_t *body; + struct _function_decl_t *next; +} function_decl_t; + +typedef struct _function_statement_t { + statement_t stat; + function_decl_t *func_decl; +} function_statement_t; + typedef struct _elseif_decl_t { expression_t *expr; statement_t *stat; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index c9f9c76..4964d71 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -48,10 +48,13 @@ static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,co static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); - static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,elseif_decl_t*,statement_t*); +static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,elseif_decl_t*,statement_t*); +static statement_t *new_function_statement(parser_ctx_t*,function_decl_t*); static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); +static function_decl_t *new_function_decl(parser_ctx_t*,const WCHAR*,function_type_t,arg_decl_t*,statement_t*); +static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); #define CHECK_ERROR if(((parser_ctx_t*)ctx)->hres != S_OK) YYABORT @@ -67,6 +70,8 @@ static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); member_expression_t *member; elseif_decl_t *elseif; dim_decl_t *dim_decl; + function_decl_t *func_decl; + arg_decl_t *arg_decl; LONG lng; BOOL bool; double dbl; @@ -89,13 +94,15 @@ static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); %token <lng> tLong tShort %token <dbl> tDouble -%type <statement> Statement StatementNl StatementsNl IfStatement Else_opt +%type <statement> Statement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt +%type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl +%type <func_decl> FunctionDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf %type <dim_decl> DimDeclList @@ -112,6 +119,10 @@ SourceElements : /* empty */ | SourceElements StatementNl { source_add_statement(ctx, $2); } +StatementsNl_opt + : /* empty */ { $$ = NULL; } + | StatementsNl { $$ = $1; } + StatementsNl : StatementNl { $$ = $1; } | StatementNl StatementsNl { $1->next = $2; $$ = $1; } @@ -126,6 +137,7 @@ Statement { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } | IfStatement { $$ = $1; } + | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -236,6 +248,23 @@ LiteralExpression PrimaryExpression : '(' Expression ')' { $$ = $2; } +FunctionDecl + : /* Storage_opt */ tSUB tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB + { $$ = new_function_decl(ctx, $2, FUNC_SUB, $3, $5); CHECK_ERROR; } + +ArgumentsDecl_opt + : EmptyBrackets_opt { $$ = NULL; } + | '(' ArgumentDeclList ')' { $$ = $2; } + +ArgumentDeclList + : ArgumentDecl { $$ = $1; } + | ArgumentDecl ',' ArgumentDeclList { $1->next = $3; $$ = $1; } + +ArgumentDecl + : tIdentifier { $$ = new_argument_decl(ctx, $1, TRUE); } + | tBYREF tIdentifier { $$ = new_argument_decl(ctx, $2, TRUE); } + | tBYVAL tIdentifier { $$ = new_argument_decl(ctx, $2, FALSE); } + %% static int parser_error(const char *str) @@ -452,6 +481,48 @@ static statement_t *new_if_statement(parser_ctx_t *ctx, expression_t *expr, stat return &stat->stat; } +static arg_decl_t *new_argument_decl(parser_ctx_t *ctx, const WCHAR *name, BOOL by_ref) +{ + arg_decl_t *arg_decl; + + arg_decl = parser_alloc(ctx, sizeof(*arg_decl)); + if(!arg_decl) + return NULL; + + arg_decl->name = name; + arg_decl->by_ref = by_ref; + arg_decl->next = NULL; + return arg_decl; +} + +static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, function_type_t type, + arg_decl_t *arg_decl, statement_t *body) +{ + function_decl_t *decl; + + decl = parser_alloc(ctx, sizeof(*decl)); + if(!decl) + return NULL; + + decl->name = name; + decl->type = type; + decl->args = arg_decl; + decl->body = body; + return decl; +} + +static statement_t *new_function_statement(parser_ctx_t *ctx, function_decl_t *decl) +{ + function_statement_t *stat; + + stat = new_statement(ctx, STAT_FUNC, sizeof(*stat)); + if(!stat) + return NULL; + + stat->func_decl = decl; + return &stat->stat; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index afa9d83..b52aa09 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -146,6 +146,11 @@ typedef struct { instr_arg_t arg2; } instr_t; +typedef enum { + FUNC_GLOBAL, + FUNC_SUB +} function_type_t; + struct _function_t { unsigned code_off; vbscode_t *code_ctx;

1 0

Jacek Caban : vbscript: Added function compiler implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 413bc99044e75a9cd9aafcfd14f259627aaca3a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=413bc99044e75a9cd9aafcfd1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:55:07 2011 +0200 vbscript: Added function compiler implementation. --- dlls/vbscript/compile.c | 142 +++++++++++++++++++++++++++++++++++------ dlls/vbscript/tests/lang.vbs | 6 ++ dlls/vbscript/vbscript.h | 3 + 3 files changed, 130 insertions(+), 21 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index d39b94e..4e8cd06 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -40,6 +40,10 @@ typedef struct { dim_decl_t *dim_decls; dynamic_var_t *global_vars; + + function_t *func; + function_t *funcs; + function_decl_t *func_decls; } compile_ctx_t; static HRESULT compile_expression(compile_ctx_t*,expression_t*); @@ -514,6 +518,18 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) return S_OK; } +static HRESULT compile_function_statement(compile_ctx_t *ctx, function_statement_t *stat) +{ + if(ctx->func != &ctx->code->global_code) { + FIXME("Function is not in the global code\n"); + return E_FAIL; + } + + stat->func_decl->next = ctx->func_decls; + ctx->func_decls = stat->func_decl; + return S_OK; +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; @@ -529,6 +545,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_DIM: hres = compile_dim_statement(ctx, (dim_statement_t*)stat); break; + case STAT_FUNC: + hres = compile_function_statement(ctx, (function_statement_t*)stat); + break; case STAT_IF: hres = compile_if_statement(ctx, (if_statement_t*)stat); break; @@ -545,11 +564,11 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) return S_OK; } -static void resolve_labels(compile_ctx_t *ctx) +static void resolve_labels(compile_ctx_t *ctx, unsigned off) { instr_t *instr; - for(instr = ctx->code->instrs; instr < ctx->code->instrs+ctx->instr_cnt; instr++) { + for(instr = ctx->code->instrs+off; instr < ctx->code->instrs+ctx->instr_cnt; instr++) { if(instr_info[instr->op].arg1_type == ARG_ADDR && (instr->arg1.uint & LABEL_FLAG)) { assert((instr->arg1.uint & ~LABEL_FLAG) < ctx->labels_cnt); instr->arg1.uint = ctx->labels[instr->arg1.uint & ~LABEL_FLAG]; @@ -566,38 +585,92 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f func->code_off = ctx->instr_cnt; + ctx->func = func; + ctx->dim_decls = NULL; hres = compile_statement(ctx, stat); + ctx->func = NULL; if(FAILED(hres)) return hres; if(push_instr(ctx, OP_ret) == -1) return E_OUTOFMEMORY; - resolve_labels(ctx); + resolve_labels(ctx, func->code_off); if(ctx->dim_decls) { dim_decl_t *dim_decl; - dynamic_var_t *new_var; - for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { - new_var = compiler_alloc(ctx->code, sizeof(*new_var)); - if(!new_var) - return E_OUTOFMEMORY; + if(func->type == FUNC_GLOBAL) { + dynamic_var_t *new_var; - new_var->name = compiler_alloc_string(ctx->code, dim_decl->name); - if(!new_var->name) - return E_OUTOFMEMORY; + for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { + new_var = compiler_alloc(ctx->code, sizeof(*new_var)); + if(!new_var) + return E_OUTOFMEMORY; - V_VT(&new_var->v) = VT_EMPTY; + new_var->name = compiler_alloc_string(ctx->code, dim_decl->name); + if(!new_var->name) + return E_OUTOFMEMORY; - new_var->next = ctx->global_vars; - ctx->global_vars = new_var; + V_VT(&new_var->v) = VT_EMPTY; + + new_var->next = ctx->global_vars; + ctx->global_vars = new_var; + } + }else { + FIXME("var not implemented for functions\n"); } } return S_OK; } +static BOOL lookup_funcs_name(compile_ctx_t *ctx, const WCHAR *name) +{ + function_t *iter; + + for(iter = ctx->funcs; iter; iter = iter->next) { + if(!strcmpiW(iter->name, name)) + return TRUE; + } + + return FALSE; +} + +static HRESULT create_function(compile_ctx_t *ctx, function_decl_t *decl, function_t **ret) +{ + function_t *func; + HRESULT hres; + + if(lookup_dim_decls(ctx, decl->name) || lookup_funcs_name(ctx, decl->name)) { + FIXME("%s: redefinition\n", debugstr_w(decl->name)); + return E_FAIL; + } + + func = compiler_alloc(ctx->code, sizeof(*func)); + if(!func) + return E_OUTOFMEMORY; + + func->name = compiler_alloc_string(ctx->code, decl->name); + if(!func->name) + return E_OUTOFMEMORY; + + func->code_ctx = ctx->code; + func->type = decl->type; + + if(decl->args) { + FIXME("arguments not implemented\n"); + return E_NOTIMPL; + } + + hres = compile_func(ctx, decl->body, func); + if(FAILED(hres)) + return hres; + + *ret = func; + return S_OK; +} + static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) { dynamic_var_t *var; @@ -671,25 +744,40 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ret->bstr_pool_size = 0; ret->bstr_cnt = 0; + ret->global_code.type = FUNC_GLOBAL; + ret->global_code.name = NULL; ret->global_code.code_ctx = ret; list_init(&ret->entry); return ret; } +static void release_compiler(compile_ctx_t *ctx) +{ + parser_release(&ctx->parser); + heap_free(ctx->labels); + if(ctx->code) + release_vbscode(ctx->code); +} + HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) { + function_t *new_func; + function_decl_t *func_decl; compile_ctx_t ctx; + vbscode_t *code; HRESULT hres; hres = parse_script(&ctx.parser, src); if(FAILED(hres)) return hres; - ctx.code = alloc_vbscode(&ctx, src); + code = ctx.code = alloc_vbscode(&ctx, src); if(!ctx.code) return E_OUTOFMEMORY; + ctx.funcs = NULL; + ctx.func_decls = NULL; ctx.global_vars = NULL; ctx.dim_decls = NULL; ctx.labels = NULL; @@ -697,13 +785,24 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->global_code); if(FAILED(hres)) { - release_vbscode(ctx.code); + release_compiler(&ctx); return hres; } + for(func_decl = ctx.func_decls; func_decl; func_decl = func_decl->next) { + hres = create_function(&ctx, func_decl, &new_func); + if(FAILED(hres)) { + release_compiler(&ctx); + return hres; + } + + new_func->next = ctx.funcs; + ctx.funcs = new_func; + } + hres = check_script_collisions(&ctx, script); if(FAILED(hres)) { - release_vbscode(ctx.code); + release_compiler(&ctx); return hres; } @@ -716,12 +815,13 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) script->global_vars = ctx.global_vars; } - parser_release(&ctx.parser); - if(TRACE_ON(vbscript_disas)) dump_code(&ctx); - list_add_tail(&script->code_list, &ctx.code->entry); - *ret = ctx.code; + ctx.code = NULL; + release_compiler(&ctx); + + list_add_tail(&script->code_list, &code->entry); + *ret = code; return S_OK; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 12bdaf5..60ca988 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -169,4 +169,10 @@ ElseIf not False Then End If Call ok(x, "elseif not called?") +if false then +Sub testsub + x = true +End Sub +end if + reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index b52aa09..41dea38 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -152,8 +152,11 @@ typedef enum { } function_type_t; struct _function_t { + function_type_t type; + const WCHAR *name; unsigned code_off; vbscode_t *code_ctx; + function_t *next; }; struct _vbscode_t {

1 0