March 2016 - Wine-Commits - list.winehq.org

Hugh McMaster : regedit: Display REG_NONE values.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 5b3681f62ddd2977924424d6f326ce729de9102a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3681f62ddd2977924424d6f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 29 21:56:21 2016 +1100 regedit: Display REG_NONE values. REG_NONE values are displayed in hexadecimal. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index a305aa4..b9366e5 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -179,7 +179,8 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, ListView_SetItemTextW(hwndLV, index, 2, buf); } break; - case REG_BINARY: { + case REG_BINARY: + case REG_NONE: { unsigned int i; LPBYTE pData = ValBuf; LPWSTR strBinary = HeapAlloc(GetProcessHeap(), 0, dwCount * sizeof(WCHAR) * 3 + sizeof(WCHAR));

1 0

Alexandre Julliard : user32: Use kernel32 functions for character types and case conversions.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 11fcc61b6df0f3b33e85e56910a171c114ed5e50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11fcc61b6df0f3b33e85e5691… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 20:40:57 2016 +0900 user32: Use kernel32 functions for character types and case conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/lstr.c | 62 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/user32/lstr.c b/dlls/user32/lstr.c index a7e885a..a56e21c 100644 --- a/dlls/user32/lstr.c +++ b/dlls/user32/lstr.c @@ -31,11 +31,11 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "winuser.h" #include "winerror.h" #include "wine/exception.h" -#include "wine/unicode.h" /*********************************************************************** @@ -175,7 +175,7 @@ BOOL WINAPI CharToOemBuffW( LPCWSTR s, LPSTR d, DWORD len ) */ BOOL WINAPI CharToOemW( LPCWSTR s, LPSTR d ) { - return CharToOemBuffW( s, d, strlenW( s ) + 1 ); + return CharToOemBuffW( s, d, lstrlenW( s ) + 1 ); } @@ -280,20 +280,38 @@ LPSTR WINAPI CharUpperA(LPSTR str) /*********************************************************************** * CharLowerW (USER32.@) */ -LPWSTR WINAPI CharLowerW(LPWSTR x) +LPWSTR WINAPI CharLowerW( LPWSTR str ) { - if (!IS_INTRESOURCE(x)) return strlwrW(x); - else return (LPWSTR)((UINT_PTR)tolowerW(LOWORD(x))); + if (!IS_INTRESOURCE( str )) + { + CharLowerBuffW( str, lstrlenW( str )); + return str; + } + else + { + WCHAR ch = LOWORD( str ); + CharLowerBuffW( &ch, 1 ); + return (LPWSTR)(UINT_PTR)ch; + } } /*********************************************************************** * CharUpperW (USER32.@) */ -LPWSTR WINAPI CharUpperW(LPWSTR x) +LPWSTR WINAPI CharUpperW( LPWSTR str ) { - if (!IS_INTRESOURCE(x)) return struprW(x); - else return (LPWSTR)((UINT_PTR)toupperW(LOWORD(x))); + if (!IS_INTRESOURCE( str )) + { + CharUpperBuffW( str, lstrlenW( str )); + return str; + } + else + { + WCHAR ch = LOWORD( str ); + CharUpperBuffW( &ch, 1 ); + return (LPWSTR)(UINT_PTR)ch; + } } @@ -327,10 +345,8 @@ DWORD WINAPI CharLowerBuffA( LPSTR str, DWORD len ) */ DWORD WINAPI CharLowerBuffW( LPWSTR str, DWORD len ) { - DWORD ret = len; if (!str) return 0; /* YES */ - for (; len; len--, str++) *str = tolowerW(*str); - return ret; + return LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, str, len, str, len ); } @@ -364,10 +380,8 @@ DWORD WINAPI CharUpperBuffA( LPSTR str, DWORD len ) */ DWORD WINAPI CharUpperBuffW( LPWSTR str, DWORD len ) { - DWORD ret = len; if (!str) return 0; /* YES */ - for (; len; len--, str++) *str = toupperW(*str); - return ret; + return LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_UPPERCASE, str, len, str, len ); } @@ -386,9 +400,10 @@ BOOL WINAPI IsCharLowerA(CHAR x) /*********************************************************************** * IsCharLowerW (USER32.@) */ -BOOL WINAPI IsCharLowerW(WCHAR x) +BOOL WINAPI IsCharLowerW( WCHAR ch ) { - return (get_char_typeW(x) & C1_LOWER) != 0; + WORD type; + return GetStringTypeW( CT_CTYPE1, &ch, 1, &type ) && (type & C1_LOWER); } @@ -407,9 +422,10 @@ BOOL WINAPI IsCharUpperA(CHAR x) /*********************************************************************** * IsCharUpperW (USER32.@) */ -BOOL WINAPI IsCharUpperW(WCHAR x) +BOOL WINAPI IsCharUpperW( WCHAR ch ) { - return (get_char_typeW(x) & C1_UPPER) != 0; + WORD type; + return GetStringTypeW( CT_CTYPE1, &ch, 1, &type ) && (type & C1_UPPER); } @@ -428,9 +444,10 @@ BOOL WINAPI IsCharAlphaNumericA(CHAR x) /*********************************************************************** * IsCharAlphaNumericW (USER32.@) */ -BOOL WINAPI IsCharAlphaNumericW(WCHAR x) +BOOL WINAPI IsCharAlphaNumericW( WCHAR ch ) { - return (get_char_typeW(x) & (C1_ALPHA|C1_DIGIT)) != 0; + WORD type; + return GetStringTypeW( CT_CTYPE1, &ch, 1, &type ) && (type & (C1_ALPHA|C1_DIGIT)); } @@ -449,7 +466,8 @@ BOOL WINAPI IsCharAlphaA(CHAR x) /*********************************************************************** * IsCharAlphaW (USER32.@) */ -BOOL WINAPI IsCharAlphaW(WCHAR x) +BOOL WINAPI IsCharAlphaW( WCHAR ch ) { - return (get_char_typeW(x) & C1_ALPHA) != 0; + WORD type; + return GetStringTypeW( CT_CTYPE1, &ch, 1, &type ) && (type & C1_ALPHA); }

1 0

Nikolay Sivov : dxgi: Update to IDXGISurface1.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: b537beb60fbdb0cb38363bd64dab8cfc1d222658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b537beb60fbdb0cb38363bd64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 09:36:59 2016 +0300 dxgi: Update to IDXGISurface1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/surface.c | 73 ++++++++++++++++++++++++++++++------------------ dlls/dxgi/tests/device.c | 6 ++++ 4 files changed, 54 insertions(+), 29 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 1caf63b..a10bb01 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -304,7 +304,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa } TRACE("Created IDXGISurface %p\n", object); - *surface = outer ? &object->IUnknown_iface : (IUnknown *)&object->IDXGISurface_iface; + *surface = outer ? &object->IUnknown_iface : (IUnknown *)&object->IDXGISurface1_iface; return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 7fc1e63..86d8608 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -165,7 +165,7 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device /* IDXGISurface */ struct dxgi_surface { - IDXGISurface IDXGISurface_iface; + IDXGISurface1 IDXGISurface1_iface; IUnknown IUnknown_iface; IUnknown *outer_unknown; LONG refcount; diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 4ce9130..ba95758 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -37,13 +37,14 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_inner_QueryInterface(IUnknown *ifa TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IDXGISurface) + if (IsEqualGUID(riid, &IID_IDXGISurface1) + || IsEqualGUID(riid, &IID_IDXGISurface) || IsEqualGUID(riid, &IID_IDXGIDeviceSubObject) || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IUnknown)) { - IDXGISurface_AddRef(&surface->IDXGISurface_iface); - *out = &surface->IDXGISurface_iface; + IDXGISurface1_AddRef(&surface->IDXGISurface1_iface); + *out = &surface->IDXGISurface1_iface; return S_OK; } @@ -79,70 +80,70 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) return refcount; } -static inline struct dxgi_surface *impl_from_IDXGISurface(IDXGISurface *iface) +static inline struct dxgi_surface *impl_from_IDXGISurface1(IDXGISurface1 *iface) { - return CONTAINING_RECORD(iface, struct dxgi_surface, IDXGISurface_iface); + return CONTAINING_RECORD(iface, struct dxgi_surface, IDXGISurface1_iface); } /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface *iface, REFIID riid, +static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface1 *iface, REFIID riid, void **object) { - struct dxgi_surface *This = impl_from_IDXGISurface(iface); + struct dxgi_surface *This = impl_from_IDXGISurface1(iface); TRACE("Forwarding to outer IUnknown\n"); return IUnknown_QueryInterface(This->outer_unknown, riid, object); } -static ULONG STDMETHODCALLTYPE dxgi_surface_AddRef(IDXGISurface *iface) +static ULONG STDMETHODCALLTYPE dxgi_surface_AddRef(IDXGISurface1 *iface) { - struct dxgi_surface *This = impl_from_IDXGISurface(iface); + struct dxgi_surface *This = impl_from_IDXGISurface1(iface); TRACE("Forwarding to outer IUnknown\n"); return IUnknown_AddRef(This->outer_unknown); } -static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface *iface) +static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface1 *iface) { - struct dxgi_surface *This = impl_from_IDXGISurface(iface); + struct dxgi_surface *This = impl_from_IDXGISurface1(iface); TRACE("Forwarding to outer IUnknown\n"); return IUnknown_Release(This->outer_unknown); } /* IDXGIObject methods */ -static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateData(IDXGISurface *iface, +static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateData(IDXGISurface1 *iface, REFGUID guid, UINT data_size, const void *data) { - struct dxgi_surface *surface = impl_from_IDXGISurface(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); return dxgi_set_private_data(&surface->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateDataInterface(IDXGISurface *iface, +static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateDataInterface(IDXGISurface1 *iface, REFGUID guid, const IUnknown *object) { - struct dxgi_surface *surface = impl_from_IDXGISurface(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); return dxgi_set_private_data_interface(&surface->private_store, guid, object); } -static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface *iface, +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface1 *iface, REFGUID guid, UINT *data_size, void *data) { - struct dxgi_surface *surface = impl_from_IDXGISurface(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); return dxgi_get_private_data(&surface->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REFIID riid, void **parent) +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface1 *iface, REFIID riid, void **parent) { - struct dxgi_surface *This = impl_from_IDXGISurface(iface); + struct dxgi_surface *This = impl_from_IDXGISurface1(iface); TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); @@ -151,9 +152,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REF /* IDXGIDeviceSubObject methods */ -static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REFIID riid, void **device) +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface1 *iface, REFIID riid, void **device) { - struct dxgi_surface *This = impl_from_IDXGISurface(iface); + struct dxgi_surface *This = impl_from_IDXGISurface1(iface); TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); @@ -161,9 +162,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REF } /* IDXGISurface methods */ -static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_SURFACE_DESC *desc) +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface1 *iface, DXGI_SURFACE_DESC *desc) { - struct dxgi_surface *surface = impl_from_IDXGISurface(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); struct wined3d_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); @@ -179,21 +180,36 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_ return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) +static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface1 *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) { FIXME("iface %p, mapped_rect %p, flags %#x stub!\n", iface, mapped_rect, flags); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface *iface) +static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface1 *iface) { FIXME("iface %p stub!\n", iface); return E_NOTIMPL; } -static const struct IDXGISurfaceVtbl dxgi_surface_vtbl = +/* IDXGISurface1 methods */ +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDC(IDXGISurface1 *iface, BOOL discard, HDC *hdc) +{ + FIXME("iface %p, discard %d, hdc %p stub!\n", iface, discard, hdc); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_surface_ReleaseDC(IDXGISurface1 *iface, RECT *dirty_rect) +{ + FIXME("iface %p, rect %p stub!\n", iface, dirty_rect); + + return E_NOTIMPL; +} + +static const struct IDXGISurface1Vtbl dxgi_surface_vtbl = { /* IUnknown methods */ dxgi_surface_QueryInterface, @@ -210,6 +226,9 @@ static const struct IDXGISurfaceVtbl dxgi_surface_vtbl = dxgi_surface_GetDesc, dxgi_surface_Map, dxgi_surface_Unmap, + /* IDXGISurface1 methods */ + dxgi_surface_GetDC, + dxgi_surface_ReleaseDC, }; static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = @@ -223,7 +242,7 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer, struct wined3d_resource *wined3d_resource) { - surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; + surface->IDXGISurface1_iface.lpVtbl = &dxgi_surface_vtbl; surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; wined3d_private_store_init(&surface->private_store); diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 7b052d3..1e4022e 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -188,6 +188,7 @@ static void test_create_surface(void) DXGI_SURFACE_DESC desc; IDXGISurface *surface; IDXGIDevice *device; + IUnknown *surface1; IUnknown *texture; ULONG refcount; HRESULT hr; @@ -216,6 +217,11 @@ static void test_create_surface(void) "Surface should implement ID3D11Texture2D.\n"); if (SUCCEEDED(hr)) IUnknown_Release(texture); + hr = IDXGISurface_QueryInterface(surface, &IID_IDXGISurface1, (void **)&surface1); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Surface should implement IDXGISurface1.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(surface1); + IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Nikolay Sivov : include: Fix ID2D1DCRenderTarget definition.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 37b496d65fe81da59a9b36e7b3ca4e7c0d8614a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b496d65fe81da59a9b36e7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 02:21:41 2016 +0300 include: Fix ID2D1DCRenderTarget definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index d62a498..0e944e1 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1160,7 +1160,7 @@ interface ID2D1DCRenderTarget : ID2D1RenderTarget { HRESULT BindDC( [in] const HDC dc, - [in] const RECT rect + [in] const RECT *rect ); }

1 0

Alexandre Julliard : makedep: Sort makefile variables.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 512c686be9b3eb952a8d6e49abae032f335bc1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=512c686be9b3eb952a8d6e49a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 12:27:17 2016 +0900 makedep: Sort makefile variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ad6e39..2a9782a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -413,10 +413,15 @@ static void strarray_add_uniq( struct strarray *array, const char *str ) */ static const char *strarray_get_value( const struct strarray *array, const char *name ) { - unsigned int i; + int pos, res, min = 0, max = array->count / 2 - 1; - for (i = 0; i < array->count; i += 2) - if (!strcmp( array->str[i], name )) return array->str[i + 1]; + while (min <= max) + { + pos = (min + max) / 2; + if (!(res = strcmp( array->str[pos * 2], name ))) return array->str[pos * 2 + 1]; + if (res < 0) min = pos + 1; + else max = pos - 1; + } return NULL; } @@ -428,17 +433,25 @@ static const char *strarray_get_value( const struct strarray *array, const char */ static void strarray_set_value( struct strarray *array, const char *name, const char *value ) { - unsigned int i; + int i, pos, res, min = 0, max = array->count / 2 - 1; - /* redefining a variable replaces the previous value */ - for (i = 0; i < array->count; i += 2) + while (min <= max) { - if (strcmp( array->str[i], name )) continue; - array->str[i + 1] = value; - return; + pos = (min + max) / 2; + if (!(res = strcmp( array->str[pos * 2], name ))) + { + /* redefining a variable replaces the previous value */ + array->str[pos * 2 + 1] = value; + return; + } + if (res < 0) min = pos + 1; + else max = pos - 1; } - strarray_add( array, name ); - strarray_add( array, value ); + strarray_add( array, NULL ); + strarray_add( array, NULL ); + for (i = array->count - 1; i > min * 2 + 1; i--) array->str[i] = array->str[i - 2]; + array->str[min * 2] = name; + array->str[min * 2 + 1] = value; }

1 0

Piotr Caban : msvcrt: Add x86_64 __CxxFrameHandler implementation.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 63aea551ca6193e62a711d7caa3a82f0f9405d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63aea551ca6193e62a711d7ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 20:12:10 2016 +0200 msvcrt: Add x86_64 __CxxFrameHandler implementation. Known issues: - exceptions are destroyed too late in case of rethrow - no longer used cxx_frame_info structures are freed incorrectly Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 289 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 284 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63aea551ca6193e62a711…

1 0

Piotr Caban : msvcrt: Call C structured exception translator in x86_64 __CxxFrameHandler.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: bc71c7decb4d0d14a0a5d67e034557c5c3535c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc71c7decb4d0d14a0a5d67e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 20:11:44 2016 +0200 msvcrt: Call C structured exception translator in x86_64 __CxxFrameHandler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index d31bc69..f81bb95 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -207,9 +207,19 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } else { + thread_data_t *data = msvcrt_get_thread_data(); + exc_type = NULL; TRACE("handling C exception code %x rec %p frame %lx unwind_help %d descr %p\n", rec->ExceptionCode, rec, frame, *((INT*)(frame+descr->unwind_help)), descr); + + if (data->se_translator) { + EXCEPTION_POINTERS except_ptrs; + + except_ptrs.ExceptionRecord = rec; + except_ptrs.ContextRecord = context; + data->se_translator(rec->ExceptionCode, &except_ptrs); + } } return ExceptionContinueSearch;

1 0

Jacek Caban : jscript: Moved more return object logic to enter_bytecode loop.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: cb317ed5b83012628a9386ecf24a2180e71c7489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb317ed5b83012628a9386ecf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:50:39 2016 +0200 jscript: Moved more return object logic to enter_bytecode loop. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 64 ++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b14ec2d..4616853 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2392,7 +2392,7 @@ static void release_call_frame(call_frame_t *frame) heap_free(frame); } -static HRESULT unwind_exception(script_ctx_t *ctx) +static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) { call_frame_t *frame = ctx->call_ctx; except_frame_t *except_frame; @@ -2400,6 +2400,17 @@ static HRESULT unwind_exception(script_ctx_t *ctx) BSTR ident; HRESULT hres; + if(!frame->except_frame) { + while(frame->scope != frame->base_scope) + scope_pop(&frame->scope); + + stack_popn(ctx, ctx->stack_top-frame->stack_base); + + ctx->call_ctx = frame->prev_frame; + release_call_frame(frame); + return exception_hres; + } + except_frame = frame->except_frame; frame->except_frame = except_frame->next; @@ -2444,7 +2455,7 @@ static HRESULT unwind_exception(script_ctx_t *ctx) return hres; } -static HRESULT enter_bytecode(script_ctx_t *ctx, jsval_t *ret) +static HRESULT enter_bytecode(script_ctx_t *ctx, jsval_t *r) { call_frame_t *frame; jsop_t op; @@ -2454,40 +2465,30 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, jsval_t *ret) frame = ctx->call_ctx; - while(frame->ip != -1) { + while(1) { op = frame->bytecode->instrs[frame->ip].op; hres = op_funcs[op](ctx); if(FAILED(hres)) { TRACE("EXCEPTION %08x\n", hres); - if(!frame->except_frame) - break; - - hres = unwind_exception(ctx); + hres = unwind_exception(ctx, hres); if(FAILED(hres)) - break; + return hres; + }else if(frame->ip == -1) { + assert(ctx->stack_top == frame->stack_base); + assert(frame->scope == frame->base_scope); + + ctx->call_ctx = frame->prev_frame; + if(r) + *r = steal_ret(frame); + release_call_frame(frame); + break; }else { frame->ip += op_move[op]; } } - assert(ctx->call_ctx == frame); - - if(FAILED(hres)) { - while(frame->scope != frame->base_scope) - scope_pop(&frame->scope); - stack_popn(ctx, ctx->stack_top-frame->stack_base); - } - - assert(ctx->stack_top == frame->stack_base); - assert(frame->scope == frame->base_scope); - ctx->call_ctx = frame->prev_frame; - - if(SUCCEEDED(hres)) - *ret = steal_ret(frame); - - release_call_frame(frame); - return hres; + return S_OK; } static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdisp_t *func_obj) @@ -2528,10 +2529,9 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis } HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *ret) + IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *r) { call_frame_t *frame; - jsval_t val; unsigned i; HRESULT hres; @@ -2603,13 +2603,5 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->prev_frame = ctx->call_ctx; ctx->call_ctx = frame; - hres = enter_bytecode(ctx, &val); - if(FAILED(hres)) - return hres; - - if(ret) - *ret = val; - else - jsval_release(val); - return S_OK; + return enter_bytecode(ctx, r); }

1 0

Jacek Caban : jscript: Keep reference to bytecode in call_frame_t.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 8c1526a865280be7d713b21a1cca6c8e4c95c95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1526a865280be7d713b21a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:50:18 2016 +0200 jscript: Keep reference to bytecode in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 3 ++- dlls/jscript/engine.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 802e408..b14ec2d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2388,6 +2388,7 @@ static void release_call_frame(call_frame_t *frame) if(frame->scope) scope_release(frame->scope); jsval_release(frame->ret); + release_bytecode(frame->bytecode); heap_free(frame); } @@ -2579,7 +2580,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi if(!frame) return E_OUTOFMEMORY; - frame->bytecode = bytecode; + frame->bytecode = bytecode_addref(bytecode); frame->function = function; frame->ip = function->instr_off; frame->stack_base = ctx->stack_top; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 4915b60..4b3bba2 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -168,9 +168,10 @@ typedef struct _bytecode_t { HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN; void release_bytecode(bytecode_t*) DECLSPEC_HIDDEN; -static inline void bytecode_addref(bytecode_t *code) +static inline bytecode_t *bytecode_addref(bytecode_t *code) { code->ref++; + return code; } typedef struct _scope_chain_t {

1 0

Jacek Caban : jscript: Merge setup_call_frame into exec_source.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: db0fee5e9d3f8e1c3a9dbd7c98f3c952281ece39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db0fee5e9d3f8e1c3a9dbd7c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 17:50:08 2016 +0200 jscript: Merge setup_call_frame into exec_source. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 82 ++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 46 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 4d7c175..802e408 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2443,7 +2443,7 @@ static HRESULT unwind_exception(script_ctx_t *ctx) return hres; } -static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret) +static HRESULT enter_bytecode(script_ctx_t *ctx, jsval_t *ret) { call_frame_t *frame; jsop_t op; @@ -2526,10 +2526,42 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -static HRESULT setup_call_frame(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *variable_obj) +HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, + IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *ret) { call_frame_t *frame; + jsval_t val; + unsigned i; + HRESULT hres; + + for(i = 0; i < function->func_cnt; i++) { + jsdisp_t *func_obj; + + if(!function->funcs[i].name) + continue; + + hres = create_source_function(ctx, bytecode, function->funcs+i, scope, &func_obj); + if(FAILED(hres)) + return hres; + + if(function->funcs[i].event_target) + hres = bind_event_target(ctx, function->funcs+i, func_obj); + else + hres = jsdisp_propput_name(variable_obj, function->funcs[i].name, jsval_obj(func_obj)); + jsdisp_release(func_obj); + if(FAILED(hres)) + return hres; + } + + for(i=0; i < function->var_cnt; i++) { + if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, function->variables[i], NULL)) { + DISPID id = 0; + + hres = jsdisp_get_id(variable_obj, function->variables[i], fdexNameEnsure, &id); + if(FAILED(hres)) + return hres; + } + } /* ECMA-262 3rd Edition 11.2.3.7 */ if(this_obj) { @@ -2569,50 +2601,8 @@ static HRESULT setup_call_frame(script_ctx_t *ctx, DWORD flags, bytecode_t *byte frame->prev_frame = ctx->call_ctx; ctx->call_ctx = frame; - return S_OK; -} - -HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *code, function_code_t *func, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *ret) -{ - jsval_t val; - unsigned i; - HRESULT hres = S_OK; - - for(i = 0; i < func->func_cnt; i++) { - jsdisp_t *func_obj; - - if(!func->funcs[i].name) - continue; - - hres = create_source_function(ctx, code, func->funcs+i, scope, &func_obj); - if(FAILED(hres)) - return hres; - - if(func->funcs[i].event_target) - hres = bind_event_target(ctx, func->funcs+i, func_obj); - else - hres = jsdisp_propput_name(variable_obj, func->funcs[i].name, jsval_obj(func_obj)); - jsdisp_release(func_obj); - if(FAILED(hres)) - return hres; - } - - for(i=0; i < func->var_cnt; i++) { - if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, func->variables[i], NULL)) { - DISPID id = 0; - - hres = jsdisp_get_id(variable_obj, func->variables[i], fdexNameEnsure, &id); - if(FAILED(hres)) - return hres; - } - } - - hres = setup_call_frame(ctx, flags, code, func, scope, this_obj, variable_obj); - if(FAILED(hres)) - return hres; - hres = enter_bytecode(ctx, func, &val); + hres = enter_bytecode(ctx, &val); if(FAILED(hres)) return hres;

1 0