April 2016 - Wine-commits - list.winehq.org

Huw Davies : gdi32/tests: Allocate the font enum data structures.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: ef3422213162b2e5dc8811377d2be0e41ae22a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef3422213162b2e5dc8811377… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 14 11:12:35 2016 +0100 gdi32/tests: Allocate the font enum data structures. These are in excess of 250kB and may overflow the stack. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 119 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 82 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a1917b4..eb6669b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -107,6 +107,22 @@ static void init(void) system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); } +static void *heap_alloc( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), 0, len ); +} + +static void *heap_realloc( void *p, size_t len ) +{ + if (!p) return heap_alloc( len ); + return HeapReAlloc( GetProcessHeap(), 0, p, len ); +} + +static void heap_free( void *p ) +{ + HeapFree( GetProcessHeap(), 0, p ); +} + static INT CALLBACK is_truetype_font_installed_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { if (type != TRUETYPE_FONTTYPE) return 1; @@ -2736,24 +2752,22 @@ static void test_GetFontUnicodeRanges(void) ReleaseDC(NULL, hdc); } -#define MAX_ENUM_FONTS 4096 - struct enum_font_data { - int total; - LOGFONTA lf[MAX_ENUM_FONTS]; + int total, size; + LOGFONTA *lf; }; struct enum_fullname_data { - int total; - ENUMLOGFONTA elf[MAX_ENUM_FONTS]; + int total, size; + ENUMLOGFONTA *elf; }; struct enum_font_dataW { - int total; - LOGFONTW lf[MAX_ENUM_FONTS]; + int total, size; + LOGFONTW *lf; }; static INT CALLBACK arial_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lParam) @@ -2771,10 +2785,13 @@ static INT CALLBACK arial_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, D if (0) /* Disabled to limit console spam */ trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); - if (efd->total < MAX_ENUM_FONTS) - efd->lf[efd->total++] = *lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efd->total >= efd->size) + { + efd->size = max( (efd->total + 1) * 2, 256 ); + efd->lf = heap_realloc( efd->lf, efd->size * sizeof(*efd->lf) ); + if (!efd->lf) return 0; + } + efd->lf[efd->total++] = *lf; return 1; } @@ -2794,10 +2811,13 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, if (0) /* Disabled to limit console spam */ trace("enumed font %s, charset %d, height %d, weight %d, italic %d\n", wine_dbgstr_w(lf->lfFaceName), lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); - if (efd->total < MAX_ENUM_FONTS) - efd->lf[efd->total++] = *lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efd->total >= efd->size) + { + efd->size = max( (efd->total + 1) * 2, 256 ); + efd->lf = heap_realloc( efd->lf, efd->size * sizeof(*efd->lf) ); + if (!efd->lf) return 0; + } + efd->lf[efd->total++] = *lf; return 1; } @@ -2871,6 +2891,8 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) skip("%s is not installed\n", font_name); return; } + memset( &efd, 0, sizeof(efd) ); + memset( &efdw, 0, sizeof(efdw) ); hdc = GetDC(0); @@ -3064,6 +3086,9 @@ else } ReleaseDC(0, hdc); + + heap_free( efd.lf ); + heap_free( efdw.lf ); } static INT CALLBACK enum_multi_charset_font_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lParam) @@ -3093,10 +3118,13 @@ static INT CALLBACK enum_font_data_proc(const LOGFONTA *lf, const TEXTMETRICA *n if (type != TRUETYPE_FONTTYPE) return 1; - if (efd->total < MAX_ENUM_FONTS) - efd->lf[efd->total++] = *lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efd->total >= efd->size) + { + efd->size = max( (efd->total + 1) * 2, 256 ); + efd->lf = heap_realloc( efd->lf, efd->size * sizeof(*efd->lf) ); + if (!efd->lf) return 0; + } + efd->lf[efd->total++] = *lf; return 1; } @@ -3107,10 +3135,13 @@ static INT CALLBACK enum_fullname_data_proc(const LOGFONTA *lf, const TEXTMETRIC if (type != TRUETYPE_FONTTYPE) return 1; - if (efnd->total < MAX_ENUM_FONTS) - efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efnd->total >= efnd->size) + { + efnd->size = max( (efnd->total + 1) * 2, 256 ); + efnd->elf = heap_realloc( efnd->elf, efnd->size * sizeof(*efnd->elf) ); + if (!efnd->elf) return 0; + } + efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; return 1; } @@ -3144,7 +3175,7 @@ static void test_EnumFontFamiliesEx_default_charset(void) target.lfCharSet = ANSI_CHARSET; } - efd.total = 0; + memset(&efd, 0, sizeof(efd)); memset(&enum_font, 0, sizeof(enum_font)); strcpy(enum_font.lfFaceName, target.lfFaceName); enum_font.lfCharSet = DEFAULT_CHARSET; @@ -3152,15 +3183,14 @@ static void test_EnumFontFamiliesEx_default_charset(void) ReleaseDC(0, hdc); trace("'%s' has %d charsets.\n", target.lfFaceName, efd.total); - if (efd.total < 2) { + if (efd.total < 2) ok(0, "EnumFontFamilies is broken. Expected >= 2, got %d.\n", efd.total); - return; - } - - ok(efd.lf[0].lfCharSet == target.lfCharSet, - "(%s) got charset %d expected %d\n", - efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, target.lfCharSet); + else + ok(efd.lf[0].lfCharSet == target.lfCharSet, + "(%s) got charset %d expected %d\n", + efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, target.lfCharSet); + heap_free(efd.lf); return; } @@ -5215,6 +5245,12 @@ if (0) /* Disabled to limit console spam */ if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg") != 0) return 1; + if (efnd->total >= efnd->size) + { + efnd->size = max( (efnd->total + 1) * 2, 256 ); + efnd->elf = heap_realloc( efnd->elf, efnd->size * sizeof(*efnd->elf) ); + if (!efnd->elf) return 0; + } efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; return 0; } @@ -5230,6 +5266,12 @@ if (0) /* Disabled to limit console spam */ if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg 2") != 0) return 1; + if (efnd->total >= efnd->size) + { + efnd->size = max( (efnd->total + 1) * 2, 256 ); + efnd->elf = heap_realloc( efnd->elf, efnd->size * sizeof(*efnd->elf) ); + if (!efnd->elf) return 0; + } efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; return 0; } @@ -5261,7 +5303,7 @@ static void test_EnumFonts_subst(void) memset(&lf, 0, sizeof(lf)); lf.lfCharSet = DEFAULT_CHARSET; - memset(&efnd, 0, sizeof(efnd)); + efnd.total = 0; strcpy(lf.lfFaceName, "MS Shell Dlg"); ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg_proc, (LPARAM)&efnd, 0); ok(!ret, "MS Shell Dlg should be enumerated\n"); @@ -5271,12 +5313,12 @@ static void test_EnumFonts_subst(void) ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg"); ok(ret, "did not expect MS Shell Dlg\n"); - memset(&efnd, 0, sizeof(efnd)); + efnd.total = 0; ret = EnumFontFamiliesExA(hdc, NULL, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); ok(ret, "MS Shell Dlg 2 should not be enumerated\n"); ok(!efnd.total, "MS Shell Dlg 2 should not be enumerated\n"); - memset(&efnd, 0, sizeof(efnd)); + efnd.total = 0; strcpy(lf.lfFaceName, "MS Shell Dlg 2"); ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); ok(!ret, "MS Shell Dlg 2 should be enumerated\n"); @@ -5286,6 +5328,7 @@ static void test_EnumFonts_subst(void) ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); ok(ret, "did not expect MS Shell Dlg 2\n"); + heap_free(efnd.elf); DeleteDC(hdc); } @@ -5396,7 +5439,7 @@ static void test_fullname2_helper(const char *Family) lf.lfItalic = FALSE; lf.lfWeight = FW_DONTCARE; strcpy(lf.lfFaceName, Family); - efnd.total = 0; + memset(&efnd, 0, sizeof(efnd)); EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); if (efnd.total == 0) skip("%s is not installed\n", lf.lfFaceName); @@ -5477,6 +5520,7 @@ static void test_fullname2_helper(const char *Family) HeapFree(GetProcessHeap(), 0, bufW); HeapFree(GetProcessHeap(), 0, bufA); } + heap_free(efnd.elf); DeleteDC(hdc); } @@ -6225,7 +6269,7 @@ static void test_vertical_order(void) lf.lfQuality = DEFAULT_QUALITY; lf.lfItalic = FALSE; lf.lfWeight = FW_DONTCARE; - efd.total = 0; + memset( &efd, 0, sizeof(efd) ); EnumFontFamiliesExA(hdc, &lf, enum_font_data_proc, (LPARAM)&efd, 0); for (i = 0; i < efd.total; i++) { @@ -6239,6 +6283,7 @@ static void test_vertical_order(void) } } } + heap_free( efd.lf ); DeleteDC( hdc ); }

1 0

Józef Kucia : dxgi: Do not store IDXGIOutputs in IDXGIAdapter.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: b835a358819a6bd70bfc3b6f5b76c1d9d5cc55a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b835a358819a6bd70bfc3b6f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:21 2016 +0200 dxgi: Do not store IDXGIOutputs in IDXGIAdapter. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 28 +++++++++++----------------- dlls/dxgi/dxgi_private.h | 5 ++--- dlls/dxgi/factory.c | 15 +-------------- dlls/dxgi/output.c | 27 +++++++++++++++++++-------- dlls/dxgi/tests/device.c | 18 +++++++++--------- 5 files changed, 42 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b835a358819a6bd70bfc3…

1 0

Józef Kucia : dxgi: Store IDXGIAdapter in IDXGIDevice.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 25ad11cef766eeb6706363e299e5885d6996ae12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ad11cef766eeb6706363e29… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:22 2016 +0200 dxgi: Store IDXGIAdapter in IDXGIDevice. Signed-off-by: Józef Kucia <jkucia(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 | 35 ++++++++++++++++++----------------- dlls/dxgi/dxgi_private.h | 1 + 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 0c82383..f5de698 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -72,21 +72,23 @@ static ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IWineDXGIDevice *iface) static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", device, refcount); if (!refcount) { - if (This->child_layer) IUnknown_Release(This->child_layer); + if (device->child_layer) + IUnknown_Release(device->child_layer); wined3d_mutex_lock(); - wined3d_device_uninit_3d(This->wined3d_device); - wined3d_device_decref(This->wined3d_device); + wined3d_device_uninit_3d(device->wined3d_device); + wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); - IDXGIFactory1_Release(This->factory); - wined3d_private_store_cleanup(&This->private_store); - HeapFree(GetProcessHeap(), 0, This); + IDXGIAdapter1_Release(device->adapter); + IDXGIFactory1_Release(device->factory); + wined3d_private_store_cleanup(&device->private_store); + HeapFree(GetProcessHeap(), 0, device); } return refcount; @@ -148,16 +150,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, R static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IWineDXGIDevice *iface, IDXGIAdapter **adapter) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - struct wined3d_device_creation_parameters create_parameters; + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); - TRACE("iface %p, adapter %p\n", iface, adapter); + TRACE("iface %p, adapter %p.\n", iface, adapter); - wined3d_mutex_lock(); - wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters); - wined3d_mutex_unlock(); - - return IDXGIFactory1_EnumAdapters(This->factory, create_parameters.adapter_idx, adapter); + *adapter = (IDXGIAdapter *)device->adapter; + IDXGIAdapter_AddRef(*adapter); + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *iface, @@ -457,6 +456,8 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l device->factory = &dxgi_factory->IDXGIFactory1_iface; IDXGIFactory1_AddRef(device->factory); + device->adapter = &dxgi_adapter->IDXGIAdapter1_iface; + IDXGIAdapter1_AddRef(device->adapter); return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index a4ed850..7c81900 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -119,6 +119,7 @@ struct dxgi_device struct wined3d_private_store private_store; struct wined3d_device *wined3d_device; IDXGIFactory1 *factory; + IDXGIAdapter1 *adapter; }; HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer,

1 0

Józef Kucia : dxgi: Do not store IDXGIAdapters in IDXGIFactory.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: eb039240e52c3324e9ec8631a9fcdae6d1b2c5bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb039240e52c3324e9ec8631a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:23 2016 +0200 dxgi: Do not store IDXGIAdapters in IDXGIFactory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 25 +++++++++++++----- dlls/dxgi/dxgi_private.h | 7 +++-- dlls/dxgi/factory.c | 69 +++++++++++------------------------------------- dlls/dxgi/output.c | 4 +-- dlls/dxgi/tests/device.c | 22 +++++++-------- 5 files changed, 50 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb039240e52c3324e9ec8…

1 0

Józef Kucia : dxgi: Do not store IDXGIFactory in IDXGIDevice.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 5cd719b8671eb5a3e5104216fac3836ef8ab8a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd719b8671eb5a3e5104216f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:24 2016 +0200 dxgi: Do not store IDXGIFactory in IDXGIDevice. Signed-off-by: Józef Kucia <jkucia(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 | 3 --- dlls/dxgi/dxgi_private.h | 1 - dlls/dxgi/tests/device.c | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index f5de698..2cf9aa7 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -86,7 +86,6 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); IDXGIAdapter1_Release(device->adapter); - IDXGIFactory1_Release(device->factory); wined3d_private_store_cleanup(&device->private_store); HeapFree(GetProcessHeap(), 0, device); } @@ -454,8 +453,6 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l } wined3d_mutex_unlock(); - device->factory = &dxgi_factory->IDXGIFactory1_iface; - IDXGIFactory1_AddRef(device->factory); device->adapter = &dxgi_adapter->IDXGIAdapter1_iface; IDXGIAdapter1_AddRef(device->adapter); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5a4d43e..aca17ba 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -116,7 +116,6 @@ struct dxgi_device LONG refcount; struct wined3d_private_store private_store; struct wined3d_device *wined3d_device; - IDXGIFactory1 *factory; IDXGIAdapter1 *adapter; }; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 1baea71..ab294f8 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -467,7 +467,7 @@ static void test_create_swapchain(void) expected_refcount = get_refcount((IUnknown *)adapter); refcount = get_refcount((IUnknown *)factory); - todo_wine ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); refcount = get_refcount((IUnknown *)device); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); @@ -499,7 +499,7 @@ static void test_create_swapchain(void) IDXGISwapChain_Release(swapchain); refcount = get_refcount((IUnknown *)factory); - todo_wine ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); for (i = 0; i < sizeof(refresh_list)/sizeof(refresh_list[0]); i++) {

1 0

Józef Kucia : dxgi: Implement dxgi_swapchain_GetParent().
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: cbf0a1b59a066005480ee0c7919584532a99c3c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf0a1b59a066005480ee0c79… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:25 2016 +0200 dxgi: Implement dxgi_swapchain_GetParent(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 56 +++++++++++++++++++++++++++++++++--------------- dlls/dxgi/tests/device.c | 12 +++++------ 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index aca17ba..129f6b4 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -156,6 +156,7 @@ struct dxgi_swapchain struct wined3d_private_store private_store; struct wined3d_swapchain *wined3d_swapchain; IWineDXGIDevice *device; + IDXGIFactory *factory; }; HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device *device, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index da705e4..921fcdf 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -78,6 +78,8 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) if (!refcount) { IWineDXGIDevice *device = swapchain->device; + if (swapchain->factory) + IDXGIFactory_Release(swapchain->factory); wined3d_mutex_lock(); wined3d_swapchain_decref(swapchain->wined3d_swapchain); wined3d_mutex_unlock(); @@ -122,9 +124,18 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetPrivateData(IDXGISwapChain *i static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetParent(IDXGISwapChain *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); - return E_NOTIMPL; + TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); + + if (!swapchain->factory) + { + ERR("Implicit swapchain does not store reference to parent.\n"); + *parent = NULL; + return E_NOINTERFACE; + } + + return IDXGIFactory_QueryInterface(swapchain->factory, riid, parent); } /* IDXGIDeviceSubObject methods */ @@ -373,21 +384,6 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device { HRESULT hr; - swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; - swapchain->refcount = 1; - wined3d_mutex_lock(); - wined3d_private_store_init(&swapchain->private_store); - - if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &dxgi_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) - { - WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); - wined3d_private_store_cleanup(&swapchain->private_store); - wined3d_mutex_unlock(); - return hr; - } - wined3d_mutex_unlock(); - /** * A reference to the implicit swapchain is held by the wined3d device. * In order to avoid circular references we do not keep a reference @@ -395,13 +391,39 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device */ if (!implicit) { + if (FAILED(hr = IDXGIAdapter1_GetParent(device->adapter, &IID_IDXGIFactory, + (void **)&swapchain->factory))) + { + WARN("Failed to get adapter parent, hr %#x.\n", hr); + return hr; + } swapchain->device = &device->IWineDXGIDevice_iface; IWineDXGIDevice_AddRef(swapchain->device); } else { swapchain->device = NULL; + swapchain->factory = NULL; } + swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; + swapchain->refcount = 1; + wined3d_mutex_lock(); + wined3d_private_store_init(&swapchain->private_store); + + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, + &dxgi_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) + { + WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); + wined3d_private_store_cleanup(&swapchain->private_store); + wined3d_mutex_unlock(); + if (swapchain->factory) + IDXGIFactory_Release(swapchain->factory); + if (swapchain->device) + IWineDXGIDevice_Release(swapchain->device); + return hr; + } + wined3d_mutex_unlock(); + return S_OK; } diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index ab294f8..5808b64 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -485,15 +485,15 @@ static void test_create_swapchain(void) ok(hr == E_INVALIDARG, "GetDesc unexpectedly returned %#x.\n", hr); hr = IDXGISwapChain_GetParent(swapchain, &IID_IUnknown, (void **)&parent); - todo_wine ok(SUCCEEDED(hr), "GetParent failed %#x.\n", hr); - todo_wine ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); - if (SUCCEEDED(hr)) refcount = IUnknown_Release(parent); + ok(SUCCEEDED(hr), "GetParent failed %#x.\n", hr); + ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); + refcount = IUnknown_Release(parent); todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); hr = IDXGISwapChain_GetParent(swapchain, &IID_IDXGIFactory, (void **)&parent); - todo_wine ok(SUCCEEDED(hr), "GetParent failed %#x.\n", hr); - todo_wine ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); - if (SUCCEEDED(hr)) refcount = IUnknown_Release(parent); + ok(SUCCEEDED(hr), "GetParent failed %#x.\n", hr); + ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); + refcount = IUnknown_Release(parent); todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); IDXGISwapChain_Release(swapchain);

1 0

Józef Kucia : wined3d: Add shader limits for SM 4.1.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: d276a2858591c42899431a71511e2690864e49e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d276a2858591c42899431a715… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:26 2016 +0200 wined3d: Add shader limits for SM 4.1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 50cafab..8f8b727 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -522,7 +522,7 @@ static void shader_set_limits(struct wined3d_shader *shader) * shaders to 256. */ {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), { 4, 16, 256, 16, 12, 0}}, {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(4, 0), {16, 0, 0, 0, 16, 0}}, - {WINED3D_SHADER_VERSION(5, 0), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 32, 0}}, + {WINED3D_SHADER_VERSION(4, 1), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 32, 0}}, {0} }, hs_limits[] = @@ -539,7 +539,7 @@ static void shader_set_limits(struct wined3d_shader *shader) { /* min_version, max_version, sampler, constant_int, constant_float, constant_bool, packed_output, packed_input */ {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(4, 0), {16, 0, 0, 0, 32, 16}}, - {WINED3D_SHADER_VERSION(5, 0), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 32, 32}}, + {WINED3D_SHADER_VERSION(4, 1), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 32, 32}}, {0} }, ps_limits[] =

1 0

Józef Kucia : d3d11/tests: Add test for creating SM 4.1 shaders.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: cfd505ad4efd5a8a8f00394d3aada3940de28da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd505ad4efd5a8a8f00394d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:27 2016 +0200 d3d11/tests: Add test for creating SM 4.1 shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 128 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 112 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfd505ad4efd5a8a8f003…

1 0

Nikolay Sivov : dwrite/tests: A test for glyphBox* metrics.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 726e82dde2c04255185f3dbe9846b95630d47db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=726e82dde2c04255185f3dbe9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 14 19:10:31 2016 +0300 dwrite/tests: A test for glyphBox* metrics. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 25c85e8..9687dc5 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1551,8 +1551,13 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET hr = IDWriteFontFace_TryGetFontTable(fontface, MS_POST_TAG, (const void**)&tt_post, &size, &post_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); - if (tt_head) + if (tt_head) { metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); + metrics->glyphBoxLeft = GET_BE_WORD(tt_head->xMin); + metrics->glyphBoxTop = GET_BE_WORD(tt_head->yMax); + metrics->glyphBoxRight = GET_BE_WORD(tt_head->xMax); + metrics->glyphBoxBottom = GET_BE_WORD(tt_head->yMin); + } if (tt_os2) { if (GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_USE_TYPO_METRICS) { @@ -1618,6 +1623,14 @@ static void check_font_metrics(const WCHAR *nameW, BOOL has_metrics1, const DWRI const DWRITE_FONT_METRICS1 *m1 = (const DWRITE_FONT_METRICS1*)got; ok(m1->hasTypographicMetrics == expected->hasTypographicMetrics, "font %s: hasTypographicMetrics %d, " "expected %d\n", wine_dbgstr_w(nameW), m1->hasTypographicMetrics, expected->hasTypographicMetrics); + ok(m1->glyphBoxLeft == expected->glyphBoxLeft, "font %s: glyphBoxLeft %d, expected %d\n", wine_dbgstr_w(nameW), + m1->glyphBoxLeft, expected->glyphBoxLeft); + ok(m1->glyphBoxTop == expected->glyphBoxTop, "font %s: glyphBoxTop %d, expected %d\n", wine_dbgstr_w(nameW), + m1->glyphBoxTop, expected->glyphBoxTop); + ok(m1->glyphBoxRight == expected->glyphBoxRight, "font %s: glyphBoxRight %d, expected %d\n", wine_dbgstr_w(nameW), + m1->glyphBoxRight, expected->glyphBoxRight); + ok(m1->glyphBoxBottom == expected->glyphBoxBottom, "font %s: glyphBoxBottom %d, expected %d\n", wine_dbgstr_w(nameW), + m1->glyphBoxBottom, expected->glyphBoxBottom); } }

1 0

Nikolay Sivov : webservices: Fix unsupported options detection (Coverity).
by Alexandre Julliard 13 Apr '16

13 Apr '16

Module: wine Branch: master Commit: 1ccc52169730079414eb3e4d1a18ec1131bb6ed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccc52169730079414eb3e4d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 19:00:40 2016 +0300 webservices: Fix unsupported options detection (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index c2c9d0b..09b370e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2761,7 +2761,7 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION static WS_READ_OPTION map_field_options( WS_TYPE type, ULONG options ) { - if (options & !(WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) + if (options & ~(WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) { FIXME( "options %08x not supported\n", options ); return 0;

1 0