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

Nikolay Sivov : dwrite: Implement family and face name resolution.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: c0ab20caf907ff841d0d8a1784150aa6c56b5480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ab20caf907ff841d0d8a178… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 31 08:13:03 2015 +0300 dwrite: Implement family and face name resolution. --- dlls/dwrite/font.c | 262 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 208 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0ab20caf907ff841d0d8…

1 0

Nikolay Sivov : dwrite: Recognize semi light weight patterns.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: 9a6b0750c7ab3da676a7fc7f857a2d5007b5f6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6b0750c7ab3da676a7fc7f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 31 08:13:44 2015 +0300 dwrite: Recognize semi light weight patterns. --- dlls/dwrite/font.c | 10 ++++++++++ include/dwrite.idl | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b1a3cae..63ad277 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2236,6 +2236,11 @@ static DWRITE_FONT_WEIGHT font_extract_weight(struct list *tokens, DWRITE_FONT_W { NULL } }; + static const struct name_pattern semilight_patterns[] = { + { semiW, lightW }, + { NULL } + }; + static const struct name_pattern demibold_patterns[] = { { semiW, boldW }, { demiW, boldW }, @@ -2302,6 +2307,9 @@ static DWRITE_FONT_WEIGHT font_extract_weight(struct list *tokens, DWRITE_FONT_W if (match_pattern_list(tokens, extralight_patterns, match)) return DWRITE_FONT_WEIGHT_EXTRA_LIGHT; + if (match_pattern_list(tokens, semilight_patterns, match)) + return DWRITE_FONT_WEIGHT_SEMI_LIGHT; + if (match_pattern_list(tokens, demibold_patterns, match)) return DWRITE_FONT_WEIGHT_DEMI_BOLD; @@ -2362,6 +2370,7 @@ static int compare_knownweights(const void *a, const void* b) static BOOL is_known_weight_value(DWRITE_FONT_WEIGHT weight, WCHAR *nameW) { static const WCHAR extralightW[] = {'E','x','t','r','a',' ','L','i','g','h','t',0}; + static const WCHAR semilightW[] = {'S','e','m','i',' ','L','i','g','h','t',0}; static const WCHAR extrablackW[] = {'E','x','t','r','a',' ','B','l','a','c','k',0}; static const WCHAR extraboldW[] = {'E','x','t','r','a',' ','B','o','l','d',0}; static const WCHAR demiboldW[] = {'D','e','m','i',' ','B','o','l','d',0}; @@ -2371,6 +2380,7 @@ static BOOL is_known_weight_value(DWRITE_FONT_WEIGHT weight, WCHAR *nameW) { thinW, DWRITE_FONT_WEIGHT_THIN }, { extralightW, DWRITE_FONT_WEIGHT_EXTRA_LIGHT }, { lightW, DWRITE_FONT_WEIGHT_LIGHT }, + { semilightW, DWRITE_FONT_WEIGHT_SEMI_LIGHT }, { mediumW, DWRITE_FONT_WEIGHT_MEDIUM }, { demiboldW, DWRITE_FONT_WEIGHT_DEMI_BOLD }, { boldW, DWRITE_FONT_WEIGHT_BOLD }, diff --git a/include/dwrite.idl b/include/dwrite.idl index f8644ba..9452e11 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -73,6 +73,7 @@ typedef enum DWRITE_FONT_WEIGHT DWRITE_FONT_WEIGHT_EXTRA_LIGHT = 200, DWRITE_FONT_WEIGHT_ULTRA_LIGHT = 200, DWRITE_FONT_WEIGHT_LIGHT = 300, + DWRITE_FONT_WEIGHT_SEMI_LIGHT = 350, DWRITE_FONT_WEIGHT_NORMAL = 400, DWRITE_FONT_WEIGHT_REGULAR = 400, DWRITE_FONT_WEIGHT_MEDIUM = 500,

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: 2d2e9e5528dbed0ed4d87ddf3832f39ffe076b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2e9e5528dbed0ed4d87ddf3… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Aug 28 14:35:10 2015 +0200 po: Update German translation. --- po/de.po | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index fe8b42e..806eff2 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-07-19 02:02+0200\n" +"PO-Revision-Date: 2015-08-28 14:35+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -12938,18 +12938,17 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "Uninstaller: Die Anwendung mit der GUID '%1' wurde nicht gefunden\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"Uninstaller: Auf die Option '--remove' muss eine Anwendungs-GUID folgen\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Fehler: Ungültige Option '%c'.\n" +msgstr "Uninstaller: Ungültige Option [%1]\n" #: uninstaller.rc:35 msgid "" @@ -12958,6 +12957,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Wine Anwendungsentferner\n" +"\n" +"Deinstalliert Anwendungen aus dem aktuellen Wineprefix.\n" +"\n" #: uninstaller.rc:43 msgid "" @@ -12972,6 +12975,17 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"Aufruf:\n" +" uninstaller [Optionen]\n" +"\n" +"Optionen:\n" +" --help\t Zeigt diese Hilfe an.\n" +" --list\t Zeigt alle im aktuellen Wineprefix installierten Anwendungen " +"an.\n" +" --remove {GUID} Deinstalliert die angegebene Anwendung.\n" +"\t\t Benutzen Sie '--list', um die Anwendungs-GUID zu bestimmen.\n" +" [keine Option] Startet die grafische Version dieses Programms.\n" +"\n" #: view.rc:36 msgid "&Pan"

1 0

Hugh McMaster : regsvr32: Process flags before files.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: d3b55e99e98a966d5357613656c99b5d1b0a0913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b55e99e98a966d535761365… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 31 19:51:44 2015 +1000 regsvr32: Process flags before files. --- programs/regsvr32/regsvr32.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 449124f..8d1ab17 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -231,10 +231,8 @@ int wmain(int argc, WCHAR* argv[]) OleInitialize(NULL); - /* Strictly, the Microsoft version processes all the flags before + /* We mirror the Microsoft version by processing all of the flags before * the files (e.g. regsvr32 file1 /s file2 is silent even for file1). - * For ease, we will not replicate that and will process the arguments - * in order. * * Note the complication that this version may be passed Unix format filenames * which could be mistaken for flags. The Windows version conveniently @@ -270,8 +268,13 @@ int wmain(int argc, WCHAR* argv[]) output_write(STRING_USAGE); return 1; } + argv[i] = NULL; } - else + } + + for (i = 1; i < argc; i++) + { + if (argv[i]) { WCHAR *DllName = argv[i]; int res = 0;

1 0

Józef Kucia : d3d11: Fix compilation on GCC with -O0.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: 59745133f36878a32cc7d2ceecc065c0e85ce423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59745133f36878a32cc7d2cee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 30 22:44:40 2015 +0200 d3d11: Fix compilation on GCC with -O0. --- dlls/d3d11/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 307ef23..7accfcd 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -468,7 +468,7 @@ UINT d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(UINT resource_misc static const UINT bitwise_identical_flags = D3D10_RESOURCE_MISC_GENERATE_MIPS | D3D10_RESOURCE_MISC_SHARED | D3D10_RESOURCE_MISC_TEXTURECUBE; - static const UINT handled_flags = bitwise_identical_flags + const UINT handled_flags = bitwise_identical_flags | D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D10_RESOURCE_MISC_GDI_COMPATIBLE; UINT d3d11_resource_misc_flags = resource_misc_flags & bitwise_identical_flags; @@ -496,7 +496,7 @@ UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc | D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE | D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER | D3D11_RESOURCE_MISC_GUARDED; - static const UINT handled_flags = bitwise_identical_flags + const UINT handled_flags = bitwise_identical_flags | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D11_RESOURCE_MISC_GDI_COMPATIBLE; UINT d3d10_resource_misc_flags = resource_misc_flags & bitwise_identical_flags;

1 0

Józef Kucia : d3d11: Fix resource misc flags conversion.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: a24ff273861239421f213340c31f81686e689ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24ff273861239421f213340c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 30 22:44:41 2015 +0200 d3d11: Fix resource misc flags conversion. Tests with ID3D11Buffers have shown that not all resource misc flags are translated to d3d10 flags. --- dlls/d3d11/utils.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 7accfcd..3ad00da 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -488,17 +488,14 @@ UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc { static const UINT bitwise_identical_flags = D3D11_RESOURCE_MISC_GENERATE_MIPS | D3D11_RESOURCE_MISC_SHARED - | D3D11_RESOURCE_MISC_TEXTURECUBE - | D3D11_RESOURCE_MISC_BUFFER_STRUCTURED - | D3D11_RESOURCE_MISC_RESOURCE_CLAMP - | D3D11_RESOURCE_MISC_SHARED_NTHANDLE - | D3D11_RESOURCE_MISC_RESTRICTED_CONTENT - | D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE - | D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER - | D3D11_RESOURCE_MISC_GUARDED; + | D3D11_RESOURCE_MISC_TEXTURECUBE; const UINT handled_flags = bitwise_identical_flags + | D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS + | D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS + | D3D11_RESOURCE_MISC_BUFFER_STRUCTURED | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX - | D3D11_RESOURCE_MISC_GDI_COMPATIBLE; + | D3D11_RESOURCE_MISC_GDI_COMPATIBLE + | D3D11_RESOURCE_MISC_SHARED_NTHANDLE; UINT d3d10_resource_misc_flags = resource_misc_flags & bitwise_identical_flags; if (resource_misc_flags & D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX)

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateTexture2D().
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: e0e72d284a374e78c5d80436f8e72fcac46d4e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e72d284a374e78c5d80436f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 30 22:44:42 2015 +0200 d3d11: Implement d3d11_device_CreateTexture2D(). --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 25 ++++++++++++------------- dlls/d3d11/texture.c | 26 ++++++++++++++++++++++++-- 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index baff284..9eb145c 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -112,8 +112,8 @@ static inline struct d3d10_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D return CONTAINING_RECORD(iface, struct d3d10_texture2d, ID3D10Texture2D_iface); } -HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device *device, - const D3D11_TEXTURE2D_DESC *desc, const D3D10_SUBRESOURCE_DATA *initial_data) DECLSPEC_HIDDEN; +HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, + const D3D11_SUBRESOURCE_DATA *data, struct d3d10_texture2d **texture) DECLSPEC_HIDDEN; struct d3d10_texture2d *unsafe_impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) DECLSPEC_HIDDEN; /* ID3D10Texture3D */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9067de9..3fe8dac 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -75,9 +75,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture1D(ID3D11Device *ifac static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device *iface, const D3D11_TEXTURE2D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture2D **texture) { - FIXME("iface %p, desc %p, data %p, texture %p stub!\n", iface, desc, data, texture); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d10_texture2d *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); + + if (FAILED(hr = d3d_texture2d_create(device, desc, data, &object))) + return hr; + + *texture = &object->ID3D11Texture2D_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device *iface, @@ -2011,10 +2020,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *ifa TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - d3d11_desc.Width = desc->Width; d3d11_desc.Height = desc->Height; d3d11_desc.MipLevels = desc->MipLevels; @@ -2026,17 +2031,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *ifa d3d11_desc.CPUAccessFlags = d3d11_cpu_access_flags_from_d3d10_cpu_access_flags(desc->CPUAccessFlags); d3d11_desc.MiscFlags = d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(desc->MiscFlags); - if (FAILED(hr = d3d10_texture2d_init(object, device, &d3d11_desc, data))) - { - WARN("Failed to initialize texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_texture2d_create(device, &d3d11_desc, (const D3D11_SUBRESOURCE_DATA *)data, &object))) return hr; - } *texture = &object->ID3D10Texture2D_iface; - TRACE("Created ID3D10Texture2D %p\n", object); - return S_OK; } diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index eac1569..d3e14f8 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -444,8 +444,8 @@ static const struct wined3d_parent_ops d3d10_texture2d_wined3d_parent_ops = d3d10_texture2d_wined3d_object_released, }; -HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device *device, - const D3D11_TEXTURE2D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) +static HRESULT d3d_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device *device, + const D3D11_TEXTURE2D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data) { struct wined3d_resource_desc wined3d_desc; unsigned int levels; @@ -520,6 +520,28 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device return S_OK; } +HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, + const D3D11_SUBRESOURCE_DATA *data, struct d3d10_texture2d **texture) +{ + struct d3d10_texture2d *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_texture2d_init(object, device, desc, data))) + { + WARN("Failed to initialize texture, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created texture %p.\n", object); + *texture = object; + + return S_OK; +} + static inline struct d3d10_texture3d *impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) { return CONTAINING_RECORD(iface, struct d3d10_texture3d, ID3D10Texture3D_iface);

1 0

Józef Kucia : d3d11/tests: Port test_create_texture2d () from d3d10core.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: 44d493aac3c9613ebcc852297bd13e1c391e6c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d493aac3c9613ebcc852297… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 30 22:44:43 2015 +0200 d3d11/tests: Port test_create_texture2d() from d3d10core. --- dlls/d3d11/tests/d3d11.c | 112 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 104 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f313806..5bec3d6 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1,4 +1,5 @@ /* + * Copyright 2008 Henri Verbeet for CodeWeavers * Copyright 2015 Józef Kucia for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -27,18 +28,19 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } -static ID3D11Device *create_device(D3D_FEATURE_LEVEL feature_level) +static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) { ID3D11Device *device; + UINT feature_level_count = feature_level ? 1 : 0; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, - &device, NULL, NULL))) + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) return device; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, - &device, NULL, NULL))) + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) return device; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, - &device, NULL, NULL))) + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) return device; return NULL; @@ -110,7 +112,7 @@ static void test_device_interfaces(void) for (i = 0; i < sizeof(feature_levels) / sizeof(*feature_levels); i++) { - if (!(device = create_device(feature_levels[i]))) + if (!(device = create_device(&feature_levels[i]))) { skip("Failed to create device for feature level %#x, skipping tests.\n", feature_levels[i]); continue; @@ -146,8 +148,102 @@ static void test_device_interfaces(void) } } +static void test_create_texture2d(void) +{ + ULONG refcount, expected_refcount; + D3D11_SUBRESOURCE_DATA data = {0}; + ID3D11Device *device, *tmp; + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture; + IDXGISurface *surface; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + desc.Width = 512; + desc.Height = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &desc, &data, &texture); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11Texture2D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Texture should implement IDXGISurface.\n"); + IDXGISurface_Release(surface); + ID3D11Texture2D_Release(texture); + + desc.MipLevels = 0; + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11Texture2D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + ID3D11Texture2D_GetDesc(texture, &desc); + ok(desc.Width == 512, "Got unexpected Width %u.\n", desc.Width); + ok(desc.Height == 512, "Got unexpected Height %u.\n", desc.Height); + ok(desc.MipLevels == 10, "Got unexpected MipLevels %u.\n", desc.MipLevels); + ok(desc.ArraySize == 1, "Got unexpected ArraySize %u.\n", desc.ArraySize); + 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 == D3D11_USAGE_DEFAULT, "Got unexpected Usage %u.\n", desc.Usage); + ok(desc.BindFlags == D3D11_BIND_RENDER_TARGET, "Got unexpected BindFlags %#x.\n", desc.BindFlags); + ok(desc.CPUAccessFlags == 0, "Got unexpected CPUAccessFlags %#x.\n", desc.CPUAccessFlags); + ok(desc.MiscFlags == 0, "Got unexpected MiscFlags %#x.\n", desc.MiscFlags); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(FAILED(hr), "Texture should not implement IDXGISurface.\n"); + ID3D11Texture2D_Release(texture); + + desc.MipLevels = 1; + desc.ArraySize = 2; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(FAILED(hr), "Texture should not implement IDXGISurface.\n"); + ID3D11Texture2D_Release(texture); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); test_device_interfaces(); + test_create_texture2d(); }

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::SetVolume.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: cb38242821bfb24792b3d15c866a6d3284fea653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb38242821bfb24792b3d15c8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 28 08:22:22 2015 -0500 xaudio2: Implement IXAudio2SourceVoice::SetVolume. --- dlls/xaudio2_7/xaudio_dll.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 530318c..b8fbbc6 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -402,7 +402,14 @@ static HRESULT WINAPI XA2SRC_SetVolume(IXAudio2SourceVoice *iface, float Volume, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + ALfloat al_gain; + TRACE("%p, %f, 0x%x\n", This, Volume, OperationSet); + + al_gain = Volume; + + alSourcef(This->al_src, AL_GAIN, al_gain); + return S_OK; }

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::FlushSourceBuffers.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: 66a58ad52a5e0dd9b444dc6b844e939367d2e047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a58ad52a5e0dd9b444dc6b8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 28 08:22:25 2015 -0500 xaudio2: Implement IXAudio2SourceVoice::FlushSourceBuffers. --- dlls/xaudio2_7/xaudio_dll.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index b8fbbc6..48ab3db 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -639,8 +639,45 @@ static HRESULT WINAPI XA2SRC_SubmitSourceBuffer(IXAudio2SourceVoice *iface, static HRESULT WINAPI XA2SRC_FlushSourceBuffers(IXAudio2SourceVoice *iface) { + UINT i, first, last, to_flush; XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + TRACE("%p\n", This); + + EnterCriticalSection(&This->lock); + + if(This->running && This->nbufs > 0){ + /* when running, flush only completely unused buffers; the rest remain + * in queue */ + last = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; + first = (This->cur_buf + 1) % XAUDIO2_MAX_QUEUED_BUFFERS; + if(This->cur_buf == last) + /* nothing to do */ + to_flush = 0; + else if(last >= first) + to_flush = last - first; + else + to_flush = last + XAUDIO2_MAX_QUEUED_BUFFERS - first; + }else{ + /* when stopped, flush all buffers */ + first = This->first_buf; + last = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; + to_flush = This->nbufs; + } + + + for(i = first; + i < (first + to_flush) % XAUDIO2_MAX_QUEUED_BUFFERS; + i = (i + 1) % XAUDIO2_MAX_QUEUED_BUFFERS){ + if(This->cb) + IXAudio2VoiceCallback_OnBufferEnd(This->cb, + This->buffers[i].xa2buffer.pContext); + } + + This->nbufs -= to_flush; + + LeaveCriticalSection(&This->lock); + return S_OK; }

1 0