August 2015 - Wine-Commits - list.winehq.org

Michael Stefaniuc : qedit: Simplify/ fix the creation of the IEnumMediaTypes.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: f34efaab98bf6ab2be4ebfd35f9bc287fdfe693b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34efaab98bf6ab2be4ebfd35… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 7 23:27:20 2015 +0200 qedit: Simplify/fix the creation of the IEnumMediaTypes. --- dlls/qedit/samplegrabber.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 8b89351..e9e4906 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -37,7 +37,7 @@ static const WCHAR vendor_name[] = { 'W', 'i', 'n', 'e', 0 }; static const WCHAR pin_in_name[] = { 'I', 'n', 0 }; static const WCHAR pin_out_name[] = { 'O', 'u', 't', 0 }; -static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype); +static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype, BOOL past); /* Single media type enumerator */ typedef struct _ME_Impl { @@ -151,10 +151,9 @@ static HRESULT WINAPI Single_IEnumMediaTypes_Clone(IEnumMediaTypes *iface, IEnum TRACE("(%p)->(%p)\n", This, me); if (!me) return E_POINTER; - *me = mediaenum_create(&This->mtype); + *me = mediaenum_create(&This->mtype, This->past); if (!*me) return E_OUTOFMEMORY; - ((ME_Impl *)*me)->past = This->past; return S_OK; } @@ -172,27 +171,29 @@ static const IEnumMediaTypesVtbl IEnumMediaTypes_VTable = Single_IEnumMediaTypes_Clone, }; -static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) +static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype, BOOL past) { ME_Impl *obj = CoTaskMemAlloc(sizeof(ME_Impl)); - if (obj) { - ZeroMemory(obj, sizeof(ME_Impl)); - obj->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypes_VTable; - obj->refCount = 1; - obj->past = FALSE; - if (mtype) { - obj->mtype = *mtype; - obj->mtype.pUnk = NULL; - if (mtype->cbFormat) { - obj->mtype.pbFormat = CoTaskMemAlloc(mtype->cbFormat); - CopyMemory(obj->mtype.pbFormat, mtype->pbFormat, mtype->cbFormat); - } - else - obj->mtype.pbFormat = NULL; + + if (!obj) + return NULL; + ZeroMemory(obj, sizeof(*obj)); + obj->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypes_VTable; + obj->refCount = 1; + obj->past = past; + if (mtype) { + obj->mtype = *mtype; + obj->mtype.pUnk = NULL; + if (mtype->cbFormat) { + obj->mtype.pbFormat = CoTaskMemAlloc(mtype->cbFormat); + CopyMemory(obj->mtype.pbFormat, mtype->pbFormat, mtype->cbFormat); } else - obj->mtype.majortype = GUID_NULL; + obj->mtype.pbFormat = NULL; } + else + obj->mtype.majortype = GUID_NULL; + return &obj->IEnumMediaTypes_iface; } @@ -1095,7 +1096,7 @@ SampleGrabber_IPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **mtypes) TRACE("(%p)->(%p)\n", This, mtypes); if (!mtypes) return E_POINTER; - *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : NULL); + *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : NULL, FALSE); return *mtypes ? S_OK : E_OUTOFMEMORY; }

1 0

Michael Stefaniuc : qedit: COM cleanup for IEnumMediaTypes of SampleGrabber.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 2d3edce0f820cb82d187e5537bd8e4867fb08ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3edce0f820cb82d187e5537… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 7 23:25:06 2015 +0200 qedit: COM cleanup for IEnumMediaTypes of SampleGrabber. --- dlls/qedit/samplegrabber.c | 88 +++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 537e22c..8b89351 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -41,7 +41,7 @@ static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype); /* Single media type enumerator */ typedef struct _ME_Impl { - IEnumMediaTypes me; + IEnumMediaTypes IEnumMediaTypes_iface; LONG refCount; BOOL past; AM_MEDIA_TYPE mtype; @@ -50,22 +50,42 @@ typedef struct _ME_Impl { /* IEnumMediaTypes interface implementation */ -/* IUnknown */ -static ULONG WINAPI -Single_IEnumMediaTypes_AddRef(IEnumMediaTypes *iface) +static inline ME_Impl *impl_from_IEnumMediaTypes(IEnumMediaTypes *iface) +{ + return CONTAINING_RECORD(iface, ME_Impl, IEnumMediaTypes_iface); +} + +static HRESULT WINAPI Single_IEnumMediaTypes_QueryInterface(IEnumMediaTypes *iface, REFIID riid, + void **ret_iface) { - ME_Impl *This = (ME_Impl *)iface; + ME_Impl *This = impl_from_IEnumMediaTypes(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ret_iface); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IEnumMediaTypes)) { + *ret_iface = iface; + IEnumMediaTypes_AddRef(iface); + return S_OK; + } + *ret_iface = NULL; + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; +} + +static ULONG WINAPI Single_IEnumMediaTypes_AddRef(IEnumMediaTypes *iface) +{ + ME_Impl *This = impl_from_IEnumMediaTypes(iface); ULONG refCount = InterlockedIncrement(&This->refCount); + TRACE("(%p) new ref = %u\n", This, refCount); return refCount; } -/* IUnknown */ -static ULONG WINAPI -Single_IEnumMediaTypes_Release(IEnumMediaTypes *iface) +static ULONG WINAPI Single_IEnumMediaTypes_Release(IEnumMediaTypes *iface) { - ME_Impl *This = (ME_Impl *)iface; + ME_Impl *This = impl_from_IEnumMediaTypes(iface); ULONG refCount = InterlockedDecrement(&This->refCount); + TRACE("(%p) new ref = %u\n", This, refCount); if (refCount == 0) { @@ -77,30 +97,13 @@ Single_IEnumMediaTypes_Release(IEnumMediaTypes *iface) return refCount; } -/* IUnknown */ -static HRESULT WINAPI -Single_IEnumMediaTypes_QueryInterface(IEnumMediaTypes *iface, REFIID riid, void **ppvObject) -{ - ME_Impl *This = (ME_Impl *)iface; - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IEnumMediaTypes)) { - Single_IEnumMediaTypes_AddRef(iface); - *ppvObject = &(This->me); - return S_OK; - } - *ppvObject = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); - return E_NOINTERFACE; -} - /* IEnumMediaTypes */ -static HRESULT WINAPI -Single_IEnumMediaTypes_Next(IEnumMediaTypes *iface, ULONG nTypes, AM_MEDIA_TYPE **types, ULONG *fetched) +static HRESULT WINAPI Single_IEnumMediaTypes_Next(IEnumMediaTypes *iface, ULONG nTypes, + AM_MEDIA_TYPE **types, ULONG *fetched) { - ME_Impl *This = (ME_Impl *)iface; + ME_Impl *This = impl_from_IEnumMediaTypes(iface); ULONG count = 0; + TRACE("(%p)->(%u, %p, %p)\n", This, nTypes, types, fetched); if (!nTypes) return E_INVALIDARG; @@ -122,32 +125,29 @@ Single_IEnumMediaTypes_Next(IEnumMediaTypes *iface, ULONG nTypes, AM_MEDIA_TYPE return (count == nTypes) ? S_OK : S_FALSE; } -/* IEnumMediaTypes */ -static HRESULT WINAPI -Single_IEnumMediaTypes_Skip(IEnumMediaTypes *iface, ULONG nTypes) +static HRESULT WINAPI Single_IEnumMediaTypes_Skip(IEnumMediaTypes *iface, ULONG nTypes) { - ME_Impl *This = (ME_Impl *)iface; + ME_Impl *This = impl_from_IEnumMediaTypes(iface); + TRACE("(%p)->(%u)\n", This, nTypes); if (nTypes) This->past = TRUE; return This->past ? S_FALSE : S_OK; } -/* IEnumMediaTypes */ -static HRESULT WINAPI -Single_IEnumMediaTypes_Reset(IEnumMediaTypes *iface) +static HRESULT WINAPI Single_IEnumMediaTypes_Reset(IEnumMediaTypes *iface) { - ME_Impl *This = (ME_Impl *)iface; + ME_Impl *This = impl_from_IEnumMediaTypes(iface); + TRACE("(%p)->()\n", This); This->past = FALSE; return S_OK; } -/* IEnumMediaTypes */ -static HRESULT WINAPI -Single_IEnumMediaTypes_Clone(IEnumMediaTypes *iface, IEnumMediaTypes **me) +static HRESULT WINAPI Single_IEnumMediaTypes_Clone(IEnumMediaTypes *iface, IEnumMediaTypes **me) { - ME_Impl *This = (ME_Impl *)iface; + ME_Impl *This = impl_from_IEnumMediaTypes(iface); + TRACE("(%p)->(%p)\n", This, me); if (!me) return E_POINTER; @@ -177,7 +177,7 @@ static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) ME_Impl *obj = CoTaskMemAlloc(sizeof(ME_Impl)); if (obj) { ZeroMemory(obj, sizeof(ME_Impl)); - obj->me.lpVtbl = &IEnumMediaTypes_VTable; + obj->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypes_VTable; obj->refCount = 1; obj->past = FALSE; if (mtype) { @@ -193,7 +193,7 @@ static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) else obj->mtype.majortype = GUID_NULL; } - return &obj->me; + return &obj->IEnumMediaTypes_iface; }

1 0

Henri Verbeet : d2d1: Get rid of a FIXME in d2d_bitmap_brush_init().
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 7bdc1ef899735663969c324fa423ed0ec494762f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bdc1ef899735663969c324fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 17:37:10 2015 +0200 d2d1: Get rid of a FIXME in d2d_bitmap_brush_init(). --- dlls/d2d1/brush.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index f1bfbb0..2535f85 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -686,9 +686,6 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) { - - FIXME("Ignoring brush properties.\n"); - d2d_brush_init(brush, factory, D2D_BRUSH_TYPE_BITMAP, brush_desc, (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); if ((brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap)))

1 0

Nikolay Sivov : dwrite/tests: Some tests for target hdc mode/transform.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 22a65466b3aa80bf9b543fb583df873db84e6f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a65466b3aa80bf9b543fb58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 21:11:35 2015 +0300 dwrite/tests: Some tests for target hdc mode/transform. --- dlls/dwrite/tests/font.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7ee5c8a..b132749 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -757,6 +757,7 @@ static void test_CreateBitmapRenderTarget(void) HBITMAP hbm, hbm2; DWRITE_MATRIX m; DIBSECTION ds; + XFORM xform; COLORREF c; HRESULT hr; FLOAT pdip; @@ -791,6 +792,11 @@ if (0) /* crashes on native */ hdc = IDWriteBitmapRenderTarget_GetMemoryDC(target); ok(hdc != NULL, "got %p\n", hdc); + /* test mode */ + ret = GetGraphicsMode(hdc); +todo_wine + ok(ret == GM_ADVANCED, "got %d\n", ret); + hbm = GetCurrentObject(hdc, OBJ_BITMAP); ok(hbm != NULL, "got %p\n", hbm); @@ -914,7 +920,7 @@ if (0) /* crashes on native */ ok(ds.dsBm.bmBitsPixel == 1, "got %d\n", ds.dsBm.bmBitsPixel); ok(!ds.dsBm.bmBits, "got %p\n", ds.dsBm.bmBits); - /* transform tests */ + /* transform tests, current hdc transform is not immediately affected */ if (0) /* crashes on native */ hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, NULL); @@ -923,6 +929,10 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(m.m11 == 1.0 && m.m22 == 1.0 && m.m12 == 0.0 && m.m21 == 0.0, "got %.1f,%.1f,%.1f,%.1f\n", m.m11, m.m22, m.m12, m.m21); ok(m.dx == 0.0 && m.dy == 0.0, "got %.1f,%.1f\n", m.dx, m.dy); + ret = GetWorldTransform(hdc, &xform); + ok(ret, "got %d\n", ret); + ok(xform.eM11 == 1.0 && xform.eM22 == 1.0 && xform.eM12 == 0.0 && xform.eM21 == 0.0, "got wrong transform\n"); + ok(xform.eDx == 0.0 && xform.eDy == 0.0, "got %.1f,%.1f\n", xform.eDx, xform.eDy); memset(&m, 0, sizeof(m)); hr = IDWriteBitmapRenderTarget_SetCurrentTransform(target, &m); @@ -933,6 +943,19 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(m.m11 == 0.0 && m.m22 == 0.0 && m.m12 == 0.0 && m.m21 == 0.0, "got %.1f,%.1f,%.1f,%.1f\n", m.m11, m.m22, m.m12, m.m21); ok(m.dx == 0.0 && m.dy == 0.0, "got %.1f,%.1f\n", m.dx, m.dy); + ret = GetWorldTransform(hdc, &xform); + ok(ret, "got %d\n", ret); + ok(xform.eM11 == 1.0 && xform.eM22 == 1.0 && xform.eM12 == 0.0 && xform.eM21 == 0.0, "got wrong transform\n"); + ok(xform.eDx == 0.0 && xform.eDy == 0.0, "got %.1f,%.1f\n", xform.eDx, xform.eDy); + + memset(&m, 0, sizeof(m)); + m.m11 = 2.0; m.m22 = 1.0; + hr = IDWriteBitmapRenderTarget_SetCurrentTransform(target, &m); + ok(hr == S_OK, "got 0x%08x\n", hr); + ret = GetWorldTransform(hdc, &xform); + ok(ret, "got %d\n", ret); + ok(xform.eM11 == 1.0 && xform.eM22 == 1.0 && xform.eM12 == 0.0 && xform.eM21 == 0.0, "got wrong transform\n"); + ok(xform.eDx == 0.0 && xform.eDy == 0.0, "got %.1f,%.1f\n", xform.eDx, xform.eDy); hr = IDWriteBitmapRenderTarget_SetCurrentTransform(target, NULL); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

André Hentschel : ntdll: Add support for Win 10.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 27bf278d72b2ef16c086799df2f20797924f98a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27bf278d72b2ef16c086799df… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 22:32:19 2015 +0200 ntdll: Add support for Win 10. --- dlls/ntdll/version.c | 8 ++++++++ programs/winecfg/appdefaults.c | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index a6340eb..41b44f5 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -58,6 +58,7 @@ typedef enum WIN7, /* Windows 7 */ WIN8, /* Windows 8 */ WIN81, /* Windows 8.1 */ + WIN10, /* Windows 10 */ NB_WINDOWS_VERSIONS } WINDOWS_VERSION; @@ -184,6 +185,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {' ',0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, + /* WIN10 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x2800, VER_PLATFORM_WIN32_NT, + {' ',0}, + 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, }; @@ -207,6 +214,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "win7", /* WIN7 */ "win8", /* WIN8 */ "win81", /* WIN81 */ + "win10", /* WIN10 */ }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index fad9e5c..82dc870 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,6 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { + { "win10", "Windows 10", 10, 0, 0x2800,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0

Józef Kucia : d3d10core/tests: Fix copy-paste mistake.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 96322fbefcf10df40341afb007dc0d12e97417f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96322fbefcf10df40341afb00… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 10 01:11:19 2015 +0200 d3d10core/tests: Fix copy-paste mistake. --- dlls/d3d10core/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index c75def4..55dce67 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -232,7 +232,7 @@ static void test_create_texture2d(void) ok(desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", desc.Format); ok(desc.SampleDesc.Count == 1, "Got unexpected SampleDesc.Count %u.\n", desc.SampleDesc.Count); ok(desc.SampleDesc.Quality == 0, "Got unexpected SampleDesc.Quality %u.\n", desc.SampleDesc.Quality); - ok(desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected MipLevels %u.\n", desc.Usage); + ok(desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected Usage %u.\n", desc.Usage); ok(desc.BindFlags == D3D10_BIND_RENDER_TARGET, "Got unexpected BindFlags %u.\n", desc.BindFlags); ok(desc.CPUAccessFlags == 0, "Got unexpected CPUAccessFlags %u.\n", desc.CPUAccessFlags); ok(desc.MiscFlags == 0, "Got unexpected MiscFlags %u.\n", desc.MiscFlags); @@ -323,7 +323,7 @@ static void test_create_texture3d(void) ok(desc.Depth == 64, "Got unexpected Depth %u.\n", desc.Depth); ok(desc.MipLevels == 7, "Got unexpected MipLevels %u.\n", desc.MipLevels); ok(desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", desc.Format); - ok(desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected MipLevels %u.\n", desc.Usage); + ok(desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected Usage %u.\n", desc.Usage); ok(desc.BindFlags == D3D10_BIND_RENDER_TARGET, "Got unexpected BindFlags %u.\n", desc.BindFlags); ok(desc.CPUAccessFlags == 0, "Got unexpected CPUAccessFlags %u.\n", desc.CPUAccessFlags); ok(desc.MiscFlags == 0, "Got unexpected MiscFlags %u.\n", desc.MiscFlags);

1 0

Jacek Caban : widl: Added support for namespaced structs.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 7c29a53208e0d2f382fbf6af02078ec172c72410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c29a53208e0d2f382fbf6af0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 13:19:48 2015 +0200 widl: Added support for namespaced structs. --- tools/widl/header.c | 4 ++-- tools/widl/parser.y | 6 +++--- tools/widl/typetree.c | 8 +++++--- tools/widl/typetree.h | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 29b622e..cb4601e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -314,7 +314,7 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) case TYPE_STRUCT: case TYPE_ENCAPSULATED_UNION: if (!declonly && t->defined && !t->written) { - if (t->name) fprintf(h, "struct %s {\n", t->name); + if (name) fprintf(h, "struct %s {\n", name); else fprintf(h, "struct {\n"); t->written = TRUE; indentation++; @@ -325,7 +325,7 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) indent(h, -1); fprintf(h, "}"); } - else fprintf(h, "struct %s", t->name ? t->name : ""); + else fprintf(h, "struct %s", name ? name : ""); break; case TYPE_UNION: if (!declonly && t->defined && !t->written) { diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ba0be1c..b42b4a2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -380,7 +380,7 @@ typedecl: enumdef | tENUM aIDENTIFIER { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } | structdef - | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, FALSE, NULL); } + | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } | uniondef | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } | attributes enumdef { $$ = $2; $$->attrs = check_enum_attrs($1); } @@ -1091,7 +1091,7 @@ pointer_type: | tPTR { $$ = RPC_FC_FP; } ; -structdef: tSTRUCT t_ident '{' fields '}' { $$ = type_new_struct($2, TRUE, $4); } +structdef: tSTRUCT t_ident '{' fields '}' { $$ = type_new_struct($2, current_namespace, TRUE, $4); } ; type: tVOID { $$ = type_new_void(); } @@ -1100,7 +1100,7 @@ type: tVOID { $$ = type_new_void(); } | enumdef { $$ = $1; } | tENUM aIDENTIFIER { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } | structdef { $$ = $1; } - | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, FALSE, NULL); } + | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } | uniondef { $$ = $1; } | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 3f8ced3..5925d40 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -297,11 +297,13 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined return t; } -type_t *type_new_struct(char *name, int defined, var_list_t *fields) +type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields) { - type_t *tag_type = name ? find_type(name, NULL, tsSTRUCT) : NULL; + type_t *tag_type = name ? find_type(name, namespace, tsSTRUCT) : NULL; type_t *t = make_type(TYPE_STRUCT); t->name = name; + t->namespace = namespace; + if (tag_type && tag_type->details.structure) t->details.structure = tag_type->details.structure; else if (defined) @@ -313,7 +315,7 @@ type_t *type_new_struct(char *name, int defined, var_list_t *fields) if (name) { if (defined) - reg_type(t, name, NULL, tsSTRUCT); + reg_type(t, name, namespace, tsSTRUCT); else add_incomplete(t); } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 873ba8a..bf05f25 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -41,7 +41,7 @@ type_t *type_new_int(enum type_basic_type basic_type, int sign); type_t *type_new_void(void); type_t *type_new_coclass(char *name); type_t *type_new_enum(const char *name, struct namespace *namespace, int defined, var_list_t *enums); -type_t *type_new_struct(char *name, int defined, var_list_t *fields); +type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields); type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields); type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases); type_t *type_new_bitfield(type_t *field_type, const expr_t *bits);

1 0

Ken Thomases : winemac: Tell Wine when Cocoa brought a clicked window forward even if it sent the click event.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 793ab7d457ef0412069492b6626894d2e23c1a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=793ab7d457ef0412069492b66… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Aug 12 18:02:32 2015 -0500 winemac: Tell Wine when Cocoa brought a clicked window forward even if it sent the click event. Not sending the brought-forward event for a click that was sent was an artifact of a time when that branch was only used for posting a request for focus. When I added the brought-forward event, I didn't reconsider that logic. --- dlls/winemac.drv/cocoa_app.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 82925c8..8e1f318 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1700,10 +1700,10 @@ int macdrv_err_on; } } - if (!process && windowBroughtForward) + if (windowBroughtForward) { [[windowBroughtForward ancestorWineWindow] postBroughtForwardEvent]; - if (![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) + if (!process && ![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) [self windowGotFocus:windowBroughtForward]; }

1 0

Jacek Caban : widl: Allow [version] attribute to be used on structs in winrt mode.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 8d43c54ed2a877ce4dcdb867a26988c6e0c097bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d43c54ed2a877ce4dcdb867a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 13:19:29 2015 +0200 widl: Allow [version] attribute to be used on structs in winrt mode. --- tools/widl/parser.y | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 725cd3b..ba0be1c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2064,7 +2064,7 @@ struct allowed_attr unsigned int on_arg : 1; unsigned int on_type : 1; unsigned int on_enum : 1; - unsigned int on_struct : 1; + unsigned int on_struct : 2; unsigned int on_union : 1; unsigned int on_field : 1; unsigned int on_library : 1; @@ -2175,7 +2175,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_UUID */ { 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, "uuid" }, /* ATTR_V1ENUM */ { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, "v1_enum" }, /* ATTR_VARARG */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "vararg" }, - /* ATTR_VERSION */ { 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, "version" }, + /* ATTR_VERSION */ { 1, 0, 1, 0, 0, 1, 1, 2, 0, 0, 1, 0, 0, 1, "version" }, /* ATTR_VIPROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "vi_progid" }, /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "wire_marshal" }, }; @@ -2265,11 +2265,12 @@ static attr_list_t *check_enum_attrs(attr_list_t *attrs) static attr_list_t *check_struct_attrs(attr_list_t *attrs) { + int mask = winrt_mode ? 3 : 1; const attr_t *attr; if (!attrs) return attrs; LIST_FOR_EACH_ENTRY(attr, attrs, const attr_t, entry) { - if (!allowed_attr[attr->type].on_struct) + if (!(allowed_attr[attr->type].on_struct & mask)) error_loc("inapplicable attribute %s for struct\n", allowed_attr[attr->type].display_name); }

1 0

Henri Verbeet : d3d10core: Add locking around wined3d calls.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 63d279430da44088b03fa304df6a850e94e5cfb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d279430da44088b03fa304d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 17:37:08 2015 +0200 d3d10core: Add locking around wined3d calls. --- dlls/d3d10core/async.c | 5 ++ dlls/d3d10core/buffer.c | 16 +++++- dlls/d3d10core/device.c | 131 ++++++++++++++++++++++++++++++++++++++++++- dlls/d3d10core/inputlayout.c | 8 +++ dlls/d3d10core/shader.c | 24 ++++++++ dlls/d3d10core/state.c | 21 +++++++ dlls/d3d10core/texture.c | 30 ++++++++++ dlls/d3d10core/utils.c | 29 +++++++++- dlls/d3d10core/view.c | 19 ++++++- 9 files changed, 277 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63d279430da44088b03fa…

1 0