September 2012 - Wine-Commits

Michael Geddes : tapi32: Stub some missing functions.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: cf41a41738865ba787dbb9e29909d680687169e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf41a41738865ba787dbb9e29… Author: Michael Geddes <michael(a)frog.wheelycreek.net> Date: Mon May 28 12:01:39 2012 +0800 tapi32: Stub some missing functions. --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/phone.c | 29 +++++++++++++++++++++++++++++ dlls/tapi32/tapi32.spec | 4 ++++ include/tapi.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 3d8cb37..cbb5f98 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -544,6 +544,15 @@ DWORD WINAPI lineGetLineDevStatusA(HLINE hLine, LPLINEDEVSTATUS lpLineDevStatus) } /*********************************************************************** + * lineGetMessage (TAPI32.@) + */ +DWORD WINAPI lineGetMessage(HLINEAPP hLineApp, LPLINEMESSAGE lpMessage, DWORD dwTimeout) +{ + FIXME("(%p, %p, %08x): stub.\n", hLineApp, lpMessage, dwTimeout); + return 0; +} + +/*********************************************************************** * lineGetNewCalls (TAPI32.@) */ DWORD WINAPI lineGetNewCalls(HLINE hLine, DWORD dwAddressID, DWORD dwSelect, LPLINECALLLIST lpCallList) diff --git a/dlls/tapi32/phone.c b/dlls/tapi32/phone.c index 994d787..ed40a62 100644 --- a/dlls/tapi32/phone.c +++ b/dlls/tapi32/phone.c @@ -156,6 +156,15 @@ DWORD WINAPI phoneGetLamp(HPHONE hPhone, DWORD dwButtonLampID, } /*********************************************************************** + * phoneGetMessage (TAPI32.@) + */ +DWORD WINAPI phoneGetMessage(HPHONEAPP hPhoneApp, LPPHONEMESSAGE lpMessage, DWORD dwTimeout) +{ + FIXME("(%p, %p, %08x): stub.\n", hPhoneApp, lpMessage, dwTimeout); + return 0; +} + +/*********************************************************************** * phoneGetRing (TAPI32.@) */ DWORD WINAPI phoneGetRing(HPHONE hPhone, LPDWORD lpdwRingMode, LPDWORD lpdwVolume) @@ -205,6 +214,26 @@ DWORD WINAPI phoneInitialize(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONE } /*********************************************************************** + * phoneInitializeiExA (TAPI32.@) + */ +DWORD WINAPI phoneInitializeExA(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONECALLBACK lpfnCallback, LPCSTR lpszAppName, LPDWORD lpdwNumDevs, LPDWORD lpdwAPIVersion, LPPHONEINITIALIZEEXPARAMS lpPhoneInitializeExParams) +{ + FIXME("(%p, %p, %p, %s, %p, %p, %p): stub.\n", lphPhoneApp, hInstance, lpfnCallback, lpszAppName, lpdwNumDevs, lpdwAPIVersion, lpPhoneInitializeExParams); + *lpdwNumDevs = 0; + return 0; +} + +/*********************************************************************** + * phoneInitializeiExW (TAPI32.@) + */ +DWORD WINAPI phoneInitializeExW(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONECALLBACK lpfnCallback, LPCWSTR lpszAppName, LPDWORD lpdwNumDevs, LPDWORD lpdwAPIVersion, LPPHONEINITIALIZEEXPARAMS lpPhoneInitializeExParams) +{ + FIXME("(%p, %p, %p, %s, %p, %p, %p): stub.\n", lphPhoneApp, hInstance, lpfnCallback, debugstr_w(lpszAppName), lpdwNumDevs, lpdwAPIVersion, lpPhoneInitializeExParams); + *lpdwNumDevs = 0; + return 0; +} + +/*********************************************************************** * phoneNegotiateAPIVersion (TAPI32.@) */ DWORD WINAPI phoneNegotiateAPIVersion(HPHONEAPP hPhoneApp, DWORD dwDeviceID, DWORD dwAPILowVersion, DWORD dwAPIHighVersion, LPDWORD lpdwAPIVersion, LPPHONEEXTENSIONID lpExtensionID) diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index b95f86f..78cd63b 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -53,6 +53,7 @@ @ stdcall lineGetIconA(long str ptr) @ stdcall lineGetLineDevStatus(long ptr) lineGetLineDevStatusA @ stdcall lineGetLineDevStatusA(long ptr) +@ stdcall lineGetMessage(long ptr long) @ stdcall lineGetNewCalls(long long long ptr) @ stdcall lineGetNumRings(long long ptr) @ stdcall lineGetProviderList(long ptr) lineGetProviderListA @@ -138,12 +139,15 @@ @ stdcall phoneGetIcon(long str ptr) phoneGetIconA @ stdcall phoneGetIconA(long str ptr) @ stdcall phoneGetLamp(long long ptr) +@ stdcall phoneGetMessage(long ptr long) @ stdcall phoneGetRing(long ptr ptr) @ stdcall phoneGetStatus(long ptr) phoneGetStatusA @ stdcall phoneGetStatusA(long ptr) @ stdcall phoneGetStatusMessages(long ptr ptr ptr) @ stdcall phoneGetVolume(long long ptr) @ stdcall phoneInitialize(ptr long ptr str ptr) +@ stdcall phoneInitializeExA(ptr long ptr str ptr ptr ptr) +@ stdcall phoneInitializeExW(ptr long ptr str ptr ptr ptr) @ stdcall phoneNegotiateAPIVersion(long long long long ptr ptr) @ stdcall phoneNegotiateExtVersion(long long long long long ptr) @ stdcall phoneOpen(long long ptr long long long long) diff --git a/include/tapi.h b/include/tapi.h index 9af7ea5..98d995a 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -747,6 +747,15 @@ typedef struct linetranslateoutput_tag { DWORD dwTranslateResults; } LINETRANSLATEOUTPUT, *LPLINETRANSLATEOUTPUT; +typedef struct linemessage_tag { + DWORD hDevice; + DWORD dwMessageID; + DWORD_PTR dwCallbackInstance; + DWORD_PTR dwParam1; + DWORD_PTR dwParam2; + DWORD_PTR dwParam3; +} LINEMESSAGE, *LPLINEMESSAGE; + typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD, DWORD, DWORD, DWORD); typedef struct _PHONEAPP { @@ -817,6 +826,27 @@ typedef struct phoneextensionid_tag { DWORD dwExtensionID3; } PHONEEXTENSIONID, *LPPHONEEXTENSIONID; +typedef struct phoneinitializeexparams_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwOptions; + union { + HANDLE hEvent; + HANDLE hCompletionPort; + } Handles; + DWORD dwCompletionKey; +} PHONEINITIALIZEEXPARAMS, *LPPHONEINITIALIZEEXPARAMS; + +typedef struct phonemessage_tag { + DWORD hDevice; + DWORD dwMessageID; + DWORD_PTR dwCallbackInstance; + DWORD_PTR dwParam1; + DWORD_PTR dwParam2; + DWORD_PTR dwParam3; +} PHONEMESSAGE, *LPPHONEMESSAGE; + typedef struct phonestatus_tag { DWORD dwTotalSize; DWORD dwNeededSize;

1 0

Piotr Caban : ntdll: Added partial support for SystemLogicalProcessorInformation information class in NtQuerySystemInformation (linux).
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: faccf6ad10262beb195b1ecc60be8b97ed5fbf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faccf6ad10262beb195b1ecc6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 4 13:37:59 2012 +0200 ntdll: Added partial support for SystemLogicalProcessorInformation information class in NtQuerySystemInformation (linux). --- dlls/ntdll/nt.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 146 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 7b161e5..3f0f6d1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1320,6 +1320,122 @@ void fill_cpu_info(void) cached_sci.Architecture, cached_sci.Level, cached_sci.Revision, cached_sci.FeatureSet); } +#ifdef linux +static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMATION *data, + DWORD *len, DWORD max_len, LOGICAL_PROCESSOR_RELATIONSHIP rel, DWORD id, DWORD proc) +{ + int i; + + for(i=0; i<*len; i++) + { + if(data[i].Relationship!=rel || data[i].u.Reserved[1]!=id) + continue; + + data[i].ProcessorMask |= (ULONG_PTR)1<<proc; + return TRUE; + } + + if(*len == max_len) + return FALSE; + + data[i].Relationship = rel; + data[i].ProcessorMask = (ULONG_PTR)1<<proc; + /* TODO: set processor core flags */ + data[i].u.Reserved[0] = 0; + data[i].u.Reserved[1] = id; + *len = i+1; + return TRUE; +} + +static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, DWORD *max_len) +{ + static const char core_info[] = "/sys/devices/system/cpu/cpu%d/%s"; + + FILE *fcpu_list, *f; + DWORD len = 0, beg, end, i, r; + char op, name[MAX_PATH]; + + fcpu_list = fopen("/sys/devices/system/cpu/online", "r"); + if(!fcpu_list) + return STATUS_NOT_IMPLEMENTED; + + while(!feof(fcpu_list)) + { + if(!fscanf(fcpu_list, "%u%c ", &beg, &op)) + break; + if(op == '-') fscanf(fcpu_list, "%u%c ", &end, &op); + else end = beg; + + for(i=beg; i<=end; i++) + { + if(i > 8*sizeof(ULONG_PTR)) + { + FIXME("skipping logical processor %d\n", i); + continue; + } + + sprintf(name, core_info, i, "core_id"); + f = fopen(name, "r"); + if(f) + { + fscanf(f, "%u", &r); + fclose(f); + } + else r = i; + if(!logical_proc_info_add_by_id(*data, &len, *max_len, RelationProcessorCore, r, i)) + { + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; + + *max_len *= 2; + new_data = RtlReAllocateHeap(GetProcessHeap(), 0, *data, *max_len*sizeof(*new_data)); + if(!new_data) + { + fclose(fcpu_list); + return STATUS_NO_MEMORY; + } + + *data = new_data; + logical_proc_info_add_by_id(*data, &len, *max_len, RelationProcessorCore, r, i); + } + + sprintf(name, core_info, i, "physical_package_id"); + f = fopen(name, "r"); + if(f) + { + fscanf(f, "%u", &r); + fclose(f); + } + else r = 0; + if(!logical_proc_info_add_by_id(*data, &len, *max_len, RelationProcessorPackage, r, i)) + { + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; + + *max_len *= 2; + new_data = RtlReAllocateHeap(GetProcessHeap(), 0, *data, *max_len*sizeof(*new_data)); + if(!new_data) + { + fclose(fcpu_list); + return STATUS_NO_MEMORY; + } + + *data = new_data; + logical_proc_info_add_by_id(*data, &len, *max_len, RelationProcessorPackage, r, i); + } + } + } + fclose(fcpu_list); + + *max_len = len * sizeof(**data); + return STATUS_SUCCESS; +} +#else +static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, DWORD *max_len) +{ + FIXME("stub\n"); + return STATUS_NOT_IMPLEMENTED; +} +#endif + /****************************************************************************** * NtQuerySystemInformation [NTDLL.@] * ZwQuerySystemInformation [NTDLL.@] @@ -1754,6 +1870,36 @@ NTSTATUS WINAPI NtQuerySystemInformation( else ret = STATUS_INFO_LENGTH_MISMATCH; } break; + case SystemLogicalProcessorInformation: + { + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *buf; + + /* Each logical processor may use up to 7 entries in returned table: + * core, numa node, package, L1i, L1d, L2, L3 */ + len = 7 * NtCurrentTeb()->Peb->NumberOfProcessors; + buf = RtlAllocateHeap(GetProcessHeap(), 0, len * sizeof(*buf)); + if(!buf) + { + ret = STATUS_NO_MEMORY; + break; + } + + ret = create_logical_proc_info(&buf, &len); + if( ret != STATUS_SUCCESS ) + { + RtlFreeHeap(GetProcessHeap(), 0, buf); + break; + } + + if( Length >= len) + { + if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; + else memcpy( SystemInformation, buf, len); + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + RtlFreeHeap(GetProcessHeap(), 0, buf); + } + break; default: FIXME("(0x%08x,%p,0x%08x,%p) stub\n", SystemInformationClass,SystemInformation,Length,ResultLength);

1 0

Henri Verbeet : d3d10: Handle D3D10_SVT_UINT in read_int32_value() and read_int8_value().
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 0f372135bb9de3e96c92343f52257bb204765f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f372135bb9de3e96c92343f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 4 13:52:31 2012 +0200 d3d10: Handle D3D10_SVT_UINT in read_int32_value() and read_int8_value(). --- dlls/d3d10/effect.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7d07cc3..5b82777 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1084,6 +1084,7 @@ static BOOL read_int32_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT return TRUE; case D3D10_SVT_INT: + case D3D10_SVT_UINT: case D3D10_SVT_BOOL: out_data[idx] = value; return TRUE; @@ -1099,6 +1100,7 @@ static BOOL read_int8_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT8 switch (in_type) { case D3D10_SVT_INT: + case D3D10_SVT_UINT: out_data[idx] = value; return TRUE;

1 0

Jacek Caban : jscript: Fixed empty cases in the end of switch statement.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 6ba7a1964aaec5f8e527128442a876975bee85d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ba7a1964aaec5f8e52712844… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 4 15:52:27 2012 +0200 jscript: Fixed empty cases in the end of switch statement. --- dlls/jscript/compile.c | 20 ++++++++++++++------ dlls/jscript/tests/lang.js | 26 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f3c1df1..e45b132 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1540,18 +1540,26 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t set_arg_uint(ctx, iter->expr ? case_jmps[i++] : default_jmp, ctx->code_off); - for(stat_iter = iter->stat; stat_iter && (!iter->next || iter->next->stat != stat_iter); stat_iter = stat_iter->next) { - hres = compile_statement(ctx, &stat_ctx, stat_iter); + if(iter->stat) { + for(stat_iter = iter->stat; stat_iter && (!iter->next || iter->next->stat != stat_iter); + stat_iter = stat_iter->next) { + hres = compile_statement(ctx, &stat_ctx, stat_iter); + if(FAILED(hres)) + break; + + if(stat_iter->next && !push_instr(ctx, OP_pop)) { + hres = E_OUTOFMEMORY; + break; + } + } if(FAILED(hres)) break; - - if(stat_iter->next && !push_instr(ctx, OP_pop)) { + }else { + if(!push_instr(ctx, OP_undefined)) { hres = E_OUTOFMEMORY; break; } } - if(FAILED(hres)) - break; } heap_free(case_jmps); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 26a28b8..cb127da 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -757,6 +757,32 @@ case 3: ok(false, "unexpected case 3"); } +switch(1) { +case 2: + ok(false, "unexpected case 2"); + break; +default: + /* empty default */ +} + +switch(2) { +default: + ok(false, "unexpected default"); + break; +case 2: + /* empty case */ +}; + +switch(2) { +default: + ok(false, "unexpected default"); + break; +case 1: +case 2: +case 3: + /* empty case */ +}; + (function() { var i=0;

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::onhelp property implementation.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: f63da13c288abf37414369443831722f40685b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63da13c288abf37414369443… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 4 13:58:58 2012 +0200 mshtml: Added IHTMLWindow2::onhelp property implementation. --- dlls/mshtml/htmlanchor.c | 8 +++----- dlls/mshtml/htmlbody.c | 1 + dlls/mshtml/htmlcomment.c | 1 + dlls/mshtml/htmlelem.c | 31 +++++++++++++++++++++++++++++++ dlls/mshtml/htmlembed.c | 1 + dlls/mshtml/htmlevent.c | 7 ++++++- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/htmlgeneric.c | 1 + dlls/mshtml/htmlhead.c | 2 ++ dlls/mshtml/htmliframe.c | 2 +- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlmeta.c | 1 + dlls/mshtml/htmlobject.c | 2 +- dlls/mshtml/htmloption.c | 1 + dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmlstyleelem.c | 1 + dlls/mshtml/htmltable.c | 1 + dlls/mshtml/htmltablecell.c | 1 + dlls/mshtml/htmltablerow.c | 1 + dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/htmlwindow.c | 12 ++++++++---- dlls/mshtml/mshtml_private.h | 3 ++- 26 files changed, 72 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f63da13c288abf3741436…

1 0

Jacek Caban : mshtml: Added IHTMLElement::contains implementation.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: a1e6835d0e7466b0ade7432e7aeb4f2e6094dc76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e6835d0e7466b0ade7432e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 4 13:59:22 2012 +0200 mshtml: Added IHTMLElement::contains implementation. --- dlls/mshtml/htmlelem.c | 22 ++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7d6620a..e44f97d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -773,8 +773,26 @@ static HRESULT WINAPI HTMLElement_contains(IHTMLElement *iface, IHTMLElement *pC VARIANT_BOOL *pfResult) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p %p)\n", This, pChild, pfResult); - return E_NOTIMPL; + HTMLElement *child; + cpp_bool result; + nsresult nsres; + + TRACE("(%p)->(%p %p)\n", This, pChild, pfResult); + + child = unsafe_impl_from_IHTMLElement(pChild); + if(!child) { + ERR("not our element\n"); + return E_FAIL; + } + + nsres = nsIDOMNode_Contains(This->node.nsnode, child->node.nsnode, &result); + if(NS_FAILED(nsres)) { + ERR("failed\n"); + return E_FAIL; + } + + *pfResult = result ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLElement_get_sourceIndex(IHTMLElement *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1b7de75..149aa5e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2117,6 +2117,18 @@ static void _test_elem_outerhtml(unsigned line, IUnknown *unk, const char *outer SysFreeString(html); } +#define test_elem_contains(a,b,c) _test_elem_contains(__LINE__,a,b,c) +static void _test_elem_contains(unsigned line, IHTMLElement *elem, IHTMLElement *elem2, VARIANT_BOOL exval) +{ + VARIANT_BOOL b; + HRESULT hres; + + b = 100; + hres = IHTMLElement_contains(elem, elem2, &b); + ok_(__FILE__,line)(hres == S_OK, "contains failed: %08x\n", hres); + ok_(__FILE__,line)(b == exval, "contains returned %x, expected %x\n", b, exval); +} + #define get_first_child(n) _get_first_child(__LINE__,n) static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) { @@ -5301,13 +5313,23 @@ static void test_elems(IHTMLDocument2 *doc) elem2 = test_elem_get_parent((IUnknown*)elem); ok(elem2 != NULL, "elem2 == NULL\n"); test_node_name((IUnknown*)elem2, "BODY"); + elem3 = test_elem_get_parent((IUnknown*)elem2); - IHTMLElement_Release(elem2); ok(elem3 != NULL, "elem3 == NULL\n"); test_node_name((IUnknown*)elem3, "HTML"); + + test_elem_contains(elem3, elem2, VARIANT_TRUE); + test_elem_contains(elem3, elem, VARIANT_TRUE); + test_elem_contains(elem2, elem, VARIANT_TRUE); + test_elem_contains(elem2, elem3, VARIANT_FALSE); + test_elem_contains(elem, elem3, VARIANT_FALSE); + test_elem_contains(elem, elem2, VARIANT_FALSE); + test_elem_contains(elem, elem, VARIANT_TRUE); + IHTMLElement_Release(elem2); + elem2 = test_elem_get_parent((IUnknown*)elem3); - IHTMLElement_Release(elem3); ok(elem2 == NULL, "elem2 != NULL\n"); + IHTMLElement_Release(elem3); test_elem_getelembytag((IUnknown*)elem, ET_OPTION, 2); test_elem_getelembytag((IUnknown*)elem, ET_SELECT, 0);

1 0

Piotr Caban : ntdll: Added processor cache information to SystemLogicalProcessorInformation ( linux).
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: a3d0a19624c2a843b910a87b72123df0e65fdeb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d0a19624c2a843b910a87b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 4 13:38:17 2012 +0200 ntdll: Added processor cache information to SystemLogicalProcessorInformation (linux). --- dlls/ntdll/nt.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 99 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3f0f6d1..0b18d24 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1347,12 +1347,35 @@ static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMAT return TRUE; } +static inline BOOL logical_proc_info_add_cache(SYSTEM_LOGICAL_PROCESSOR_INFORMATION *data, + DWORD *len, DWORD max_len, ULONG_PTR mask, CACHE_DESCRIPTOR *cache) +{ + int i; + + for(i=0; i<*len; i++) + { + if(data[i].Relationship==RelationCache && data[i].ProcessorMask==mask + && data[i].u.Cache.Level==cache->Level && data[i].u.Cache.Type==cache->Type) + return TRUE; + } + + if(*len == max_len) + return FALSE; + + data[i].Relationship = RelationCache; + data[i].ProcessorMask = mask; + data[i].u.Cache = *cache; + *len = i+1; + return TRUE; +} + static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, DWORD *max_len) { static const char core_info[] = "/sys/devices/system/cpu/cpu%d/%s"; + static const char cache_info[] = "/sys/devices/system/cpu/cpu%d/cache/index%d/%s"; FILE *fcpu_list, *f; - DWORD len = 0, beg, end, i, r; + DWORD len = 0, beg, end, i, j, r; char op, name[MAX_PATH]; fcpu_list = fopen("/sys/devices/system/cpu/online", "r"); @@ -1421,6 +1444,81 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** *data = new_data; logical_proc_info_add_by_id(*data, &len, *max_len, RelationProcessorPackage, r, i); } + + for(j=0; j<4; j++) + { + CACHE_DESCRIPTOR cache; + ULONG_PTR mask = 0; + + sprintf(name, cache_info, i, j, "shared_cpu_map"); + f = fopen(name, "r"); + if(!f) continue; + while(!feof(f)) + { + if(!fscanf(f, "%x%c ", &r, &op)) + break; + mask = (sizeof(ULONG_PTR)>sizeof(int) ? mask<<(8*sizeof(DWORD)) : 0) + r; + } + fclose(f); + + sprintf(name, cache_info, i, j, "level"); + f = fopen(name, "r"); + if(!f) continue; + fscanf(f, "%u", &r); + fclose(f); + cache.Level = r; + + sprintf(name, cache_info, i, j, "ways_of_associativity"); + f = fopen(name, "r"); + if(!f) continue; + fscanf(f, "%u", &r); + fclose(f); + cache.Associativity = r; + + sprintf(name, cache_info, i, j, "coherency_line_size"); + f = fopen(name, "r"); + if(!f) continue; + fscanf(f, "%u", &r); + fclose(f); + cache.LineSize = r; + + sprintf(name, cache_info, i, j, "size"); + f = fopen(name, "r"); + if(!f) continue; + fscanf(f, "%u%c", &r, &op); + fclose(f); + if(op != 'K') + WARN("unknown cache size %u%c\n", r, op); + cache.Size = (op=='K' ? r*1024 : r); + + sprintf(name, cache_info, i, j, "type"); + f = fopen(name, "r"); + if(!f) continue; + fscanf(f, "%s", name); + fclose(f); + if(!memcmp(name, "Data", 5)) + cache.Type = CacheData; + else if(!memcmp(name, "Instruction", 11)) + cache.Type = CacheInstruction; + else + cache.Type = CacheUnified; + + if(!logical_proc_info_add_cache(*data, &len, *max_len, mask, &cache)) + { + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; + + *max_len *= 2; + new_data = RtlReAllocateHeap(GetProcessHeap(), 0, *data, *max_len*sizeof(*new_data)); + if(!new_data) + { + fclose(fcpu_list); + return STATUS_NO_MEMORY; + } + + *data = new_data; + logical_proc_info_add_cache(*data, &len, *max_len, mask, &cache); + } + } } } fclose(fcpu_list);

1 0

Jacek Caban : mshtml: Properly expose frame and iframe element' s windows to scripts.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 4ff0a82416e61a99e7b30a0c4c2a525b008bff1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff0a82416e61a99e7b30a0c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 4 13:58:39 2012 +0200 mshtml: Properly expose frame and iframe element's windows to scripts. --- dlls/mshtml/htmlwindow.c | 44 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/tests/jstest.html | 7 ++++++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2ec4a7f..2ed3ca7 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2358,7 +2358,25 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(hres != DISP_E_UNKNOWNNAME) return hres; - if(window->base.inner_window->doc) { + if(This->outer_window) { + HTMLOuterWindow *frame; + + hres = get_frame_by_name(This->outer_window, bstrName, FALSE, &frame); + if(SUCCEEDED(hres) && frame) { + global_prop_t *prop; + + IHTMLWindow2_Release(&frame->base.IHTMLWindow2_iface); + + prop = alloc_global_prop(window, GLOBAL_FRAMEVAR, bstrName); + if(!prop) + return E_OUTOFMEMORY; + + *pid = prop_to_dispid(window, prop); + return S_OK; + } + } + + if(window->doc) { global_prop_t *prop; IHTMLElement *elem; @@ -2603,6 +2621,30 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD FIXME("Not supported flags: %x\n", flags); return E_NOTIMPL; } + case GLOBAL_FRAMEVAR: + if(!This->base.outer_window) + return E_UNEXPECTED; + + switch(flags) { + case DISPATCH_PROPERTYGET: { + HTMLOuterWindow *frame; + + hres = get_frame_by_name(This->base.outer_window, prop->name, FALSE, &frame); + if(FAILED(hres)) + return hres; + + if(!frame) + return DISP_E_MEMBERNOTFOUND; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)&frame->base.inner_window->base.IHTMLWindow2_iface; + IDispatch_AddRef(V_DISPATCH(res)); + return S_OK; + } + default: + FIXME("Not supported flags: %x\n", flags); + return E_NOTIMPL; + } case GLOBAL_DISPEXVAR: return IDispatchEx_InvokeEx(&This->dispex.IDispatchEx_iface, prop->id, 0, flags, params, res, ei, caller); default: diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f23dc10..9f10382 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -294,7 +294,8 @@ typedef struct ScriptHost ScriptHost; typedef enum { GLOBAL_SCRIPTVAR, GLOBAL_ELEMENTVAR, - GLOBAL_DISPEXVAR + GLOBAL_DISPEXVAR, + GLOBAL_FRAMEVAR } global_prop_type_t; typedef struct { diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 99eca1a..d9d6da5 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -68,6 +68,13 @@ function test_document_name_as_index() { ok(window.formname === 1, "window.formname = " + window.formname); formname = 2; ok(window.formname === 2, "window.formname = " + window.formname); + + document.body.innerHTML = '<iframe id="iframeid"></iframe>'; + ok("iframeid" in window, "iframeid is not in window"); + e = document.getElementById("iframeid"); + ok(!!e, "e is null"); + ok(iframeid != e, "iframeid == e"); + ok(iframeid.frameElement === e, "frameid != e.contentWindow"); } function test_remove_style_attribute() {

1 0

Jacek Caban : mshtml: Added IHTMLStyle::put_pixelWidth implementation.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: d898f27af4f6e84fbdad403a0940eda1c6e88aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d898f27af4f6e84fbdad403a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 4 13:59:09 2012 +0200 mshtml: Added IHTMLStyle::put_pixelWidth implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++++-- dlls/mshtml/tests/style.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 1e068b1..cb164dc 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -594,6 +594,15 @@ static inline HRESULT set_style_pos(HTMLStyle *This, styleid_t sid, float value) return set_style_attr(This, sid, szValue, 0); } +static HRESULT set_style_pxattr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, LONG value) +{ + WCHAR value_str[16]; + + sprintfW(value_str, px_formatW, value); + + return set_nsstyle_attr(nsstyle, sid, value_str, 0); +} + static HRESULT get_nsstyle_pos(HTMLStyle *This, styleid_t sid, float *p) { nsAString str_value; @@ -2376,8 +2385,10 @@ static HRESULT WINAPI HTMLStyle_get_pixelLeft(IHTMLStyle *iface, LONG *p) static HRESULT WINAPI HTMLStyle_put_pixelWidth(IHTMLStyle *iface, LONG v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_style_pxattr(This->nsstyle, STYLEID_WIDTH, v); } static HRESULT WINAPI HTMLStyle_get_pixelWidth(IHTMLStyle *iface, LONG *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index b44950c..0584ef4 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -826,6 +826,16 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "100px"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + hres = IHTMLStyle_put_pixelWidth(style, 50); + ok(hres == S_OK, "put_pixelWidth failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_width(style, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "50px"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + /* margin tests */ str = (void*)0xdeadbeef; hres = IHTMLStyle_get_margin(style, &str);

1 0

Chae Jong Bin : netapi32: Add stub for NetScheduleJobAdd.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: ecdd6c58c5fe2991e06a4f159107bc65030cd762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecdd6c58c5fe2991e06a4f159… Author: Chae Jong Bin <chae(a)trunk.so> Date: Sat Sep 1 19:09:07 2012 -0400 netapi32: Add stub for NetScheduleJobAdd. --- dlls/netapi32/netapi32.c | 6 ++++++ dlls/netapi32/netapi32.spec | 2 +- include/lmat.h | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 470adf0..f6c6d20 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -238,6 +238,12 @@ NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWOR return ERROR_NOT_SUPPORTED; } +NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR server, LPBYTE bufptr, LPDWORD jobid) +{ + FIXME("stub (%s, %p, %p)\n", debugstr_w(server), bufptr, jobid); + return NERR_Success; +} + NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) { diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index f577010..50e7b0e 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -166,7 +166,7 @@ @ stub NetRplWkstaEnum @ stub NetRplWkstaGetInfo @ stub NetRplWkstaSetInfo -@ stub NetScheduleJobAdd +@ stdcall NetScheduleJobAdd(wstr ptr ptr) @ stub NetScheduleJobDel @ stdcall NetScheduleJobEnum(wstr ptr long ptr ptr ptr) @ stub NetScheduleJobGetInfo diff --git a/include/lmat.h b/include/lmat.h index f5b6883..fe8a9c0 100644 --- a/include/lmat.h +++ b/include/lmat.h @@ -25,6 +25,7 @@ extern "C" { #endif +NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR,LPBYTE,LPDWORD); NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); #ifdef __cplusplus

1 0