June 2018 - Wine-commits - list.winehq.org

Piotr Caban : msvcp120: Fix function passed to _Concurrent_vector_base_v4: :_Internal_clear.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 905aa3cb0df31eb645c0d81d0b274dbb6c7a7f48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=905aa3cb0df31eb645c0d81d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 12:38:56 2018 +0200 msvcp120: Fix function passed to _Concurrent_vector_base_v4::_Internal_clear. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 969902d..65f445f 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -36,7 +36,7 @@ struct expect_struct { DEFINE_EXPECT(queue_char__Copy_item); DEFINE_EXPECT(queue_char__Assign_and_destroy_item); DEFINE_EXPECT(concurrent_vector_int_alloc); - DEFINE_EXPECT(concurrent_vector_int_free); + DEFINE_EXPECT(concurrent_vector_int_destroy); }; #define SET_EXPECT(func) \ @@ -2454,10 +2454,10 @@ static void* __cdecl concurrent_vector_int_alloc(vector_base_v4 *this, size_t n) return malloc(n*sizeof(int)); } -static void __cdecl concurrent_vector_int_free(void *ptr, size_t n) +static void __cdecl concurrent_vector_int_destroy(void *ptr, size_t n) { - CHECK_EXPECT2(concurrent_vector_int_free); - free(ptr); + CHECK_EXPECT2(concurrent_vector_int_destroy); + memset(ptr, 0xff, sizeof(int)*n); } static void concurrent_vector_int_ctor(vector_base_v4 *this) @@ -2467,6 +2467,20 @@ static void concurrent_vector_int_ctor(vector_base_v4 *this) this->segment = &this->storage[0]; } +static void concurrent_vector_int_dtor(vector_base_v4 *this) +{ + size_t blocks; + + blocks = (size_t)call_func2(p_vector_base_v4__Internal_clear, + this, concurrent_vector_int_destroy); + while(this->first_block && blocks >= this->first_block) { + free(this->segment[blocks - this->first_block]); + blocks--; + } + + call_func1(p_vector_base_v4_dtor, this); +} + static void test_queue_base_v4(void) { queue_base_v4 queue; @@ -2731,16 +2745,16 @@ static void test_vector_base_v4(void) size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); ok(size == 8, "size of vector got %ld expected 8\n", (long)size); - SET_EXPECT(concurrent_vector_int_free); + SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, - &vector, concurrent_vector_int_free); - CHECK_CALLED(concurrent_vector_int_free); + &vector, concurrent_vector_int_destroy); + CHECK_CALLED(concurrent_vector_int_destroy); ok(size == 3, "_Internal_clear returned %ld\n", (long)size); ok(vector.first_block == 1, "vector.first_block got %ld expected 1\n", (long)vector.first_block); ok(vector.early_size == 0, "vector.early_size got %ld expected 0\n", (long)vector.early_size); - call_func1(p_vector_base_v4_dtor, &vector); + concurrent_vector_int_dtor(&vector); } START_TEST(msvcp120)

1 0

Piotr Caban : msvcp120: Add alloc/ free count validation tests in _Concurrent_vector_base_v4.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 0abe7b4e5487b358aa3dd15c3b5523249d2e262d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0abe7b4e5487b358aa3dd15c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 12:39:10 2018 +0200 msvcp120: Add alloc/free count validation tests in _Concurrent_vector_base_v4. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 65f445f..1247222 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -25,6 +25,7 @@ #include "winbase.h" DWORD expect_idx; +static int vector_alloc_count; #define DEFINE_EXPECT(func) \ BOOL expect_ ## func, called_ ## func @@ -2451,6 +2452,7 @@ static DWORD WINAPI queue_pop_thread(void*arg) static void* __cdecl concurrent_vector_int_alloc(vector_base_v4 *this, size_t n) { CHECK_EXPECT(concurrent_vector_int_alloc); + vector_alloc_count++; return malloc(n*sizeof(int)); } @@ -2474,6 +2476,7 @@ static void concurrent_vector_int_dtor(vector_base_v4 *this) blocks = (size_t)call_func2(p_vector_base_v4__Internal_clear, this, concurrent_vector_int_destroy); while(this->first_block && blocks >= this->first_block) { + vector_alloc_count--; free(this->segment[blocks - this->first_block]); blocks--; } @@ -2755,6 +2758,8 @@ static void test_vector_base_v4(void) ok(vector.early_size == 0, "vector.early_size got %ld expected 0\n", (long)vector.early_size); concurrent_vector_int_dtor(&vector); + + ok(!vector_alloc_count, "vector_alloc_count = %d, expected 0\n", vector_alloc_count); } START_TEST(msvcp120)

1 0

Jacek Caban : mshtml: Added IHTMLWindow7:: performance property implementation.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 83f845dfa1bb4a6ec6e8b7f65e9469dc9a8a7787 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83f845dfa1bb4a6ec6e8b7f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 14 17:35:14 2018 +0200 mshtml: Added IHTMLWindow7::performance property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 35 +++++++-- dlls/mshtml/mshtml_private.h | 5 ++ dlls/mshtml/omnavigator.c | 164 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 13 +++- 4 files changed, 210 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 364dae8..401d19d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2315,16 +2315,39 @@ static HRESULT WINAPI HTMLWindow7_get_styleMedia(IHTMLWindow7 *iface, IHTMLStyle static HRESULT WINAPI HTMLWindow7_put_performance(IHTMLWindow7 *iface, VARIANT v) { - HTMLWindow *This = impl_from_IHTMLWindow7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + HTMLInnerWindow *This = impl_from_IHTMLWindow7(iface)->inner_window; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(!This->performance_initialized) { + V_VT(&This->performance) = VT_EMPTY; + This->performance_initialized = TRUE; + } + + return VariantCopy(&This->performance, &v); } static HRESULT WINAPI HTMLWindow7_get_performance(IHTMLWindow7 *iface, VARIANT *p) { - HTMLWindow *This = impl_from_IHTMLWindow7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLInnerWindow *This = impl_from_IHTMLWindow7(iface)->inner_window; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->performance_initialized) { + IHTMLPerformance *performance; + + hres = create_performance(&performance); + if(FAILED(hres)) + return hres; + + V_VT(&This->performance) = VT_DISPATCH; + V_DISPATCH(&This->performance) = (IDispatch*)performance; + This->performance_initialized = TRUE; + } + + V_VT(p) = VT_NULL; + return VariantCopy(p, &This->performance); } static HRESULT WINAPI HTMLWindow7_get_innerWidth(IHTMLWindow7 *iface, LONG *p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 62879e0..e28ecbc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -199,6 +199,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLObjectElement2) \ XIID(IHTMLOptionElement) \ XIID(IHTMLOptionElementFactory) \ + XIID(IHTMLPerformance) \ XIID(IHTMLPluginsCollection) \ XIID(IHTMLRect) \ XIID(IHTMLScreen) \ @@ -522,6 +523,9 @@ struct HTMLInnerWindow { OmHistory *history; IHTMLStorage *session_storage; + BOOL performance_initialized; + VARIANT performance; + unsigned parser_callback_cnt; struct list script_queue; @@ -870,6 +874,7 @@ HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFact HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN; +HRESULT create_performance(IHTMLPerformance**) DECLSPEC_HIDDEN; HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; HRESULT create_dom_implementation(IHTMLDOMImplementation**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 406e7f5..faf15f0 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1320,3 +1320,167 @@ IOmNavigator *OmNavigator_Create(void) return &ret->IOmNavigator_iface; } + +typedef struct { + DispatchEx dispex; + IHTMLPerformance IHTMLPerformance_iface; + LONG ref; +} HTMLPerformance; + +static inline HTMLPerformance *impl_from_IHTMLPerformance(IHTMLPerformance *iface) +{ + return CONTAINING_RECORD(iface, HTMLPerformance, IHTMLPerformance_iface); +} + +static HRESULT WINAPI HTMLPerformance_QueryInterface(IHTMLPerformance *iface, REFIID riid, void **ppv) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &This->IHTMLPerformance_iface; + }else if(IsEqualGUID(&IID_IHTMLPerformance, riid)) { + *ppv = &This->IHTMLPerformance_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLPerformance_AddRef(IHTMLPerformance *iface) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLPerformance_Release(IHTMLPerformance *iface) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLPerformance_GetTypeInfoCount(IHTMLPerformance *iface, UINT *pctinfo) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPerformance_GetTypeInfo(IHTMLPerformance *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLPerformance_GetIDsOfNames(IHTMLPerformance *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLPerformance_Invoke(IHTMLPerformance *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLPerformance_get_navigation(IHTMLPerformance *iface, + IHTMLPerformanceNavigation **p) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPerformance_get_timing(IHTMLPerformance *iface, IHTMLPerformanceTiming **p) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPerformance_toString(IHTMLPerformance *iface, BSTR *string) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + FIXME("(%p)->(%p)\n", This, string); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPerformance_toJSON(IHTMLPerformance *iface, VARIANT *var) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + FIXME("(%p)->(%p)\n", This, var); + return E_NOTIMPL; +} + +static const IHTMLPerformanceVtbl HTMLPerformanceVtbl = { + HTMLPerformance_QueryInterface, + HTMLPerformance_AddRef, + HTMLPerformance_Release, + HTMLPerformance_GetTypeInfoCount, + HTMLPerformance_GetTypeInfo, + HTMLPerformance_GetIDsOfNames, + HTMLPerformance_Invoke, + HTMLPerformance_get_navigation, + HTMLPerformance_get_timing, + HTMLPerformance_toString, + HTMLPerformance_toJSON +}; + +static const tid_t HTMLPerformance_iface_tids[] = { + IHTMLPerformance_tid, + 0 +}; +static dispex_static_data_t HTMLPerformance_dispex = { + NULL, + IHTMLPerformance_tid, + HTMLPerformance_iface_tids +}; + +HRESULT create_performance(IHTMLPerformance **ret) +{ + HTMLPerformance *performance; + + performance = heap_alloc_zero(sizeof(*performance)); + if(!performance) + return E_OUTOFMEMORY; + + performance->IHTMLPerformance_iface.lpVtbl = &HTMLPerformanceVtbl; + performance->ref = 1; + + init_dispex(&performance->dispex, (IUnknown*)&performance->IHTMLPerformance_iface, + &HTMLPerformance_dispex); + + *ret = &performance->IHTMLPerformance_iface; + return S_OK; +} diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3f08a23..69b6206 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6851,7 +6851,6 @@ static void test_window(IHTMLDocument2 *doc) ok(window7 != NULL, "window7 == NULL\n"); hres = IHTMLWindow7_get_performance(window7, &v); - todo_wine ok(hres == S_OK, "get_performance failed: %08x\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&v) == VT_DISPATCH, "V_VT(performance) = %u\n", V_VT(&v)); @@ -6861,6 +6860,18 @@ static void test_window(IHTMLDocument2 *doc) ok(hres == S_OK, "Could not get IHTMLPerformance iface: %08x\n", hres); IHTMLPerformance_Release(performance); + + V_VT(&v) = VT_I2; + V_I2(&v) = 2; + hres = IHTMLWindow7_put_performance(window7, v); + ok(hres == S_OK, "put_performance failed: %08x\n", hres); + + V_VT(&v) = VT_ERROR; + hres = IHTMLWindow7_get_performance(window7, &v); + ok(hres == S_OK, "get_performance failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(performance) = %u\n", V_VT(&v)); + ok(V_I2(&v) == 2, "V_I2(performance) = %d\n", V_I2(&v)); + IHTMLWindow7_Release(window7); } }else {

1 0

Zebediah Figura : winedbg: Implement debugging 32-bit processes on x86_64.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 5caaba7e3e8e283f11bb9ce79cb68c4bca2c44f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5caaba7e3e8e283f11bb9ce7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 13 16:34:00 2018 -0500 winedbg: Implement debugging 32-bit processes on x86_64. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_i386.c | 22 ++++++++++++---------- programs/winedbg/db_disasm.c | 4 ++-- programs/winedbg/winedbg.c | 21 ++++++++------------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index f46ebb1..4e279ec 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -21,7 +21,7 @@ #include "debugger.h" #include "wine/debug.h" -#ifdef __i386__ +#if defined(__i386__) || defined(__x86_64__) WINE_DEFAULT_DEBUG_CHANNEL(winedbg); @@ -33,6 +33,7 @@ extern void be_i386_disasm_one_insn(ADDRESS64* addr, int display); #define IS_VM86_MODE(ctx) (ctx->EFlags & V86_FLAG) +#ifndef __x86_64__ typedef struct DECLSPEC_ALIGN(16) _M128A { ULONGLONG Low; LONGLONG High; @@ -56,6 +57,7 @@ typedef struct _XMM_SAVE_AREA32 { M128A XmmRegisters[16]; /* 0a0 */ BYTE Reserved4[96]; /* 1a0 */ } XMM_SAVE_AREA32, *PXMM_SAVE_AREA32; +#endif static ADDRESS_MODE get_selector_type(HANDLE hThread, const WOW64_CONTEXT *ctx, WORD sel) { @@ -77,18 +79,18 @@ static void* be_i386_linearize(HANDLE hThread, const ADDRESS64* addr) switch (addr->Mode) { case AddrModeReal: - return (void*)((DWORD)(LOWORD(addr->Segment) << 4) + (DWORD)addr->Offset); + return (void*)((DWORD_PTR)(LOWORD(addr->Segment) << 4) + (DWORD_PTR)addr->Offset); case AddrMode1632: if (!(addr->Segment & 4) || ((addr->Segment >> 3) < 17)) - return (void*)(DWORD)addr->Offset; + return (void*)(DWORD_PTR)addr->Offset; /* fall through */ case AddrMode1616: if (!dbg_curr_process->process_io->get_selector(hThread, addr->Segment, &le)) return NULL; return (void*)((le.HighWord.Bits.BaseHi << 24) + (le.HighWord.Bits.BaseMid << 16) + le.BaseLow + - (DWORD)addr->Offset); + (DWORD_PTR)addr->Offset); case AddrModeFlat: - return (void*)(DWORD)addr->Offset; + return (void*)(DWORD_PTR)addr->Offset; } return NULL; } @@ -502,7 +504,7 @@ static BOOL be_i386_is_func_call(const void* insn, ADDRESS64* callee) if (!fetch_value((const char*)insn + 1, operand_size, &delta)) return FALSE; callee->Segment = dbg_context.x86.SegCs; - callee->Offset = (DWORD)insn + 1 + (operand_size / 8) + delta; + callee->Offset = (DWORD_PTR)insn + 1 + (operand_size / 8) + delta; return TRUE; case 0x9a: /* absolute far call */ @@ -589,11 +591,11 @@ static BOOL be_i386_is_func_call(const void* insn, ADDRESS64* callee) } if (((ch >> 3) & 0x07) == 0x03) /* LCALL */ { - if (!dbg_read_memory((const char*)dst + operand_size, &segment, sizeof(segment))) + if (!dbg_read_memory((const char*)(UINT_PTR)dst + operand_size, &segment, sizeof(segment))) return FALSE; } else segment = dbg_context.x86.SegCs; - if (!dbg_read_memory((const char*)dst, &delta, sizeof(delta))) + if (!dbg_read_memory((const char*)(UINT_PTR)dst, &delta, sizeof(delta))) return FALSE; callee->Mode = get_selector_type(dbg_curr_thread->handle, &dbg_context.x86, segment); @@ -643,7 +645,7 @@ static BOOL be_i386_is_jump(const void* insn, ADDRESS64* jumpee) if (!fetch_value((const char*)insn + 1, operand_size, &delta)) return FALSE; jumpee->Segment = dbg_context.x86.SegCs; - jumpee->Offset = (DWORD)insn + 1 + (operand_size / 8) + delta; + jumpee->Offset = (DWORD_PTR)insn + 1 + (operand_size / 8) + delta; return TRUE; default: WINE_FIXME("unknown %x\n", ch); return FALSE; } @@ -733,7 +735,7 @@ static BOOL be_i386_insert_Xpoint(HANDLE hProcess, const struct be_process_io* p bits = DR7_RW_WRITE; hw_bp: if ((reg = be_i386_get_unused_DR(ctx, &pr)) == -1) return FALSE; - *pr = (DWORD)addr; + *pr = (DWORD_PTR)addr; if (type != be_xpoint_watch_exec) switch (size) { case 4: bits |= DR7_LEN_4; break; diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index 9bdfb90..f57f009 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -64,7 +64,7 @@ #include "debugger.h" -#ifdef __i386__ +#if defined(__i386__) || defined(__x86_64__) /* * Switch to disassemble 16-bit code. @@ -1225,7 +1225,7 @@ static void db_print_address(const char *seg, int size, struct i_addr *addrp, in void* a2; dbg_printf("0x%x -> ", addrp->disp); - if (!dbg_read_memory((void*)addrp->disp, &a1, sizeof(a1))) { + if (!dbg_read_memory((void*)(INT_PTR)addrp->disp, &a1, sizeof(a1))) { dbg_printf("(invalid source)"); } else if (!dbg_read_memory(a1, &a2, sizeof(a2))) { dbg_printf("(invalid destination)"); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index b5ffd76..1ac4187 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -284,6 +284,7 @@ extern struct backend_cpu be_i386; #elif defined(__powerpc__) extern struct backend_cpu be_ppc; #elif defined(__x86_64__) +extern struct backend_cpu be_i386; extern struct backend_cpu be_x86_64; #elif defined(__arm__) && !defined(__ARMEB__) extern struct backend_cpu be_arm; @@ -296,21 +297,13 @@ extern struct backend_cpu be_arm64; struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, HANDLE h) { struct dbg_process* p; + BOOL wow64; if ((p = dbg_get_process(pid))) - { - if (p->handle != 0) - { - WINE_ERR("Process (%04x) is already defined\n", pid); - } - else - { - p->handle = h; - p->process_io = pio; - p->imageName = NULL; - } return p; - } + + if (!h) + h = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); if (!(p = HeapAlloc(GetProcessHeap(), 0, sizeof(struct dbg_process)))) return NULL; p->handle = h; @@ -333,12 +326,14 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, list_add_head(&dbg_process_list, &p->entry); + IsWow64Process(h, &wow64); + #ifdef __i386__ p->be_cpu = &be_i386; #elif defined(__powerpc__) p->be_cpu = &be_ppc; #elif defined(__x86_64__) - p->be_cpu = &be_x86_64; + p->be_cpu = wow64 ? &be_i386 : &be_x86_64; #elif defined(__arm__) && !defined(__ARMEB__) p->be_cpu = &be_arm; #elif defined(__aarch64__) && !defined(__AARCH64EB__)

1 0

Francois Gouget : testbot/build: Save the full list of Wine files.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: tools Branch: master Commit: df71920b8680b33367b231b6de20c2aa204de2ae URL: https://source.winehq.org/git/tools.git/?a=commit;h=df71920b8680b33367b231b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 10:37:30 2018 +0200 testbot/build: Save the full list of Wine files. The list can later be used by the TestBot to better identify Wine patches. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 3a555af..14a5985 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -42,7 +42,7 @@ use WineTestBot::Config; =item C<UpdateWineData()> Updates the summary information about the Wine source such as the list of -tests (testlist.txt). +tests (testlist.txt) and the full list of Wine files. =back =cut @@ -51,6 +51,11 @@ sub UpdateWineData($) { my ($WineDir) = @_; + mkdir "$DataDir/latest" if (!-d "$DataDir/latest"); + + my $ErrMessage = `cd '$WineDir' && git ls-tree -r --name-only HEAD 2>&1 >'$DataDir/latest/winefiles.txt'`; + return $ErrMessage if ($? != 0); + if (open(my $fh, ">", "$DataDir/testlist.txt")) { foreach my $TestFile (glob("$WineDir/*/*/tests/*.c"),

1 0

Francois Gouget : testbot/web: Deprecate the patchprograms Step file type.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: tools Branch: master Commit: a70473532c96cae75bf50c54632bcc063d659d27 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a70473532c96cae75bf50c5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 10:37:44 2018 +0200 testbot/web: Deprecate the patchprograms Step file type. The patchdlls / patchprograms Step::FileType distinction is obsolete since build steps may now have to handle patches that include both. So as a first step standardize on patchdlls to identify patch files. Later on support for patchprograms can be removed altogether. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 1 - testbot/web/Submit.pl | 19 +++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 14a5985..ec609d9 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -115,7 +115,6 @@ sub _AddTest($$$) my $ExeBase = ($Root eq "programs") ? "${Module}.exe_test" : "${Module}_test"; $Tests->{$Module} = { - "Type" => "patch$Root", "Module" => $Module, "Path" => "$Root/$Module/tests", "ExeBase" => $ExeBase, diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 97f31d1..1425301 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -118,8 +118,7 @@ sub GetPropertyDescriptors($) } elsif ($self->{Page} == 3) { - my $IsPatch = ($self->GetParam("FileType") eq "patchdlls" || - $self->GetParam("FileType") eq "patchprograms"); + my $IsPatch = ($self->GetParam("FileType") eq "patchdlls"); $self->{PropertyDescriptors3}[0]->{IsRequired} = $IsPatch; return $self->{PropertyDescriptors3}; } @@ -386,8 +385,7 @@ sub DisplayProperty($$) if ($self->{Page} == 3) { my $PropertyName = $PropertyDescriptor->GetName(); - if ($self->GetParam("FileType") eq "patchdlls" || - $self->GetParam("FileType") eq "patchprograms") + if ($self->GetParam("FileType") eq "patchdlls") { if ($PropertyName eq "Run64") { @@ -477,8 +475,6 @@ sub Validate($) { if (($self->GetParam("FileType") eq "patchdlls" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || - ($self->GetParam("FileType") eq "patchprograms" && - $self->GetParam("TestExecutable") !~ m/^[\w_.]+\.exe_test\.exe$/) || ($self->GetParam("TestExecutable") =~ m=(?:[a-z]:|[/\\])=i)) { $self->{ErrField} = "TestExecutable"; @@ -603,7 +599,7 @@ sub DetermineFileType($$) else { my $TestInfo = (values %{$Impacts->{Tests}})[0]; - $FileType = $TestInfo->{Type}; + $FileType = "patchdlls"; $ExeBase = $TestInfo->{ExeBase}; $TestUnit = (keys %{$TestInfo->{Units}})[0]; } @@ -651,8 +647,7 @@ sub OnPage1Next($) $self->{ErrMessage} = $ErrMessage; return !1; } - if ($FileType ne "patchdlls" && $FileType ne "patchprograms" && - $FileType ne "exe32" && $FileType ne "exe64") + if ($FileType !~ /^(?:exe32|exe64|patchdlls)$/) { $self->{ErrField} = "File"; $self->{ErrMessage} = "Unrecognized file type"; @@ -772,7 +767,7 @@ sub OnSubmit($) my $BuildStep; my $FileType = $self->GetParam("FileType"); - if ($FileType eq "patchdlls" || $FileType eq "patchprograms") + if ($FileType eq "patchdlls") { # This is a patch so add a build step... $BuildStep = $Steps->Add(); @@ -805,7 +800,7 @@ sub OnSubmit($) { next if ($Bits eq "32" && $FileType eq "exe64"); next if ($Bits eq "64" && $FileType eq "exe32"); - next if ($Bits eq "64" && $FileType =~ /^patch/ && !defined($self->GetParam("Run64"))); + next if ($Bits eq "64" && $FileType eq "patchdlls" && !defined($self->GetParam("Run64"))); my $Tasks; my $VMs = CreateVMs(); @@ -821,7 +816,7 @@ sub OnSubmit($) { # First create the test step my $TestStep = $Steps->Add(); - if ($FileType eq "patchdlls" || $FileType eq "patchprograms") + if ($FileType eq "patchdlls") { $TestStep->PreviousNo($BuildStep->No); my $TestExe = basename($self->GetParam("TestExecutable"));

1 0

Francois Gouget : testbot/web: Only create a build step if there are VMs that need it.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: tools Branch: master Commit: 163f82f5ce26a965f3869f19eef15b16aa1107b0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=163f82f5ce26a965f3869f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 10:38:35 2018 +0200 testbot/web: Only create a build step if there are VMs that need it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 65 ++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 1425301..c16b99f 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -2,6 +2,7 @@ # WineTestBot job submit page # # Copyright 2009 Ge van Geldorp +# Copyright 2012-2014, 2017-2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -765,44 +766,16 @@ sub OnSubmit($) } my $Steps = $NewJob->Steps; - my $BuildStep; - my $FileType = $self->GetParam("FileType"); - if ($FileType eq "patchdlls") - { - # This is a patch so add a build step... - $BuildStep = $Steps->Add(); - $BuildStep->FileName($BaseName); - $BuildStep->FileType($FileType); - $BuildStep->InStaging(!1); - $BuildStep->Type("build"); - $BuildStep->DebugLevel(0); - - # ...with a build task - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["build"]); - $VMs->AddFilter("Role", ["base"]); - my $BuildVM = ${$VMs->GetItems()}[0]; - my $Task = $BuildStep->Tasks->Add(); - $Task->VM($BuildVM); - $Task->Timeout($BuildTimeout); - - # Save the build step so the others can reference it - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) - { - $self->{ErrMessage} = $ErrMessage; - return !1; - } - } - # Add steps and tasks for the 32 and 64-bit tests + my $FileType = $self->GetParam("FileType"); + my $BuildStep; foreach my $Bits ("32", "64") { next if ($Bits eq "32" && $FileType eq "exe64"); next if ($Bits eq "64" && $FileType eq "exe32"); next if ($Bits eq "64" && $FileType eq "patchdlls" && !defined($self->GetParam("Run64"))); - my $Tasks; + my $Tasks; my $VMs = CreateVMs(); $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); @@ -814,7 +787,35 @@ sub OnSubmit($) if (!$Tasks) { - # First create the test step + if (!$BuildStep and $FileType eq "patchdlls") + { + # This is a patch so add a build step... + $BuildStep = $Steps->Add(); + $BuildStep->FileName($BaseName); + $BuildStep->FileType($FileType); + $BuildStep->InStaging(!1); + $BuildStep->Type("build"); + $BuildStep->DebugLevel(0); + + # ...with a build task + my $VMs = CreateVMs(); + $VMs->AddFilter("Type", ["build"]); + $VMs->AddFilter("Role", ["base"]); + my $BuildVM = ${$VMs->GetItems()}[0]; + my $Task = $BuildStep->Tasks->Add(); + $Task->VM($BuildVM); + $Task->Timeout($BuildTimeout); + + # Save the build step so the others can reference it + my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined($ErrMessage)) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + } + + # Then create the test step my $TestStep = $Steps->Add(); if ($FileType eq "patchdlls") {

1 0

Francois Gouget : testbot: Strip the prefix from the VM name for the WineTest tag.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: tools Branch: master Commit: d492b15ed705f281a08ae083b7c02a6792eeae92 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d492b15ed705f281a08ae08… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 11:48:36 2018 +0200 testbot: Strip the prefix from the VM name for the WineTest tag. This avoids duplication in case the VM names happen to have the same prefix that would be used for the WineTest reports. Also trust the administrator to know what to put in $TagPrefix (i.e. don't lowercase it). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3290b0b..8f5cb26 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -442,7 +442,8 @@ elsif ($Step->Type eq "suite") { $Keepalive = 60; $Script .= "$FileName "; - my $Tag = lc($TagPrefix) . "-" . lc($VM->Name); + my $Tag = lc($VM->Name); + $Tag =~ s/^$TagPrefix//; $Tag =~ s/[^a-zA-Z0-9]/-/g; if ($VM->Type eq "win64") { @@ -468,7 +469,7 @@ elsif ($Step->Type eq "suite") $Info =~ s/"/\\"/g; $Info =~ s/%/%%/g; $Info =~ s/%/%%/g; - $Script .= "-q -o $RptFileName -t $Tag -m \"$EMail\" -i \"$Info\"\r\n" . + $Script .= "-q -o $RptFileName -t $TagPrefix-$Tag -m \"$EMail\" -i \"$Info\"\r\n". "$FileName -q -s $RptFileName\r\n"; } Debug(Elapsed($Start), " Sending the script: [$Script]\n");

1 0

Francois Gouget : testbot/build: Add an empty line before the GitPull() message.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: tools Branch: master Commit: 470ba11e3159016d209aca8e0c91b5f925b9efcb URL: https://source.winehq.org/git/tools.git/?a=commit;h=470ba11e3159016d209aca8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 10:34:41 2018 +0200 testbot/build: Add an empty line before the GitPull() message. GitPull() is not the first command being run anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 706da25..32cbad7 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -125,7 +125,7 @@ sub BuildTestLauncher() sub GitPull() { - InfoMsg "Updating the Wine source\n"; + InfoMsg "\nUpdating the Wine source\n"; system("cd $DataDir/wine && git pull >>$LogFileName 2>&1"); if ($? != 0) {

1 0

Francois Gouget : testbot: Standardize and clean up the WineRun*.pl scripts logging.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: tools Branch: master Commit: 26467efe0d0fadd093321ebdc0a4dd4ff6ae8001 URL: https://source.winehq.org/git/tools.git/?a=commit;h=26467efe0d0fadd093321eb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 10:35:19 2018 +0200 testbot: Standardize and clean up the WineRun*.pl scripts logging. Also show which command is being run like the client-side scripts do. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 8 ++++---- testbot/bin/WineRunReconfig.pl | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 31decc1..96d9321 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -350,10 +350,10 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) { FatalTAError($TA, "Could not copy the patch to the VM"); } -my $Script = "#!/bin/sh\n" . - "rm -f Build.log\n" . - "../bin/build/Build.pl patch.diff ". join(",", keys %Bitnesses) . - " >>Build.log 2>&1\n"; +my $Script = "#!/bin/sh\n". + "( set -x\n". + " ../bin/build/Build.pl patch.diff ". join(",", sort keys %Bitnesses) ."\n". + ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 99b73da..4fb34a0 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -328,10 +328,12 @@ elsif ($Debug and !$VM->GetDomain()->IsPoweredOn()) # Run the build # -my $Script = "#!/bin/sh\n" . - "(" . - " git pull &&\n" . - " ../bin/build/Reconfig.pl\n" . +# Use our own log so it can be used for reference +# even after another task has run. +my $Script = "#!/bin/sh\n". + "( set -x\n". + " git pull &&\n". + " ../bin/build/Reconfig.pl\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n");

1 0