September 2011 - Wine-Commits

Louis Lenders : wine.inf: Add registry key HKLM, %CurrentVersionNT%, " ProductName".
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: e3edf08e8ca6862868fadc7598f56f51ab462e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3edf08e8ca6862868fadc759… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Aug 15 21:11:36 2011 +0200 wine.inf: Add registry key HKLM,%CurrentVersionNT%,"ProductName". --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 1113400..e317a0d 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3049,6 +3049,7 @@ HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 3" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" +HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x300 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"

1 0

Alexandre Julliard : secur32/tests: Avoid crash on test failure.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 0359f9d430ea95df3f349d2f6be67d59f8cdd1e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0359f9d430ea95df3f349d2f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 15:53:49 2011 +0200 secur32/tests: Avoid crash on test failure. --- dlls/secur32/tests/schannel.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 1b6fdf8..a729394 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -746,12 +746,15 @@ static void test_communication(void) buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY; status = pDecryptMessage(&context, &buffers[0], 0, NULL); ok(status == SEC_E_OK, "DecryptMessage failed: %08x\n", status); - ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n"); - ok(buffers[0].pBuffers[1].BufferType == SECBUFFER_DATA, "Expected second buffer to be SECBUFFER_DATA\n"); - ok(buffers[0].pBuffers[2].BufferType == SECBUFFER_STREAM_TRAILER, "Expected third buffer to be SECBUFFER_STREAM_TRAILER\n"); + if (status == SEC_E_OK) + { + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n"); + ok(buffers[0].pBuffers[1].BufferType == SECBUFFER_DATA, "Expected second buffer to be SECBUFFER_DATA\n"); + ok(buffers[0].pBuffers[2].BufferType == SECBUFFER_STREAM_TRAILER, "Expected third buffer to be SECBUFFER_STREAM_TRAILER\n"); - data = buffers[0].pBuffers[1].pvBuffer; - data[buffers[0].pBuffers[1].cbBuffer] = 0; + data = buffers[0].pBuffers[1].pvBuffer; + data[buffers[0].pBuffers[1].cbBuffer] = 0; + } pDeleteSecurityContext(&context); pFreeCredentialsHandle(&cred_handle);

1 0

Alexandre Julliard : wininet/tests: Avoid crash on test failure.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 905d6844e37de49f0d8547350bfa70a848777318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905d6844e37de49f0d8547350… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 15:57:59 2011 +0200 wininet/tests: Avoid crash on test failure. --- dlls/wininet/tests/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 3e2ed23..ed42395 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -133,7 +133,7 @@ static void test_GetUrlCacheEntryInfoExA(void) ret = GetUrlCacheEntryInfoEx(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, NULL, NULL, NULL, 0); ok(ret, "GetUrlCacheEntryInfoEx failed with error %d\n", GetLastError()); - check_cache_entry_infoA("GetUrlCacheEntryInfoEx", lpCacheEntryInfo); + if (ret) check_cache_entry_infoA("GetUrlCacheEntryInfoEx", lpCacheEntryInfo); cbCacheEntryInfo = 100000; SetLastError(0xdeadbeef); @@ -428,7 +428,7 @@ static void test_urlcacheA(void) ret = RetrieveUrlCacheEntryFile(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, 0); ok(ret, "RetrieveUrlCacheEntryFile failed with error %d\n", GetLastError()); - check_cache_entry_infoA("RetrieveUrlCacheEntryFile", lpCacheEntryInfo); + if (ret) check_cache_entry_infoA("RetrieveUrlCacheEntryFile", lpCacheEntryInfo); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo);

1 0

Louis Lenders : dpnet: Return success in IDirectPlay8PeerImpl_Initialize.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 56212ce215129d466474b503d834edfd41899c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56212ce215129d466474b503d… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 9 09:04:04 2011 +0200 dpnet: Return success in IDirectPlay8PeerImpl_Initialize. --- dlls/dpnet/peer.c | 4 ++-- dlls/dpnet/tests/peer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 751b93b..f4d238a 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -85,9 +85,9 @@ static ULONG WINAPI IDirectPlay8PeerImpl_Release(IDirectPlay8Peer *iface) static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%x): stub\n", iface, pvUserContext, pfn, dwFlags); + TRACE("(%p)->(%p,%p,%x): stub\n", iface, pvUserContext, pfn, dwFlags); - return DPNERR_GENERIC; + return DPN_OK; } static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer *iface, diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index afbea42..1d6dfc9 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -52,7 +52,7 @@ static void test_init_dp(void) ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); hr = IDirectPlay8Peer_Initialize(peer, NULL, DirectPlayMessageHandler, 0); - todo_wine ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); + ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); } static void test_enum_service_providers(void)

1 0

Frédéric Delanoy : cmd: Use correct type instead of void* for prev_context field of BATCH_CONTEXT struct .
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 003e8d2797878cbe3fc4f5945c440b74c63a625f URL: http://source.winehq.org/git/wine.git/?a=commit;h=003e8d2797878cbe3fc4f5945… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 7 11:00:53 2011 +0200 cmd: Use correct type instead of void* for prev_context field of BATCH_CONTEXT struct. --- programs/cmd/wcmd.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 3cf9d4b..c8a7e6d 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -120,12 +120,12 @@ void WCMD_execute (const WCHAR *orig_command, const WCHAR *redirects, /* Data structure to hold context when executing batch files */ -typedef struct { +typedef struct _BATCH_CONTEXT { WCHAR *command; /* The command which invoked the batch file */ HANDLE h; /* Handle to the open batch file */ WCHAR *batchfileW; /* Name of same */ int shift_count[10]; /* Offset in terms of shifts for %0 - %9 */ - void *prev_context; /* Pointer to the previous context block */ + struct _BATCH_CONTEXT *prev_context; /* Pointer to the previous context block */ BOOL skip_rest; /* Skip the rest of the batch program and exit */ CMD_LIST *toExecute; /* Commands left to be executed */ } BATCH_CONTEXT;

1 0

Alistair Leslie-Hughes : include: Add xmlparser interfaces.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: fd1ef626f08c00866d8296c6cfeb8bec6e216058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1ef626f08c00866d8296c6c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 15 15:57:29 2011 +1000 include: Add xmlparser interfaces. --- .gitignore | 1 + include/Makefile.in | 3 +- include/xmlparser.idl | 352 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 355 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd1ef626f08c00866d829…

1 0

Francois Gouget : kernel32: Add parentheses to clarify the precedence between '&' and '||'.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: f8c315e052571a97cef9dfefbe3a997320d67a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c315e052571a97cef9dfefb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 9 01:45:30 2011 +0200 kernel32: Add parentheses to clarify the precedence between '&' and '||'. --- dlls/kernel32/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 4a2a7b5..a937f6b 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -612,7 +612,7 @@ static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, HANDLE ha * Me$$ysoft chose to reverse the serial number in NT4/W2K. * It's true and nobody will ever be able to change it. */ - if (GetVersion() & 0x80000000 || type == FS_UDF) + if ((GetVersion() & 0x80000000) || type == FS_UDF) return (sum[3] << 24) | (sum[2] << 16) | (sum[1] << 8) | sum[0]; else return (sum[0] << 24) | (sum[1] << 16) | (sum[2] << 8) | sum[3];

1 0

Dan Kegel : dinput: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: b7bb3538f9e694f4d7c9cef0a0738d68650b2673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bb3538f9e694f4d7c9cef0a… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Sep 9 07:01:10 2011 -0700 dinput: Fix compilation on systems that don't support nameless unions. --- dlls/dinput/config.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 1c6da6c..9e080f1 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "wine/debug.h" #include "wine/unicode.h" #include "objbase.h" @@ -141,7 +143,7 @@ static void lv_set_action(HWND dialog, int item, int action, LPDIACTIONFORMATW l if (item < 0) return; if (action != -1) - action_text = lpdiaf->rgoAction[action].lptszActionName; + action_text = lpdiaf->rgoAction[action].u.lptszActionName; /* Keep the action and text in the listview item */ lvItem.iItem = item; @@ -282,7 +284,7 @@ static void show_suitable_actions(HWND dialog) /* Add action string and index in the action format to the list entry */ if (DIDFT_GETINSTANCE(lpdiaf->rgoAction[i].dwSemantic) & DIDFT_GETTYPE(device->ddo[obj].dwType)) { - SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_ADDSTRING, 0, (LPARAM)lpdiaf->rgoAction[i].lptszActionName); + SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_ADDSTRING, 0, (LPARAM)lpdiaf->rgoAction[i].u.lptszActionName); SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_SETITEMDATA, added, (LPARAM) i); added++; } @@ -337,7 +339,7 @@ static void copy_actions(LPDIACTIONFORMATW to, LPDIACTIONFORMATW from) to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance; to->rgoAction[i].dwObjID = from->rgoAction[i].dwObjID; to->rgoAction[i].dwHow = from->rgoAction[i].dwHow; - to->rgoAction[i].lptszActionName = from->rgoAction[i].lptszActionName; + to->rgoAction[i].u.lptszActionName = from->rgoAction[i].u.lptszActionName; } }

1 0

Jacek Caban : vbscript: Added null literal support.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 4520815c0229733eb578bdd048ff698a0e393687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4520815c0229733eb578bdd04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:49:36 2011 +0200 vbscript: Added null literal support. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 20 ++++++++++++++++++-- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 1 + dlls/vbscript/vbscript.h | 1 + 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index aa9881c..181f6c1 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -204,6 +204,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); + case EXPR_NULL: + return push_instr(ctx, OP_null) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_STRING: return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); default: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4e16d74..d02516e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -261,6 +261,16 @@ static HRESULT interp_empty(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_null(exec_ctx_t *ctx) +{ + VARIANT v; + + TRACE("\n"); + + V_VT(&v) = VT_NULL; + return stack_push(ctx, &v); +} + static HRESULT interp_not(exec_ctx_t *ctx) { variant_val_t val; @@ -291,8 +301,14 @@ static HRESULT cmp_oper(exec_ctx_t *ctx) return hres; hres = stack_pop_val(ctx, &l); - if(SUCCEEDED(hres)) - hres = VarCmp(l.v, r.v, ctx->script->lcid, 0); + if(SUCCEEDED(hres)) { + if(V_VT(l.v) == VT_NULL || V_VT(r.v) == VT_NULL) { + FIXME("comparing nulls is not implemented\n"); + hres = E_NOTIMPL; + }else { + hres = VarCmp(l.v, r.v, ctx->script->lcid, 0); + } + } release_val(&r); release_val(&l); diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 409e737..56b3e1b 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -22,6 +22,7 @@ typedef enum { EXPR_EQUAL, EXPR_MEMBER, EXPR_NOT, + EXPR_NULL, EXPR_STRING } expression_type_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 36ebf17..c1c7e61 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -147,6 +147,7 @@ LiteralExpression | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } | tEMPTY { $$ = new_expression(ctx, EXPR_EMPTY, 0); CHECK_ERROR; } + | tNULL { $$ = new_expression(ctx, EXPR_NULL, 0); CHECK_ERROR; } PrimaryExpression : '(' Expression ')' { $$ = $2; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3614f96..8a5a9c5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -37,5 +37,6 @@ Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") Call ok(getVT("") = "VT_BSTR", "getVT("""") is not VT_BSTR") Call ok(getVT("test") = "VT_BSTR", "getVT(""test"") is not VT_BSTR") Call ok(getVT(Empty) = "VT_EMPTY", "getVT(Empty) is not VT_EMPTY") +Call ok(getVT(null) = "VT_NULL", "getVT(null) is not VT_NULL") reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index aa90f4c..199ca70 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -81,6 +81,7 @@ typedef enum { X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(not, 1, 0, 0) \ + X(null, 1, 0, 0) \ X(ret, 0, 0, 0) \ X(string, 1, ARG_STR, 0)

1 0

Jacek Caban : vbscript: Added empty literal support.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 6d8f84e5333bbb822127e636e1b4554f88629679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8f84e5333bbb822127e636e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:49:26 2011 +0200 vbscript: Added empty literal support. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 10 ++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 4 +++- dlls/vbscript/tests/lang.vbs | 3 +++ dlls/vbscript/vbscript.h | 1 + 6 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e9b651d..aa9881c 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -196,6 +196,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) switch(expr->type) { case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); + case EXPR_EMPTY: + return push_instr(ctx, OP_empty) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_EQUAL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); case EXPR_MEMBER: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index ec56fa9..4e16d74 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -251,6 +251,16 @@ static HRESULT interp_string(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_empty(exec_ctx_t *ctx) +{ + VARIANT v; + + TRACE("\n"); + + V_VT(&v) = VT_EMPTY; + return stack_push(ctx, &v); +} + static HRESULT interp_not(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 607bdec..409e737 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -18,6 +18,7 @@ typedef enum { EXPR_BOOL, + EXPR_EMPTY, EXPR_EQUAL, EXPR_MEMBER, EXPR_NOT, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7bfdae9..36ebf17 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -35,6 +35,7 @@ static int parser_error(const char*); static void source_add_statement(parser_ctx_t*,statement_t*); +static void *new_expression(parser_ctx_t*,expression_type_t,size_t); static expression_t *new_bool_expression(parser_ctx_t*,VARIANT_BOOL); static expression_t *new_string_expression(parser_ctx_t*,const WCHAR*); static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*); @@ -145,6 +146,7 @@ LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } + | tEMPTY { $$ = new_expression(ctx, EXPR_EMPTY, 0); CHECK_ERROR; } PrimaryExpression : '(' Expression ')' { $$ = $2; } @@ -172,7 +174,7 @@ static void parse_complete(parser_ctx_t *ctx, BOOL option_explicit) ctx->option_explicit = option_explicit; } -static void *new_expression(parser_ctx_t *ctx, expression_type_t type, unsigned size) +static void *new_expression(parser_ctx_t *ctx, expression_type_t type, size_t size) { expression_t *expr; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 1c9512a..3614f96 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -29,10 +29,13 @@ Call ok(true = true, "true = true is false") Call ok(false = false, "false = false is false") Call ok(not (true = false), "true = false is true") Call ok("x" = "x", """x"" = ""x"" is false") +Call ok(empty = empty, "empty = empty is false") +Call ok(empty = "", "empty = """" is false") Call ok(getVT(false) = "VT_BOOL", "getVT(false) is not VT_BOOL") Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") Call ok(getVT("") = "VT_BSTR", "getVT("""") is not VT_BSTR") Call ok(getVT("test") = "VT_BSTR", "getVT(""test"") is not VT_BSTR") +Call ok(getVT(Empty) = "VT_EMPTY", "getVT(Empty) is not VT_EMPTY") reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 0219334..aa90f4c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -76,6 +76,7 @@ typedef enum { #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ + X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \

1 0