wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Piotr Caban : urlmon/tests: Added Uri IMarshal_UnmarshalInterface tests.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: c1fb15d1f8dab0d9ec2233ab8683c71ef4a96ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fb15d1f8dab0d9ec2233ab8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 16 15:13:32 2012 +0100 urlmon/tests: Added Uri IMarshal_UnmarshalInterface tests. --- dlls/urlmon/tests/uri.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 4f1db15..9a27e59 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10871,6 +10871,26 @@ static void test_IPersistStream(void) U(max_size).LowPart += 3*sizeof(DWORD); ok(dw_data[2] == U(max_size).LowPart, "%d) Incorrect value %d, expected %d (PersistStream size).\n", i, dw_data[2], U(max_size).LowPart); + IMarshal_Release(marshal); + IUri_Release(uri); + + hr = IStream_Seek(stream, no_off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = CoCreateInstance(&curi, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUri, (void**)&uri); + ok(hr == S_OK, "%d) Error creating uninitialized Uri: 0x%08x.\n", i, hr); + hr = IUri_QueryInterface(uri, &IID_IMarshal, (void**)&marshal); + ok(hr == S_OK, "%d) QueryInterface failed 0x%08x, expected S_OK.\n", i, hr); + hr = IMarshal_UnmarshalInterface(marshal, stream, &IID_IUri, (void**)&uri); + ok(hr == S_OK, "%d) UnmarshalInterface failed 0x%08x, expected S_OK.\n", i, hr); + hr = IUri_GetRawUri(uri, &raw_uri); + ok(hr == S_OK, "%d) GetRawUri failed 0x%08x, expected S_OK.\n", i, hr); + ok(!strcmp_aw(test->str_props[Uri_PROPERTY_RAW_URI].value, raw_uri) + || broken(test->str_props[Uri_PROPERTY_RAW_URI].broken_value + && !strcmp_aw(test->str_props[Uri_PROPERTY_RAW_URI].broken_value, raw_uri)), + "%d) Expected %s but got %s.\n", i, test->str_props[Uri_PROPERTY_RAW_URI].value, + wine_dbgstr_w(raw_uri)); + SysFreeString(raw_uri); IMarshal_Release(marshal); IStream_Release(stream);

1 0

Piotr Caban : urlmon/tests: Added Uri IMarshal_MarshalInterface tests.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: c6a72ce150519b9e1faadc41e53d8dc4f3111334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a72ce150519b9e1faadc41e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 16 15:13:18 2012 +0100 urlmon/tests: Added Uri IMarshal_MarshalInterface tests. --- dlls/urlmon/tests/uri.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index e570965..4f1db15 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10691,6 +10691,7 @@ static void test_IPersistStream(void) IUri *uri; IPersistStream *persist_stream; IStream *stream; + IMarshal *marshal; DWORD props, props_no, dw_data[6]; WCHAR str_data[1024]; ULARGE_INTEGER size, max_size; @@ -10821,6 +10822,57 @@ static void test_IPersistStream(void) wine_dbgstr_w(raw_uri)); SysFreeString(raw_uri); + hr = IUri_QueryInterface(uri, &IID_IMarshal, (void**)&marshal); + ok(hr == S_OK, "%d) QueryInterface(IID_IMarshal) failed 0x%08x, expected S_OK.\n", i, hr); + hr = IStream_Seek(stream, no_off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_DIFFERENTMACHINE, NULL, MSHLFLAGS_NORMAL); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_CROSSCTX, NULL, MSHLFLAGS_NORMAL); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLEWEAK); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_LOCAL, NULL, MSHLFLAGS_NOPING); + ok(hr == E_INVALIDARG, "%d) MarshalInterface returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_MarshalInterface(marshal, stream, &IID_IUri, (void*)uri, + MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "%d) MarshalInterface failed 0x%08x, expected S_OK.\n", i, hr); + hr = IMarshal_GetUnmarshalClass(marshal, &IID_IUri, (void*)uri, + MSHCTX_CROSSCTX, NULL, MSHLFLAGS_NORMAL, &curi); + ok(hr == E_INVALIDARG, "%d) GetUnmarshalClass returned 0x%08x, expected E_INVALIDARG.\n", i, hr); + hr = IMarshal_GetUnmarshalClass(marshal, &IID_IUri, (void*)uri, + MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL, &curi); + ok(hr == S_OK, "%d) GetUnmarshalClass failed 0x%08x, expected S_OK.\n", i, hr); + ok(IsEqualCLSID(&curi, &CLSID_CUri), "%d) GetUnmarshalClass returned incorrect CLSID.\n", i); + + hr = IStream_Seek(stream, no_off, STREAM_SEEK_CUR, &size); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = IStream_Seek(stream, no_off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = IStream_Read(stream, (void*)dw_data, 3*sizeof(DWORD), NULL); + ok(hr == S_OK, "%d) Read failed 0x%08x, expected S_OK.\n", i, hr); + ok(dw_data[0]-2 == U(size).LowPart, "%d) Structure size is %d, expected %d\n", + i, dw_data[0]-2, U(size).LowPart); + ok(dw_data[1] == MSHCTX_LOCAL, "%d) Incorrect value %d, expected MSHCTX_LOCAL.\n", + i, dw_data[1]); + ok(dw_data[2] == dw_data[0]-8, "%d) Incorrect value %d, expected %d (PersistStream size).\n", + i, dw_data[2], dw_data[0]-8); + if(!test->str_props[Uri_PROPERTY_PATH].value[0] && + (test->dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START].value == URL_SCHEME_HTTP + || test->dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START].value == URL_SCHEME_FTP + || test->dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START].value == URL_SCHEME_HTTPS)) + U(max_size).LowPart += 3*sizeof(DWORD); + ok(dw_data[2] == U(max_size).LowPart, "%d) Incorrect value %d, expected %d (PersistStream size).\n", + i, dw_data[2], U(max_size).LowPart); + + IMarshal_Release(marshal); IStream_Release(stream); IPersistStream_Release(persist_stream); IUri_Release(uri);

1 0

Piotr Caban : urlmon: Added Uri IMarshal implementation.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 991061e4619daff0e97253ffa9527339506580f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991061e4619daff0e97253ffa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 16 15:13:03 2012 +0100 urlmon: Added Uri IMarshal implementation. --- dlls/urlmon/uri.c | 295 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 271 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=991061e4619daff0e9725…

1 0

Alexandre Julliard : user32: Fix a pointer cast warning.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 50480c72f32d5c5913ddfb1de1f76f5d23f33398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50480c72f32d5c5913ddfb1de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 18:07:09 2012 +0100 user32: Fix a pointer cast warning. --- dlls/user32/input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 905bda1..6a76cb8 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -943,7 +943,7 @@ UINT WINAPI GetKeyboardLayoutList(INT nBuff, HKL *layouts) rc = RegEnumKeyW(hKeyKeyboard, count, szKeyName, 9); if (rc == ERROR_SUCCESS) { - layout = (HKL)strtoulW(szKeyName,NULL,16); + layout = (HKL)(ULONG_PTR)strtoulW(szKeyName,NULL,16); if (baselayout != 0 && layout == (HKL)baselayout) baselayout = 0; /* found in the registry do not add again */ if (nBuff && layouts)

1 0

Alexandre Julliard : dbghelp: Fix a couple of pointer cast warnings.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 55107912f0188fc100e0bbc76b840beca9f3c6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55107912f0188fc100e0bbc76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 17:51:45 2012 +0100 dbghelp: Fix a couple of pointer cast warnings. --- dlls/dbghelp/cpu_i386.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 70ee9e6..e604e10 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -219,7 +219,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO if (NtQueryInformationThread(csw->hThread, ThreadBasicInformation, &info, sizeof(info), NULL) == STATUS_SUCCESS) { - curr_switch = (unsigned long)info.TebBaseAddress + FIELD_OFFSET(TEB, WOW32Reserved); + curr_switch = (DWORD_PTR)info.TebBaseAddress + FIELD_OFFSET(TEB, WOW32Reserved); if (!sw_read_mem(csw, curr_switch, &p, sizeof(p))) { WARN("Can't read TEB:WOW32Reserved\n"); @@ -339,13 +339,13 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO } TRACE("Got a 16 bit stack switch:" - "\n\tframe32: %08lx" + "\n\tframe32: %p" "\n\tedx:%08x ecx:%08x ebp:%08x" "\n\tds:%04x es:%04x fs:%04x gs:%04x" "\n\tcall_from_ip:%08x module_cs:%04x relay=%08x" "\n\tentry_ip:%04x entry_point:%08x" "\n\tbp:%04x ip:%04x cs:%04x\n", - (unsigned long)frame16.frame32, + frame16.frame32, frame16.edx, frame16.ecx, frame16.ebp, frame16.ds, frame16.es, frame16.fs, frame16.gs, frame16.callfrom_ip, frame16.module_cs, frame16.relay,

1 0

Alexandre Julliard : qedit: Avoid releasing an uninitialized object.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: dc880388e13b60f59c3b7ecfa4e3689b80eb0342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc880388e13b60f59c3b7ecfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 17:41:56 2012 +0100 qedit: Avoid releasing an uninitialized object. --- dlls/qedit/mediadet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 38a54ce..edb7be5 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -396,7 +396,7 @@ static HRESULT GetSplitter(MediaDetImpl *This) if (FAILED(hr)) { VariantClear(&var); - goto retry; + continue; } hr = IGraphBuilder_AddFilter(This->graph, splitter,

1 0

Jacek Caban : vbscript: Fixed stack reallocation.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 1791cdaea843dc5731850f323a854842e53d5088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1791cdaea843dc5731850f323… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 16 12:41:00 2012 +0100 vbscript: Fixed stack reallocation. --- dlls/vbscript/interp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index cca5eb9..4be1d43 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -260,7 +260,7 @@ static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) if(ctx->stack_size == ctx->top) { VARIANT *new_stack; - new_stack = heap_realloc(ctx->stack, ctx->stack_size*2); + new_stack = heap_realloc(ctx->stack, ctx->stack_size*2*sizeof(*ctx->stack)); if(!new_stack) { VariantClear(v); return E_OUTOFMEMORY;

1 0

Jacek Caban : vbscript: Use 0 as an invalid label value.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: c53529b48db313c47e559e035799084503da9fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c53529b48db313c47e559e035… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 16 12:40:50 2012 +0100 vbscript: Use 0 as an invalid label value. --- dlls/vbscript/compile.c | 54 +++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index df6dd2f..846a55d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -296,14 +296,14 @@ static unsigned alloc_label(compile_ctx_t *ctx) if(!ctx->labels_size) { ctx->labels = heap_alloc(8 * sizeof(*ctx->labels)); if(!ctx->labels) - return -1; + return 0; ctx->labels_size = 8; }else if(ctx->labels_size == ctx->labels_cnt) { unsigned *new_labels; new_labels = heap_realloc(ctx->labels, 2*ctx->labels_size*sizeof(*ctx->labels)); if(!new_labels) - return -1; + return 0; ctx->labels = new_labels; ctx->labels_size *= 2; @@ -491,7 +491,7 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) { - unsigned cnd_jmp, endif_label = -1; + unsigned cnd_jmp, endif_label = 0; elseif_decl_t *elseif_decl; HRESULT hres; @@ -509,7 +509,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) if(stat->else_stat || stat->elseifs) { endif_label = alloc_label(ctx); - if(endif_label == -1) + if(!endif_label) return E_OUTOFMEMORY; hres = push_instr_addr(ctx, OP_jmp, endif_label); @@ -545,7 +545,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) return hres; } - if(endif_label != -1) + if(endif_label) label_set_addr(ctx, endif_label); return S_OK; } @@ -567,7 +567,7 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st return E_OUTOFMEMORY; prev_label = ctx->while_end_label; - if(stat->stat.type != STAT_WHILE && (ctx->while_end_label = alloc_label(ctx)) == -1) + if(stat->stat.type != STAT_WHILE && !(ctx->while_end_label = alloc_label(ctx))) return E_OUTOFMEMORY; hres = compile_statement(ctx, stat->body); @@ -596,7 +596,7 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * start_addr = ctx->instr_cnt; prev_label = ctx->while_end_label; - if((ctx->while_end_label = alloc_label(ctx)) == -1) + if(!(ctx->while_end_label = alloc_label(ctx))) return E_OUTOFMEMORY; hres = compile_statement(ctx, stat->body); @@ -663,7 +663,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st prev_label = ctx->for_end_label; ctx->for_end_label = alloc_label(ctx); - if(ctx->for_end_label == -1) + if(!ctx->for_end_label) return E_OUTOFMEMORY; step_instr = push_instr(ctx, OP_step); @@ -811,7 +811,7 @@ static HRESULT compile_function_statement(compile_ctx_t *ctx, function_statement static HRESULT compile_exitdo_statement(compile_ctx_t *ctx) { - if(ctx->while_end_label == -1) { + if(!ctx->while_end_label) { FIXME("Exit Do outside Do Loop\n"); return E_FAIL; } @@ -821,7 +821,7 @@ static HRESULT compile_exitdo_statement(compile_ctx_t *ctx) static HRESULT compile_exitfor_statement(compile_ctx_t *ctx) { - if(ctx->for_end_label == -1) { + if(!ctx->for_end_label) { FIXME("Exit For outside For Loop\n"); return E_FAIL; } @@ -831,7 +831,7 @@ static HRESULT compile_exitfor_statement(compile_ctx_t *ctx) static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) { - if(ctx->sub_end_label == -1) { + if(!ctx->sub_end_label) { FIXME("Exit Sub outside Sub?\n"); return E_FAIL; } @@ -841,7 +841,7 @@ static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) static HRESULT compile_exitfunc_statement(compile_ctx_t *ctx) { - if(ctx->func_end_label == -1) { + if(!ctx->func_end_label) { FIXME("Exit Function outside Function?\n"); return E_FAIL; } @@ -851,7 +851,7 @@ static HRESULT compile_exitfunc_statement(compile_ctx_t *ctx) static HRESULT compile_exitprop_statement(compile_ctx_t *ctx) { - if(ctx->prop_end_label == -1) { + if(!ctx->prop_end_label) { FIXME("Exit Property outside Property?\n"); return E_FAIL; } @@ -961,21 +961,21 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f func->code_off = ctx->instr_cnt; - ctx->while_end_label = -1; - ctx->for_end_label = -1; - ctx->sub_end_label = -1; - ctx->func_end_label = -1; - ctx->prop_end_label = -1; + ctx->while_end_label = 0; + ctx->for_end_label = 0; + ctx->sub_end_label = 0; + ctx->func_end_label = 0; + ctx->prop_end_label = 0; switch(func->type) { case FUNC_FUNCTION: ctx->func_end_label = alloc_label(ctx); - if(ctx->func_end_label == -1) - return E_OUTOFMEMORY; /* FIXME ! */ + if(!ctx->func_end_label) + return E_OUTOFMEMORY; break; case FUNC_SUB: ctx->sub_end_label = alloc_label(ctx); - if(ctx->sub_end_label == -1) + if(!ctx->sub_end_label) return E_OUTOFMEMORY; break; case FUNC_PROPGET: @@ -983,7 +983,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f case FUNC_PROPSET: case FUNC_DEFGET: ctx->prop_end_label = alloc_label(ctx); - if(ctx->prop_end_label == -1) + if(!ctx->prop_end_label) return E_OUTOFMEMORY; break; case FUNC_GLOBAL: @@ -998,14 +998,14 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(FAILED(hres)) return hres; - assert(ctx->while_end_label == -1); - assert(ctx->for_end_label == -1); + assert(!ctx->while_end_label); + assert(!ctx->for_end_label); - if(ctx->sub_end_label != -1) + if(ctx->sub_end_label) label_set_addr(ctx, ctx->sub_end_label); - if(ctx->func_end_label != -1) + if(ctx->func_end_label) label_set_addr(ctx, ctx->func_end_label); - if(ctx->prop_end_label != -1) + if(ctx->prop_end_label) label_set_addr(ctx, ctx->prop_end_label); if(!push_instr(ctx, OP_ret))

1 0

Jacek Caban : vbscript: Use 0 as invalid instruction offset.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: ff96e75996b298c3e91f4ade9f4bd8c735c550ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff96e75996b298c3e91f4ade9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 16 12:40:26 2012 +0100 vbscript: Use 0 as invalid instruction offset. --- dlls/vbscript/compile.c | 50 +++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9f62a23..df6dd2f 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -148,7 +148,7 @@ static unsigned push_instr(compile_ctx_t *ctx, vbsop_t op) new_instr = heap_realloc(ctx->code->instrs, ctx->instr_size*2*sizeof(instr_t)); if(!new_instr) - return -1; + return 0; ctx->code->instrs = new_instr; ctx->instr_size *= 2; @@ -163,7 +163,7 @@ static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg) unsigned ret; ret = push_instr(ctx, op); - if(ret == -1) + if(!ret) return E_OUTOFMEMORY; instr_ptr(ctx, ret)->arg1.lng = arg; @@ -175,7 +175,7 @@ static HRESULT push_instr_uint(compile_ctx_t *ctx, vbsop_t op, unsigned arg) unsigned ret; ret = push_instr(ctx, op); - if(ret == -1) + if(!ret) return E_OUTOFMEMORY; instr_ptr(ctx, ret)->arg1.uint = arg; @@ -187,7 +187,7 @@ static HRESULT push_instr_addr(compile_ctx_t *ctx, vbsop_t op, unsigned arg) unsigned ret; ret = push_instr(ctx, op); - if(ret == -1) + if(!ret) return E_OUTOFMEMORY; instr_ptr(ctx, ret)->arg1.uint = arg; @@ -204,7 +204,7 @@ static HRESULT push_instr_str(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) return E_OUTOFMEMORY; instr = push_instr(ctx, op); - if(instr == -1) + if(!instr) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.str = str; @@ -221,7 +221,7 @@ static HRESULT push_instr_double(compile_ctx_t *ctx, vbsop_t op, double arg) return E_OUTOFMEMORY; instr = push_instr(ctx, op); - if(instr == -1) + if(!instr) return E_OUTOFMEMORY; *d = arg; @@ -264,7 +264,7 @@ static HRESULT push_instr_bstr(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) return E_OUTOFMEMORY; instr = push_instr(ctx, op); - if(instr == -1) + if(!instr) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.bstr = bstr; @@ -281,7 +281,7 @@ static HRESULT push_instr_bstr_uint(compile_ctx_t *ctx, vbsop_t op, const WCHAR return E_OUTOFMEMORY; instr = push_instr(ctx, op); - if(instr == -1) + if(!instr) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.bstr = bstr; @@ -394,7 +394,7 @@ static HRESULT compile_unary_expression(compile_ctx_t *ctx, unary_expression_t * if(FAILED(hres)) return hres; - return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; + return push_instr(ctx, op) ? S_OK : E_OUTOFMEMORY; } static HRESULT compile_binary_expression(compile_ctx_t *ctx, binary_expression_t *expr, vbsop_t op) @@ -409,7 +409,7 @@ static HRESULT compile_binary_expression(compile_ctx_t *ctx, binary_expression_t if(FAILED(hres)) return hres; - return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; + return push_instr(ctx, op) ? S_OK : E_OUTOFMEMORY; } static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) @@ -428,7 +428,7 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) case EXPR_DOUBLE: return push_instr_double(ctx, OP_double, ((double_expression_t*)expr)->value); case EXPR_EMPTY: - return push_instr(ctx, OP_empty) != -1 ? S_OK : E_OUTOFMEMORY; + return push_instr(ctx, OP_empty) ? S_OK : E_OUTOFMEMORY; case EXPR_EQUAL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); case EXPR_EQV: @@ -450,7 +450,7 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) case EXPR_LTEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lteq); case EXPR_ME: - return push_instr(ctx, OP_me) != -1 ? S_OK : E_OUTOFMEMORY; + return push_instr(ctx, OP_me) ? S_OK : E_OUTOFMEMORY; case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_MOD: @@ -466,9 +466,9 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_NOTHING: - return push_instr(ctx, OP_nothing) != -1 ? S_OK : E_OUTOFMEMORY; + return push_instr(ctx, OP_nothing) ? S_OK : E_OUTOFMEMORY; case EXPR_NULL: - return push_instr(ctx, OP_null) != -1 ? S_OK : E_OUTOFMEMORY; + return push_instr(ctx, OP_null) ? S_OK : E_OUTOFMEMORY; case EXPR_OR: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_or); case EXPR_STRING: @@ -500,7 +500,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) return hres; cnd_jmp = push_instr(ctx, OP_jmp_false); - if(cnd_jmp == -1) + if(!cnd_jmp) return E_OUTOFMEMORY; hres = compile_statement(ctx, stat->if_stat); @@ -525,7 +525,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) return hres; cnd_jmp = push_instr(ctx, OP_jmp_false); - if(cnd_jmp == -1) + if(!cnd_jmp) return E_OUTOFMEMORY; hres = compile_statement(ctx, elseif_decl->stat); @@ -563,7 +563,7 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st return hres; jmp_end = push_instr(ctx, stat->stat.type == STAT_UNTIL ? OP_jmp_true : OP_jmp_false); - if(jmp_end == -1) + if(!jmp_end) return E_OUTOFMEMORY; prev_label = ctx->while_end_label; @@ -637,7 +637,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st return hres; instr = push_instr(ctx, OP_assign_ident); - if(instr == -1) + if(!instr) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.bstr = identifier; @@ -645,7 +645,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(FAILED(hres)) return hres; - if(push_instr(ctx, OP_val) == -1) + if(!push_instr(ctx, OP_val)) return E_OUTOFMEMORY; if(stat->step_expr) { @@ -653,7 +653,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(FAILED(hres)) return hres; - if(push_instr(ctx, OP_val) == -1) + if(!push_instr(ctx, OP_val)) return E_OUTOFMEMORY; }else { hres = push_instr_int(ctx, OP_short, 1); @@ -667,7 +667,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st return E_OUTOFMEMORY; step_instr = push_instr(ctx, OP_step); - if(step_instr == -1) + if(!step_instr) return E_OUTOFMEMORY; instr_ptr(ctx, step_instr)->arg2.bstr = identifier; instr_ptr(ctx, step_instr)->arg1.uint = ctx->for_end_label; @@ -677,7 +677,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st return hres; instr = push_instr(ctx, OP_incc); - if(instr == -1) + if(!instr) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.bstr = identifier; @@ -920,7 +920,7 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) hres = compile_assign_statement(ctx, (assign_statement_t*)stat, TRUE); break; case STAT_STOP: - hres = push_instr(ctx, OP_stop) == -1 ? E_OUTOFMEMORY : S_OK; + hres = push_instr(ctx, OP_stop) ? S_OK : E_OUTOFMEMORY; break; case STAT_UNTIL: case STAT_WHILE: @@ -1008,7 +1008,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(ctx->prop_end_label != -1) label_set_addr(ctx, ctx->prop_end_label); - if(push_instr(ctx, OP_ret) == -1) + if(!push_instr(ctx, OP_ret)) return E_OUTOFMEMORY; resolve_labels(ctx, func->code_off); @@ -1373,7 +1373,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) return NULL; } - ctx->instr_cnt = 0; + ctx->instr_cnt = 1; ctx->instr_size = 32; vbsheap_init(&ret->heap);

1 0

Detlef Riekenberg : shell32/tests: Simple tests for IApplicationAssociationRegistration.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 49e1a1a5dc441b6ab6eead2bcf6782c29907d4e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e1a1a5dc441b6ab6eead2bc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:16 2012 +0100 shell32/tests: Simple tests for IApplicationAssociationRegistration. --- dlls/shell32/tests/assoc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 8d09ec2..488f8e9 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -23,6 +23,7 @@ #include "shlwapi.h" #include "shlguid.h" +#include "shobjidl.h" #include "wine/test.h" @@ -61,11 +62,47 @@ static void test_IQueryAssociations_QueryInterface(void) } +static void test_IApplicationAssociationRegistration_QueryInterface(void) +{ + IApplicationAssociationRegistration *appreg; + IApplicationAssociationRegistration *appreg2; + IUnknown *unk; + HRESULT hr; + + /* this works since Vista */ + hr = CoCreateInstance(&CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC_SERVER, + &IID_IApplicationAssociationRegistration, (LPVOID*)&appreg); + + if (FAILED(hr)) { + skip("IApplicationAssociationRegistration not created: 0x%x\n", hr); + return; + } + + hr = IUnknown_QueryInterface(appreg, &IID_IApplicationAssociationRegistration, (void**)&appreg2); + ok(hr == S_OK, "QueryInterface (IApplicationAssociationRegistration) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(appreg2); + } + + hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(unk); + } + + hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + + IApplicationAssociationRegistration_Release(appreg); +} + + START_TEST(assoc) { CoInitialize(NULL); test_IQueryAssociations_QueryInterface(); + test_IApplicationAssociationRegistration_QueryInterface(); CoUninitialize(); }

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012