January 2010 - Wine-Commits

Jacek Caban : jscript: Skip tests on old jscript.dll.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: f623e3add8a1c7ebb182c6e2097f623f6268e6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f623e3add8a1c7ebb182c6e20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 23 23:58:23 2010 +0100 jscript: Skip tests on old jscript.dll. --- dlls/jscript/tests/run.c | 50 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 72640a6..303907e 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -726,7 +726,7 @@ static IActiveScript *create_script(void) return script; } -static void parse_script(DWORD flags, BSTR script_str) +static HRESULT parse_script(DWORD flags, BSTR script_str) { IActiveScriptParse *parser; IActiveScript *engine; @@ -734,14 +734,14 @@ static void parse_script(DWORD flags, BSTR script_str) engine = create_script(); if(!engine) - return; + return S_OK; hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); if (FAILED(hres)) { IActiveScript_Release(engine); - return; + return hres; } hres = IActiveScriptParse64_InitNew(parser); @@ -763,11 +763,12 @@ static void parse_script(DWORD flags, BSTR script_str) ok(script_disp != (IDispatch*)&Global, "script_disp == Global\n"); hres = IActiveScriptParse64_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); - ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); IDispatch_Release(script_disp); IActiveScript_Release(engine); IUnknown_Release(parser); + + return hres; } static HRESULT parse_htmlscript(BSTR script_str) @@ -813,9 +814,13 @@ static HRESULT parse_htmlscript(BSTR script_str) static void parse_script_af(DWORD flags, const char *src) { - BSTR tmp = a2bstr(src); - parse_script(flags, tmp); + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(src); + hres = parse_script(flags, tmp); SysFreeString(tmp); + ok(hres == S_OK, "parse_script failed: %08x\n", hres); } static void parse_script_a(const char *src) @@ -873,14 +878,17 @@ static BSTR get_script_from_file(const char *filename) static void run_from_file(const char *filename) { - BSTR script_str = get_script_from_file(filename); - - strict_dispid_check = FALSE; + BSTR script_str; + HRESULT hres; - if(script_str) - parse_script(SCRIPTITEM_GLOBALMEMBERS, script_str); + script_str = get_script_from_file(filename); + if(!script_str) + return; + strict_dispid_check = FALSE; + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, script_str); SysFreeString(script_str); + ok(hres == S_OK, "parse_script failed: %08x\n", hres); } static void run_from_res(const char *name) @@ -889,6 +897,7 @@ static void run_from_res(const char *name) DWORD size, len; BSTR str; HRSRC src; + HRESULT hres; strict_dispid_check = FALSE; test_name = name; @@ -905,10 +914,11 @@ static void run_from_res(const char *name) SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - parse_script(SCRIPTITEM_GLOBALMEMBERS, str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, str); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + ok(hres == S_OK, "parse_script failed: %08x\n", hres); SysFreeString(str); } @@ -1078,6 +1088,18 @@ static void run_tests(void) ok(hres != S_OK, "ParseScriptText have not failed\n"); } +static BOOL check_jscript(void) +{ + BSTR str; + HRESULT hres; + + str = a2bstr("if(!('localeCompare' in String.prototype)) throw 1;"); + hres = parse_script(0, str); + SysFreeString(str); + + return hres == S_OK; +} + START_TEST(run) { int argc; @@ -1087,7 +1109,9 @@ START_TEST(run) CoInitialize(NULL); - if(argc > 2) { + if(!check_jscript()) { + win_skip("Broken engine, probably too old\n"); + }else if(argc > 2) { run_from_file(argv[2]); }else { trace("invoke version 0\n");

1 0

Jacek Caban : jscript: Make RegExp contructor implementation more generic.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 7749951d35a2ea752ec7b15d23efb2ca027089ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7749951d35a2ea752ec7b15d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 23 23:56:48 2010 +0100 jscript: Make RegExp contructor implementation more generic. --- dlls/jscript/jscript.h | 1 + dlls/jscript/regexp.c | 73 ++++++++++++++++++++++------------------------- 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 4dd340e..a839067 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -226,6 +226,7 @@ HRESULT create_object(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_math(script_ctx_t*,DispatchEx**); HRESULT create_array(script_ctx_t*,DWORD,DispatchEx**); HRESULT create_regexp(script_ctx_t*,const WCHAR *,int,DWORD,DispatchEx**); +HRESULT create_regexp_var(script_ctx_t*,VARIANT*,VARIANT*,DispatchEx**); HRESULT create_string(script_ctx_t*,const WCHAR*,DWORD,DispatchEx**); HRESULT create_bool(script_ctx_t*,VARIANT_BOOL,DispatchEx**); HRESULT create_number(script_ctx_t*,VARIANT*,DispatchEx**); diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 1034cd0..751fe41 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3833,74 +3833,50 @@ HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, return S_OK; } -static HRESULT regexp_constructor(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *retv) +HRESULT create_regexp_var(script_ctx_t *ctx, VARIANT *src_arg, VARIANT *flags_arg, DispatchEx **ret) { const WCHAR *opt = emptyW, *src; - DispatchEx *ret; - VARIANT *arg; DWORD flags; HRESULT hres; - if(!arg_cnt(dp)) { - FIXME("no args\n"); - return E_NOTIMPL; - } - - arg = get_arg(dp,0); - if(V_VT(arg) == VT_DISPATCH) { + if(V_VT(src_arg) == VT_DISPATCH) { DispatchEx *obj; - obj = iface_to_jsdisp((IUnknown*)V_DISPATCH(arg)); + obj = iface_to_jsdisp((IUnknown*)V_DISPATCH(src_arg)); if(obj) { if(is_class(obj, JSCLASS_REGEXP)) { RegExpInstance *regexp = (RegExpInstance*)obj; - hres = create_regexp(ctx, regexp->str, -1, regexp->jsregexp->flags, &ret); + hres = create_regexp(ctx, regexp->str, -1, regexp->jsregexp->flags, ret); jsdisp_release(obj); - if(FAILED(hres)) - return hres; - - V_VT(retv) = VT_DISPATCH; - V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(ret); - return S_OK; + return hres; } jsdisp_release(obj); } } - if(V_VT(arg) != VT_BSTR) { - FIXME("vt arg0 = %d\n", V_VT(arg)); + if(V_VT(src_arg) != VT_BSTR) { + FIXME("flags_arg = %s\n", debugstr_variant(flags_arg)); return E_NOTIMPL; } - src = V_BSTR(arg); + src = V_BSTR(src_arg); - if(arg_cnt(dp) >= 2) { - arg = get_arg(dp,1); - if(V_VT(arg) != VT_BSTR) { - FIXME("unimplemented for vt %d\n", V_VT(arg)); + if(flags_arg) { + if(V_VT(flags_arg) != VT_BSTR) { + FIXME("unimplemented for vt %d\n", V_VT(flags_arg)); return E_NOTIMPL; } - opt = V_BSTR(arg); + opt = V_BSTR(flags_arg); } hres = parse_regexp_flags(opt, strlenW(opt), &flags); if(FAILED(hres)) return hres; - hres = create_regexp(ctx, src, -1, flags, &ret); - if(FAILED(hres)) - return hres; - - if(retv) { - V_VT(retv) = VT_DISPATCH; - V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(ret); - }else { - jsdisp_release(ret); - } - return S_OK; + return create_regexp(ctx, src, -1, flags, ret); } static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -3934,8 +3910,27 @@ static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } } /* fall through */ - case DISPATCH_CONSTRUCT: - return regexp_constructor(ctx, dp, retv); + case DISPATCH_CONSTRUCT: { + DispatchEx *ret; + HRESULT hres; + + if(!arg_cnt(dp)) { + FIXME("no args\n"); + return E_NOTIMPL; + } + + hres = create_regexp_var(ctx, get_arg(dp,0), arg_cnt(dp) > 1 ? get_arg(dp,1) : NULL, &ret); + if(FAILED(hres)) + return hres; + + if(retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(ret); + }else { + jsdisp_release(ret); + } + return S_OK; + } default: FIXME("unimplemented flags: %x\n", flags); return E_NOTIMPL;

1 0

Jacek Caban : jscript: Added String.replace implementation.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 43bc4af02d93af3f72e76662afd2c5c06a9b7c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bc4af02d93af3f72e76662a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 23 23:57:20 2010 +0100 jscript: Added String.replace implementation. --- dlls/jscript/string.c | 54 ++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/regexp.js | 45 ++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 63c0fe8..31e73a0 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1032,8 +1032,58 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + DispatchEx *regexp = NULL; + const WCHAR *str, *cp; + match_result_t match; + VARIANT *arg; + DWORD length; + BSTR val_str; + HRESULT hres; + + TRACE("\n"); + + hres = get_string_val(ctx, jsthis, ei, &str, &length, &val_str); + if(FAILED(hres)) + return hres; + + if(!arg_cnt(dp)) { + if(retv) + V_VT(retv) = VT_NULL; + SysFreeString(val_str); + return S_OK; + } + + arg = get_arg(dp,0); + if(V_VT(arg) == VT_DISPATCH) { + regexp = iface_to_jsdisp((IUnknown*)V_DISPATCH(arg)); + if(regexp) { + if(!is_class(regexp, JSCLASS_REGEXP)) { + jsdisp_release(regexp); + regexp = NULL; + } + } + } + + if(!regexp) { + hres = create_regexp_var(ctx, arg, NULL, &regexp); + if(FAILED(hres)) { + SysFreeString(val_str); + return hres; + } + } + + cp = str; + hres = regexp_match_next(ctx, regexp, FALSE, str, length, &cp, NULL, NULL, NULL, &match); + SysFreeString(val_str); + jsdisp_release(regexp); + if(FAILED(hres)) + return hres; + + if(retv) { + V_VT(retv) = VT_I4; + V_I4(retv) = hres == S_OK ? match.str-str : -1; + } + return S_OK; } /* ECMA-262 3rd Edition 15.5.4.13 */ diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 7f5f907..52a94ad 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -17,7 +17,7 @@ */ -var m, re, b; +var m, re, b, i, obj; re = /a+/; ok(re.lastIndex === 0, "re.lastIndex = " + re.lastIndex); @@ -409,4 +409,47 @@ m = re.exec(" "); ok(re.lastIndex === 0, "re.lastIndex = " + re.lastIndex + " expected 0"); ok(m === null, "m = " + m + " expected null"); +re = /aa/g; +i = 'baacd'.search(re); +ok(i === 1, "'baacd'.search(re) = " + i); +ok(re.lastIndex === 3, "re.lastIndex = " + re.lastIndex); + +re.lastIndex = 2; +i = 'baacdaa'.search(re); +ok(i === 1, "'baacd'.search(re) = " + i); +ok(re.lastIndex === 3, "re.lastIndex = " + re.lastIndex); + +re = /aa/; +i = 'baacd'.search(re); +ok(i === 1, "'baacd'.search(re) = " + i); +ok(re.lastIndex === 3, "re.lastIndex = " + re.lastIndex); + +re.lastIndex = 2; +i = 'baacdaa'.search(re); +ok(i === 1, "'baacd'.search(re) = " + i); +ok(re.lastIndex === 3, "re.lastIndex = " + re.lastIndex); + +re = /d/g; +re.lastIndex = 1; +i = 'abc'.search(re); +ok(i === -1, "'abc'.search(/d/g) = " + i); + +i = 'abcdde'.search(/[df]/); +ok(i === 3, "'abc'.search(/[df]/) = " + i); + +i = 'abcdde'.search(/[df]/, "a"); +ok(i === 3, "'abc'.search(/[df]/) = " + i); + +i = 'abcdde'.search("[df]"); +ok(i === 3, "'abc'.search(/d*/) = " + i); + +obj = { + toString: function() { return "abc"; } +}; +i = String.prototype.search.call(obj, "b"); +ok(i === 1, "String.prototype.seatch.apply(obj, 'b') = " + i); + +i = " undefined ".search(); +ok(i === null, "' undefined '.search() = " + i); + reportSuccess();

1 0

Eric Pouech : dbghelp: Removed some unused fields for public symbol description.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 181de556196a5f5fe734ddc3500ecc14e6a8dd61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181de556196a5f5fe734ddc35… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 23 22:13:18 2010 +0100 dbghelp: Removed some unused fields for public symbol description. --- dlls/dbghelp/dbghelp_private.h | 5 +---- dlls/dbghelp/elf_module.c | 3 +-- dlls/dbghelp/msc.c | 12 ++++-------- dlls/dbghelp/pe_module.c | 15 +++++---------- dlls/dbghelp/symbol.c | 5 +---- 5 files changed, 12 insertions(+), 28 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index d2e2f1b..e7e3c7c 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -227,8 +227,6 @@ struct symt_public struct symt* container; /* compiland */ unsigned long address; unsigned long size; - unsigned in_code : 1, - is_function : 1; }; struct symt_thunk @@ -593,8 +591,7 @@ extern struct symt_public* symt_new_public(struct module* module, struct symt_compiland* parent, const char* typename, - unsigned long address, unsigned size, - BOOL in_code, BOOL is_func); + unsigned long address, unsigned size); extern struct symt_data* symt_new_global_variable(struct module* module, struct symt_compiland* parent, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 3399aeb..6a8a151 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -749,8 +749,7 @@ static int elf_new_public_symbols(struct module* module, const struct hash_table { symt_new_public(module, ste->compiland, ste->ht_elt.name, module->elf_info->elf_addr + ste->symp->st_value, - ste->symp->st_size, TRUE /* FIXME */, - ELF32_ST_TYPE(ste->symp->st_info) == STT_FUNC); + ste->symp->st_size); } return TRUE; } diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index c25be16..b7adabd 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1919,8 +1919,7 @@ static int codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYT { symt_new_public(msc_dbg->module, compiland, terminate_string(&sym->data_v1.p_name), - codeview_get_address(msc_dbg, sym->data_v1.segment, sym->data_v1.offset), - 1, TRUE /* FIXME */, TRUE /* FIXME */); + codeview_get_address(msc_dbg, sym->data_v1.segment, sym->data_v1.offset), 1); } break; case S_PUB_V2: /* FIXME is this really a 'data_v2' structure ?? */ @@ -1928,8 +1927,7 @@ static int codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYT { symt_new_public(msc_dbg->module, compiland, terminate_string(&sym->data_v2.p_name), - codeview_get_address(msc_dbg, sym->data_v2.segment, sym->data_v2.offset), - 1, TRUE /* FIXME */, TRUE /* FIXME */); + codeview_get_address(msc_dbg, sym->data_v2.segment, sym->data_v2.offset), 1); } break; @@ -1938,8 +1936,7 @@ static int codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYT { symt_new_public(msc_dbg->module, compiland, sym->data_v3.name, - codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset), - 1, FALSE /* FIXME */, FALSE); + codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset), 1); } break; case S_PUB_FUNC1_V3: @@ -1950,8 +1947,7 @@ static int codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BYT { symt_new_public(msc_dbg->module, compiland, sym->data_v3.name, - codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset), - 1, TRUE /* FIXME */, TRUE); + codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset), 1); } #endif break; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 2937013..80ad561 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -315,14 +315,12 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, #if 0 /* Add start of DLL (better use the (yet unimplemented) Exe SymTag for this) */ /* FIXME: module.ModuleName isn't correctly set yet if it's passed in SymLoadModule */ - symt_new_public(module, NULL, module->module.ModuleName, base, 1, - TRUE /* FIXME */, TRUE /* FIXME */); + symt_new_public(module, NULL, module->module.ModuleName, base, 1); #endif /* Add entry point */ symt_new_public(module, NULL, "EntryPoint", - base + nth->OptionalHeader.AddressOfEntryPoint, 1, - TRUE, TRUE); + base + nth->OptionalHeader.AddressOfEntryPoint, 1); #if 0 /* FIXME: we'd better store addresses linked to sections rather than absolute values */ @@ -333,8 +331,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++) { symt_new_public(module, NULL, section->Name, - RtlImageRvaToVa(nth, mapping, section->VirtualAddress, NULL), - 1, TRUE /* FIXME */, TRUE /* FIXME */); + RtlImageRvaToVa(nth, mapping, section->VirtualAddress, NULL), 1); } #endif @@ -359,8 +356,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, if (!names[i]) continue; symt_new_public(module, NULL, RtlImageRvaToVa(nth, mapping, names[i], NULL), - base + functions[ordinals[i]], - 1, TRUE /* FIXME */, TRUE /* FIXME */); + base + functions[ordinals[i]], 1); } for (i = 0; i < exports->NumberOfFunctions; i++) @@ -371,8 +367,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, if ((ordinals[j] == i) && names[j]) break; if (j < exports->NumberOfNames) continue; snprintf(buffer, sizeof(buffer), "%d", i + exports->Base); - symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1, - TRUE /* FIXME */, TRUE /* FIXME */); + symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1); } } } diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 3209067..0b66cdb 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -304,8 +304,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, struct symt_public* symt_new_public(struct module* module, struct symt_compiland* compiland, const char* name, - unsigned long address, unsigned size, - BOOL in_code, BOOL is_func) + unsigned long address, unsigned size) { struct symt_public* sym; struct symt** p; @@ -322,8 +321,6 @@ struct symt_public* symt_new_public(struct module* module, sym->container = compiland ? &compiland->symt : NULL; sym->address = address; sym->size = size; - sym->in_code = in_code; - sym->is_function = is_func; symt_add_module_ht(module, (struct symt_ht*)sym); if (compiland) {

1 0

Eric Pouech : winmm: For MCI parsing, use 64bit compatible variables.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 5cab72bc95ec2d864e19952fff2df99610ba7537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cab72bc95ec2d864e19952ff… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 23 18:56:50 2010 +0100 winmm: For MCI parsing, use 64bit compatible variables. --- dlls/winmm/mci.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index b8cbdac..0a15f09 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -972,7 +972,7 @@ static WORD MCI_GetMessage(LPCWSTR lpCmd) /************************************************************************** * MCI_GetDWord [internal] */ -static BOOL MCI_GetDWord(LPDWORD data, LPWSTR* ptr) +static BOOL MCI_GetDWord(DWORD_PTR* data, LPWSTR* ptr) { DWORD val; LPWSTR ret; @@ -1025,7 +1025,7 @@ static DWORD MCI_GetString(LPWSTR* str, LPWSTR* args) /************************************************************************** * MCI_ParseOptArgs [internal] */ -static DWORD MCI_ParseOptArgs(LPDWORD data, int _offset, LPCWSTR lpCmd, +static DWORD MCI_ParseOptArgs(DWORD_PTR* data, int _offset, LPCWSTR lpCmd, LPWSTR args, LPDWORD dwFlags) { int len, offset; @@ -1147,8 +1147,8 @@ static DWORD MCI_ParseOptArgs(LPDWORD data, int _offset, LPCWSTR lpCmd, /************************************************************************** * MCI_HandleReturnValues [internal] */ -static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD retType, - LPDWORD data, LPWSTR lpstrRet, UINT uRetLen) +static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD retType, + DWORD_PTR* data, LPWSTR lpstrRet, UINT uRetLen) { static const WCHAR wszLd [] = {'%','l','d',0}; static const WCHAR wszLd4 [] = {'%','l','d',' ','%','l','d',' ','%','l','d',' ','%','l','d',0}; @@ -1226,12 +1226,12 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, LPWINE_MCIDRIVER wmd = 0; DWORD dwFlags = 0, dwRet = 0; int offset = 0; - DWORD data[MCI_DATA_SIZE]; + DWORD_PTR data[MCI_DATA_SIZE]; DWORD retType; LPCWSTR lpCmd = 0; static const WCHAR wszNew[] = {'n','e','w',0}; static const WCHAR wszSAliasS[] = {' ','a','l','i','a','s',' ',0}; - static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; + static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; TRACE("(%s, %p, %d, %p)\n", debugstr_w(lpstrCommand), lpstrRet, uRetLen, hwndCallback); @@ -1278,15 +1278,15 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, tmp = devType; devType = dev; dev = tmp; dwFlags |= MCI_OPEN_TYPE; - data[2] = (DWORD)devType; + data[2] = (DWORD_PTR)devType; devType = str_dup_upper(devType); dwFlags |= MCI_OPEN_ELEMENT; - data[3] = (DWORD)dev; + data[3] = (DWORD_PTR)dev; } else if (DRIVER_GetLibName(dev, wszMci, buf, sizeof(buf))) { /* this is the name of a mci driver's type */ tmp = strchrW(dev, ' '); if (tmp) *tmp = '\0'; - data[2] = (DWORD)dev; + data[2] = (DWORD_PTR)dev; devType = str_dup_upper(dev); if (tmp) *tmp = ' '; dwFlags |= MCI_OPEN_TYPE; @@ -1305,7 +1305,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, devType = str_dup_upper(buf); } dwFlags |= MCI_OPEN_ELEMENT; - data[3] = (DWORD)dev; + data[3] = (DWORD_PTR)dev; } if (!strstrW(args, wszSAliasS) && !dev) { dwRet = MCIERR_NEW_REQUIRES_ALIAS; @@ -1362,7 +1362,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, switch (retType = MCI_GetReturnType(lpCmd)) { case 0: offset = 1; break; case MCI_INTEGER: offset = 2; break; - case MCI_STRING: data[1] = (DWORD)lpstrRet; data[2] = uRetLen; offset = 3; break; + case MCI_STRING: data[1] = (DWORD_PTR)lpstrRet; data[2] = uRetLen; offset = 3; break; case MCI_RECT: offset = 5; break; default: ERR("oops\n"); } @@ -1375,7 +1375,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, /* set up call back */ if (dwFlags & MCI_NOTIFY) { - data[0] = (DWORD)hwndCallback; + data[0] = (DWORD_PTR)hwndCallback; } /* FIXME: the command should get it's own notification window set up and @@ -1383,7 +1383,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, */ if (lpstrRet && uRetLen) *lpstrRet = '\0'; - TRACE("[%d, %s, %08x, %08x/%s %08x/%s %08x/%s %08x/%s %08x/%s %08x/%s]\n", + TRACE("[%d, %s, %08x, %08lx/%s %08lx/%s %08lx/%s %08lx/%s %08lx/%s %08lx/%s]\n", wmd->wDeviceID, MCI_MessageToString(MCI_GetMessage(lpCmd)), dwFlags, data[0], debugstr_w((WCHAR *)data[0]), data[1], debugstr_w((WCHAR *)data[1]), data[2], debugstr_w((WCHAR *)data[2]), data[3], debugstr_w((WCHAR *)data[3]), @@ -2214,7 +2214,7 @@ HTASK WINAPI mciGetCreatorTask(MCIDEVICEID uDeviceID) LPWINE_MCIDRIVER wmd; HTASK ret = 0; - if ((wmd = MCI_GetDriver(uDeviceID))) ret = (HTASK)wmd->CreatorThread; + if ((wmd = MCI_GetDriver(uDeviceID))) ret = (HTASK)(DWORD_PTR)wmd->CreatorThread; TRACE("(%u) => %p\n", uDeviceID, ret); return ret;

1 0

Eric Pouech : winmm: A couple of simple fixes for winmm compilation on 64bit platforms.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 37afecb88371617ea3de2d42e8b3785c9c6d6c1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=37afecb88371617ea3de2d42e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 23 18:56:36 2010 +0100 winmm: A couple of simple fixes for winmm compilation on 64bit platforms. --- dlls/winejack.drv/audio.c | 2 +- dlls/winmm/winmm.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index d93502d..512bc01 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -397,7 +397,7 @@ static int JACK_callback_wwo (nframes_t nframes, void *arg) if(wwo->buffer_size < (nframes * sizeof(short) * 2)) { ERR("for some reason JACK_BufSize() didn't allocate enough memory\n"); - ERR("allocated %ld bytes, need %d bytes\n", wwo->buffer_size, (nframes * sizeof(short) * 2)); + ERR("allocated %ld bytes, need %d bytes\n", wwo->buffer_size, (nframes * (unsigned)sizeof(short) * 2)); return 0; } diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index f5e2af1..b2caa48 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -732,7 +732,7 @@ UINT WINAPI auxGetVolume(UINT uDeviceID, DWORD* lpdwVolume) TRACE("(%04X, %p) !\n", uDeviceID, lpdwVolume); - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) + if ((wmld = MMDRV_Get((HANDLE)(DWORD_PTR)uDeviceID, MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, AUXDM_GETVOLUME, (DWORD_PTR)lpdwVolume, 0L); } @@ -746,7 +746,7 @@ UINT WINAPI auxSetVolume(UINT uDeviceID, DWORD dwVolume) TRACE("(%04X, %u) !\n", uDeviceID, dwVolume); - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) + if ((wmld = MMDRV_Get((HANDLE)(DWORD_PTR)uDeviceID, MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, AUXDM_SETVOLUME, dwVolume, 0L); } @@ -758,7 +758,7 @@ UINT WINAPI auxOutMessage(UINT uDeviceID, UINT uMessage, DWORD_PTR dw1, DWORD_PT { LPWINE_MLD wmld; - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) + if ((wmld = MMDRV_Get((HANDLE)(DWORD_PTR)uDeviceID, MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, uMessage, dw1, dw2);

1 0

André Hentschel : kernel32/tests: Fix header comments.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 2d956be11d4e3e0eea5c9758586712f6db0b0f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d956be11d4e3e0eea5c97585… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 23 16:46:09 2010 +0100 kernel32/tests: Fix header comments. --- dlls/kernel32/tests/process.c | 2 +- dlls/kernel32/tests/resource.c | 2 +- dlls/kernel32/tests/thread.c | 2 +- dlls/kernel32/tests/timer.c | 2 +- dlls/kernel32/tests/volume.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 36c86e2..7b5ac75 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1,5 +1,5 @@ /* - * Unit test suite for CreateProcess function. + * Unit test suite for process functions * * Copyright 2002 Eric Pouech * Copyright 2006 Dmitry Timoshkov diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 7410675..a2c02c8 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -1,5 +1,5 @@ /* - * Unit test suite for environment functions. + * Unit test suite for resource functions. * * Copyright 2006 Mike McCormack * diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index dd83399..e98b6e2 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1,5 +1,5 @@ /* - * Unit test suite for directory functions. + * Unit test suite for thread functions. * * Copyright 2002 Geoffrey Hausheer * diff --git a/dlls/kernel32/tests/timer.c b/dlls/kernel32/tests/timer.c index 3c3fde7..8c233f0 100644 --- a/dlls/kernel32/tests/timer.c +++ b/dlls/kernel32/tests/timer.c @@ -1,5 +1,5 @@ /* - * Unit test suite for time functions + * Unit test suite for timer functions * * Copyright 2004 Mike McCormack * diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index efd74d5..f94d9cb 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -1,5 +1,5 @@ /* - * Unit test suite + * Unit test suite for volume functions * * Copyright 2006 Stefan Leichter *

1 0

Freddie Tilley : ntdll: Detect more cpu features in get_cpuinfo.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 323b36f52121b093ef65cea536787cd1328cda7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=323b36f52121b093ef65cea53… Author: Freddie Tilley <freddie.tilley(a)gmail.com> Date: Sat Jan 23 11:09:28 2010 +0100 ntdll: Detect more cpu features in get_cpuinfo. --- dlls/ntdll/nt.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5cc4877..fdcc163 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -845,10 +845,13 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) info->Level = 3; break; } - user_shared_data->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = !(regs2[3] & 1); - user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] & (1 << 4 )) >> 4; - user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = (regs2[3] & (1 << 8 )) >> 8; - user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 23)) >> 23; + user_shared_data->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = !(regs2[3] & 1); + user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] & (1 << 4 )) >> 4; + user_shared_data->ProcessorFeatures[PF_PAE_ENABLED] = (regs2[3] & (1 << 6 )) >> 6; + user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = (regs2[3] & (1 << 8 )) >> 8; + user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 23)) >> 23; + user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 25)) >> 25; + user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 26)) >> 26; if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD) {

1 0

Eric Pouech : winmm: In mmio manipulation, always ensure that we use a HFILE for mmio internal handlers ( and not a HANDLE).
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: c62cf2e049ad37d9561957c47d23fc7ba13adc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c62cf2e049ad37d9561957c47… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 23 18:56:45 2010 +0100 winmm: In mmio manipulation, always ensure that we use a HFILE for mmio internal handlers (and not a HANDLE). --- dlls/winmm/mmio.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index b774003..75439a4 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -76,9 +76,9 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, /* if filename NULL, assume open file handle in adwInfo[0] */ if (szFileName) { OFSTRUCT ofs; - lpmmioinfo->adwInfo[0] = (DWORD)OpenFile(szFileName, &ofs, lpmmioinfo->dwFlags & 0xFFFF); + lpmmioinfo->adwInfo[0] = OpenFile(szFileName, &ofs, lpmmioinfo->dwFlags & 0xFFFF); } - if (lpmmioinfo->adwInfo[0] == (DWORD)HFILE_ERROR) + if (lpmmioinfo->adwInfo[0] == HFILE_ERROR) ret = MMIOERR_CANNOTOPEN; } break; @@ -582,6 +582,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, { LPWINE_MMIO wm; MMIOINFO mmioinfo; + DWORD pos; TRACE("('%s', %p, %08X, %s);\n", szFileName, refmminfo, dwOpenFlags, is_unicode ? "unicode" : "ansi"); @@ -666,7 +667,12 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, (LPARAM)szFileName, 0, FALSE); /* grab file size, when possible */ - wm->dwFileSize = GetFileSize((HANDLE)wm->info.adwInfo[0], NULL); + if ((pos = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_CUR)) != -1) + { + wm->dwFileSize = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_END); + _llseek((HFILE)wm->info.adwInfo[0], pos, SEEK_SET); + } + else wm->dwFileSize = 0; if (refmminfo->wErrorRet == 0) return wm->info.hmmio;

1 0

André Hentschel : winegcc: Update comments.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 115b50cc23f4e415014f226b11320af993c0049a URL: http://source.winehq.org/git/wine.git/?a=commit;h=115b50cc23f4e415014f226b1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 22 21:08:34 2010 +0100 winegcc: Update comments. --- tools/winegcc/utils.c | 2 +- tools/winegcc/utils.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 2a6a249..411a9c1 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -1,5 +1,5 @@ /* - * Useful functions for winegcc/winewrap + * Useful functions for winegcc * * Copyright 2000 Francois Gouget * Copyright 2002 Dimitrie O. Paun diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index f526c16..31cc3b9 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -1,5 +1,5 @@ /* - * Useful functions for winegcc/winewrap + * Useful functions for winegcc * * Copyright 2000 Francois Gouget * Copyright 2002 Dimitrie O. Paun

1 0