April 2018 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Do not allocate system memory for resources by default.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: 409f32ffa3abf5d6648c7535f61e03d8c5faf20f URL: https://source.winehq.org/git/wine.git/?a=commit;h=409f32ffa3abf5d6648c7535… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 10 12:29:55 2018 +0200 wined3d: Do not allocate system memory for resources by default. Avoids allocating system memory for depth/stencil and 3D textures. 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/buffer.c | 6 +++--- dlls/wined3d/resource.c | 13 +++++-------- dlls/wined3d/texture.c | 17 ++++++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5b92470..3f4552f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -615,10 +615,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, return TRUE; if (!wined3d_resource_allocate_sysmem(&buffer->resource)) - { - ERR("Failed to allocate system memory.\n"); return FALSE; - } return TRUE; case WINED3D_LOCATION_BUFFER: @@ -1359,6 +1356,9 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->bind_flags = bind_flags; buffer->locations = WINED3D_LOCATION_SYSMEM; + if (!wined3d_resource_allocate_sysmem(&buffer->resource)) + return E_OUTOFMEMORY; + TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", buffer, buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 2a6fa6a..b5dcdf0 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -191,12 +191,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->parent_ops = parent_ops; resource->resource_ops = resource_ops; resource->map_binding = WINED3D_LOCATION_SYSMEM; - - if (!wined3d_resource_allocate_sysmem(resource)) - { - ERR("Failed to allocate system memory.\n"); - return E_OUTOFMEMORY; - } + resource->heap_memory = NULL; if (!(usage & WINED3DUSAGE_PRIVATE)) { @@ -205,8 +200,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * { if (size > wined3d_device_get_available_texture_mem(device)) { - ERR("Out of adapter memory\n"); - wined3d_resource_free_sysmem(resource); + ERR("Out of adapter memory.\n"); return WINED3DERR_OUTOFVIDEOMEMORY; } adapter_adjust_memory(device->adapter, size); @@ -383,7 +377,10 @@ BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) void *mem; if (!(mem = heap_alloc_zero(resource->size + align))) + { + ERR("Failed to allocate system memory.\n"); return FALSE; + } p = (void **)(((ULONG_PTR)mem + align) & ~(RESOURCE_ALIGNMENT - 1)) - 1; *p = mem; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b56e6e4..b9b304e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1683,10 +1683,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned return TRUE; if (!wined3d_resource_allocate_sysmem(&texture->resource)) - { - ERR("Failed to allocate system memory.\n"); return FALSE; - } return TRUE; case WINED3D_LOCATION_USER_MEMORY: @@ -2674,11 +2671,17 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc TRACE("x scale %.8e, y scale %.8e.\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); if (wined3d_texture_use_pbo(texture, gl_info)) - { - if (desc->resource_type == WINED3D_RTYPE_TEXTURE_3D - || (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) - wined3d_resource_free_sysmem(&texture->resource); texture->resource.map_binding = WINED3D_LOCATION_BUFFER; + + if ((desc->resource_type != WINED3D_RTYPE_TEXTURE_3D + && !(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) + || !wined3d_texture_use_pbo(texture, gl_info)) + { + if (!wined3d_resource_allocate_sysmem(&texture->resource)) + { + wined3d_texture_cleanup_sync(texture); + return E_OUTOFMEMORY; + } } sub_count = level_count * layer_count;

1 0

Alistair Leslie-Hughes : wpcap: Implement pcap_dump_open and pcap_dump.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: d6fc8118779616c9cbdda4248665a87d0d3c7e5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6fc8118779616c9cbdda424… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Apr 8 23:17:19 2018 +0000 wpcap: Implement pcap_dump_open and pcap_dump. Based off a patch by Jianqiu Zhang. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wpcap/wpcap.spec | 4 ++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index fe46903..e7908cd 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -27,6 +27,7 @@ #include "winsock2.h" #include "windef.h" #include "winbase.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wpcap); @@ -45,6 +46,22 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define PCAP_SRC_IFLOCAL 3 #endif +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + void CDECL wine_pcap_breakloop(pcap_t *p) { TRACE("(%p)\n", p); @@ -341,3 +358,30 @@ int CDECL wine_wsockinit(void) if (WSAStartup(MAKEWORD(1,1), &wsadata)) return -1; return 0; } + +pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname) +{ + pcap_dumper_t *dumper; + WCHAR *fnameW = heap_strdupAtoW(fname); + char *unix_path; + + TRACE("(%p %s)\n", p, debugstr_a(fname)); + + unix_path = wine_get_unix_file_name(fnameW); + heap_free(fnameW); + if(!unix_path) + return NULL; + + TRACE("unix_path %s\n", debugstr_a(unix_path)); + + dumper = pcap_dump_open(p, unix_path); + heap_free(unix_path); + + return dumper; +} + +void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) +{ + TRACE("(%p %p %p)\n", user, h, sp); + return pcap_dump(user, h, sp); +} diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 66303b4..ffb6ed1 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -16,12 +16,12 @@ @ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch -@ stub pcap_dump +@ cdecl pcap_dump(ptr ptr str) wine_pcap_dump @ stub pcap_dump_close @ stub pcap_dump_file @ stub pcap_dump_flush @ stub pcap_dump_ftell -@ stub pcap_dump_open +@ cdecl pcap_dump_open(ptr str) wine_pcap_dump_open @ stub pcap_file @ stub pcap_fileno @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs

1 0

Alistair Leslie-Hughes : d3d11: Add support for D3D11_FEATURE_D3D11_OPTIONS1 in CheckFeatureSupport().
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: 076f542dc5741991dd9b3fc555192e4d7c6ad598 URL: https://source.winehq.org/git/wine.git/?a=commit;h=076f542dc5741991dd9b3fc5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 10 14:51:42 2018 +0430 d3d11: Add support for D3D11_FEATURE_D3D11_OPTIONS1 in CheckFeatureSupport(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8316105..ce7ef0b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3396,6 +3396,23 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device * return S_OK; } + case D3D11_FEATURE_D3D11_OPTIONS1: + { + D3D11_FEATURE_DATA_D3D11_OPTIONS1 *options = feature_support_data; + if (feature_support_data_size != sizeof(*options)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + FIXME("Returning fake Options1 support data.\n"); + options->TiledResourcesTier = D3D11_TILED_RESOURCES_NOT_SUPPORTED; + options->MinMaxFiltering = FALSE; + options->ClearViewAlsoSupportsDepthOnlyFormats = FALSE; + options->MapOnDefaultBuffers = FALSE; + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Józef Kucia : wined3d: Require BPTC compression for SM5.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: 13a53aa9698cb95c5a04490250f756bd191e6805 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13a53aa9698cb95c5a044902… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 9 10:19:38 2018 +0200 wined3d: Require BPTC compression for SM5. It's required for feature level 11_0. At some point, we probably would like to separate shader model checks from feature level checks. 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/glsl_shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0bc6aa0..121892d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10964,6 +10964,7 @@ static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *g && gl_info->supported[ARB_SHADER_IMAGE_SIZE] && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING] && gl_info->supported[ARB_TESSELLATION_SHADER] + && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC] && gl_info->supported[ARB_TEXTURE_GATHER] && gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) return 5;

1 0

Alistair Leslie-Hughes : d3d11: Add support for D3D11_FEATURE_D3D11_OPTIONS in CheckFeatureSupport().
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: ad6b7a3af9f3b8ee7dc80e1af2ba880817873366 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad6b7a3af9f3b8ee7dc80e1a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 10 14:51:43 2018 +0430 d3d11: Add support for D3D11_FEATURE_D3D11_OPTIONS in CheckFeatureSupport(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ce7ef0b..1fe6297 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3396,6 +3396,33 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device * return S_OK; } + case D3D11_FEATURE_D3D11_OPTIONS: + { + D3D11_FEATURE_DATA_D3D11_OPTIONS *options = feature_support_data; + if (feature_support_data_size != sizeof(*options)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + FIXME("Returning fake Options support data.\n"); + options->OutputMergerLogicOp = FALSE; + options->UAVOnlyRenderingForcedSampleCount = FALSE; + options->DiscardAPIsSeenByDriver = FALSE; + options->FlagsForUpdateAndCopySeenByDriver = FALSE; + options->ClearView = FALSE; + options->CopyWithOverlap = FALSE; + options->ConstantBufferPartialUpdate = FALSE; + options->ConstantBufferOffsetting = FALSE; + options->MapNoOverwriteOnDynamicConstantBuffer = FALSE; + options->MapNoOverwriteOnDynamicBufferSRV = FALSE; + options->MultisampleRTVWithForcedSampleCountOne = FALSE; + options->SAD4ShaderInstructions = FALSE; + options->ExtendedDoublesShaderInstructions = FALSE; + options->ExtendedResourceSharing = FALSE; + return S_OK; + } + case D3D11_FEATURE_D3D11_OPTIONS1: { D3D11_FEATURE_DATA_D3D11_OPTIONS1 *options = feature_support_data;

1 0

Nikolay Sivov : shell32/tests: Remove some tests workarounds.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: 738a1a33ea31eacf04b355d1822c827ef33a91a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=738a1a33ea31eacf04b355d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 10 09:31:58 2018 +0300 shell32/tests: Remove some tests workarounds. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 181 +++++++++++++---------------------------- 1 file changed, 55 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=738a1a33ea31eacf04b3…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: e787791bed8a2d9b53079f65578f75387d4cd730 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e787791bed8a2d9b53079f65… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 10 11:11:02 2018 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/po/ru.po b/po/ru.po index d8b1d8d..6661320 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-03-01 21:15+0300\n" +"PO-Revision-Date: 2018-04-10 10:53+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -9107,70 +9107,59 @@ msgstr "" "С этим сертификатам связана минимум одна неизвестная проблема безопасности." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Таймаут запроса к службе.\n" +msgstr "Таймаут запроса.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Произошла ошибка принтера." +msgstr "Произошла внутренняя ошибка.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Неверный путь.\n" +msgstr "Неверный URL.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL схема неизвестна или не поддерживается.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Имя пользователя не найдено.\n" +msgstr "Неизвестное имя сервера.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Неверный профиль пользователя.\n" +msgstr "Неверная операция.\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"Операция была отменена, вероятно из-за того, что дескриптор, с которым " +"работал запрос, был закрыт до завершения операции.\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Невозможно добавить профиль.\n" +msgstr "Запрошенный элемент не найден.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Невозможно подключиться к LDAP серверу" +msgstr "Не удалось подключиться к серверу.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Подключение к серверу было разорвано.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"Сервер вернул некорректную дату для SSL сертификата. Сертификат просрочен.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "CN-имя SSL сертификата (имя хоста) неверно.\n" #: winmm.rc:32 msgid "The specified command was carried out."

1 0

Nikolay Sivov : d3d11/tests: Add a test for setting multiple viewports.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: 1158cf05ae8428bf1b513b32ba171913ec4191fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1158cf05ae8428bf1b513b32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 10 09:30:30 2018 +0300 d3d11/tests: Add a test for setting multiple viewports. 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/d3d11/tests/d3d11.c | 191 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2f47124..d25ded8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25855,6 +25855,196 @@ static void test_unbound_multisample_texture(void) release_test_context(&test_context); } +static void test_multiple_viewports(void) +{ + struct + { + unsigned int draw_id; + unsigned int padding[3]; + } constant; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11Texture2D *texture; + ID3D11GeometryShader *gs; + ID3D11PixelShader *ps; + ID3D11Device *device; + ID3D11Buffer *cb; + HRESULT hr; + + static const DWORD gs_code[] = + { +#if 0 + struct gs_in + { + float4 pos : SV_Position; + }; + + struct gs_out + { + float4 pos : SV_Position; + uint viewport : SV_ViewportArrayIndex; + }; + + [maxvertexcount(6)] + void main(triangle gs_in vin[3], inout TriangleStream<gs_out> vout) + { + gs_out o; + for (uint instance_id = 0; instance_id < 2; ++instance_id) + { + o.viewport = instance_id; + for (uint i = 0; i < 3; ++i) + { + o.pos = vin[i].pos; + vout.Append(o); + } + vout.RestartStrip(); + } + } +#endif + 0x43425844, 0xabbb660f, 0x0729bf23, 0x14a9a104, 0x1b454917, 0x00000001, 0x0000021c, 0x00000003, + 0x0000002c, 0x00000060, 0x000000c4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000005c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000005, 0x00000001, 0x00000001, 0x00000e01, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x565f5653, 0x70776569, 0x4174726f, 0x79617272, 0x65646e49, + 0xabab0078, 0x52444853, 0x00000150, 0x00020040, 0x00000054, 0x05000061, 0x002010f2, 0x00000003, + 0x00000000, 0x00000001, 0x02000068, 0x00000001, 0x0100185d, 0x0100285c, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x04000067, 0x00102012, 0x00000001, 0x00000005, 0x0200005e, 0x00000006, + 0x05000036, 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100022, + 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000002, 0x03040003, 0x0010001a, 0x00000000, + 0x05000036, 0x00100022, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000003, 0x03040003, 0x0010002a, 0x00000000, + 0x07000036, 0x001020f2, 0x00000000, 0x00a01e46, 0x0010001a, 0x00000000, 0x00000000, 0x05000036, + 0x00102012, 0x00000001, 0x0010000a, 0x00000000, 0x01000013, 0x0700001e, 0x00100022, 0x00000000, + 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x01000009, 0x0700001e, 0x00100012, + 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + uint draw_id; + + float4 main(in float4 pos : SV_Position, + in uint viewport : SV_ViewportArrayIndex) : SV_Target + { + return float4(viewport, draw_id, 0, 0); + } +#endif + 0x43425844, 0x77334c0f, 0x5df3ca7a, 0xc53c00db, 0x3e6e5750, 0x00000001, 0x00000150, 0x00000003, + 0x0000002c, 0x00000090, 0x000000c4, 0x4e475349, 0x0000005c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000005, + 0x00000001, 0x00000001, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x565f5653, 0x70776569, + 0x4174726f, 0x79617272, 0x65646e49, 0xabab0078, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, + 0xabab0074, 0x52444853, 0x00000084, 0x00000040, 0x00000021, 0x04000059, 0x00208e46, 0x00000000, + 0x00000001, 0x04000864, 0x00101012, 0x00000001, 0x00000005, 0x03000065, 0x001020f2, 0x00000000, + 0x05000056, 0x00102012, 0x00000000, 0x0010100a, 0x00000001, 0x06000056, 0x00102022, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const struct vec4 expected_values[] = + { + {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + }; + static const float clear_color[] = {0.5f, 0.5f, 0.0f, 0.0f}; + D3D11_VIEWPORT vp[2]; + RECT rect; + int width; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + memset(&constant, 0, sizeof(constant)); + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(constant), &constant); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + hr = ID3D11Device_CreateGeometryShader(device, gs_code, sizeof(gs_code), NULL, &gs); + ok(SUCCEEDED(hr), "Failed to create geometry shader, hr %#x.\n", hr); + ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + texture_desc.Width = 32; + texture_desc.Height = 32; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + width = texture_desc.Width / 2; + + vp[0].TopLeftX = 0.0f; + vp[0].TopLeftY = 0.0f; + vp[0].Width = width; + vp[0].Height = texture_desc.Height; + vp[0].MinDepth = 0.0f; + vp[0].MaxDepth = 1.0f; + + vp[1] = vp[0]; + vp[1].TopLeftX = width; + vp[1].Width = width; + ID3D11DeviceContext_RSSetViewports(context, 2, vp); + + constant.draw_id = 0; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + constant.draw_id = 1; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[0], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); +todo_wine + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[1], 1); + + /* One viewport. */ + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetViewports(context, 1, vp); + constant.draw_id = 2; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + SetRect(&rect, 0, 0, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[2], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[3], 1); + + /* Reset viewports. */ + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetViewports(context, 0, NULL); + constant.draw_id = 3; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); +todo_wine + check_texture_sub_resource_vec4(texture, 0, NULL, &expected_values[4], 1); + + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + + ID3D11Buffer_Release(cb); + ID3D11GeometryShader_Release(gs); + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -25988,4 +26178,5 @@ START_TEST(d3d11) test_generate_mips(); test_alpha_to_coverage(); test_unbound_multisample_texture(); + test_multiple_viewports(); }

1 0

Henri Verbeet : wined3d: Get rid of the "binding" field from struct blt_info.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: acb18ea3b6cf778f846094386eb1f963a9108f3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=acb18ea3b6cf778f84609438… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 10 14:51:40 2018 +0430 wined3d: Get rid of the "binding" field from struct blt_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ee325a1..df40ea6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -38,7 +38,6 @@ static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM struct blt_info { - GLenum binding; GLenum bind_target; enum wined3d_gl_resource_type tex_type; struct wined3d_vec3 texcoords[4]; @@ -80,7 +79,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, FIXME("Unsupported texture target %#x.\n", target); /* Fall back to GL_TEXTURE_2D */ case GL_TEXTURE_2D: - info->binding = GL_TEXTURE_BINDING_2D; info->bind_target = GL_TEXTURE_2D; info->tex_type = WINED3D_GL_RES_TYPE_TEX_2D; coords[0].x = (float)rect->left / w; @@ -101,7 +99,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_RECTANGLE_ARB: - info->binding = GL_TEXTURE_BINDING_RECTANGLE_ARB; info->bind_target = GL_TEXTURE_RECTANGLE_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_RECT; coords[0].x = rect->left; coords[0].y = rect->top; coords[0].z = 0.0f; @@ -111,7 +108,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_CUBE_MAP_POSITIVE_X: - info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); @@ -123,7 +119,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_CUBE_MAP_NEGATIVE_X: - info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); @@ -135,7 +130,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_CUBE_MAP_POSITIVE_Y: - info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); @@ -147,7 +141,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y: - info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); @@ -159,7 +152,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_CUBE_MAP_POSITIVE_Z: - info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); @@ -171,7 +163,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z: - info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f);

1 0

Zebediah Figura : ole32: Allow marshalling objects from an implicit MTA.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: 95299607f9cdde10af7623fea9eb337b33753161 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95299607f9cdde10af7623fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 9 21:15:52 2018 -0500 ole32: Allow marshalling objects from an implicit MTA. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 2 +- dlls/ole32/marshal.c | 5 +++-- dlls/ole32/rpc.c | 2 +- dlls/ole32/stubmanager.c | 3 +-- dlls/ole32/tests/marshal.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index dc09d20..212d328 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -200,7 +200,7 @@ void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; -HRESULT start_apartment_remote_unknown(void) DECLSPEC_HIDDEN; +HRESULT start_apartment_remote_unknown(APARTMENT *apt) DECLSPEC_HIDDEN; HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *obj, DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 822d06e..7c0f541 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1225,11 +1225,11 @@ StdMarshalImpl_MarshalInterface( STDOBJREF stdobjref; ULONG res; HRESULT hres; - APARTMENT *apt = COM_CurrentApt(); + APARTMENT *apt; TRACE("(...,%s,...)\n", debugstr_guid(riid)); - if (!apt) + if (!(apt = apartment_get_current_or_mta())) { ERR("Apartment not initialized\n"); return CO_E_NOTINITIALIZED; @@ -1239,6 +1239,7 @@ StdMarshalImpl_MarshalInterface( RPC_StartRemoting(apt); hres = marshal_object(apt, &stdobjref, riid, pv, dest_context, dest_context_data, mshlflags); + apartment_release(apt); if (hres != S_OK) { ERR("Failed to create ifstub, hres=0x%x\n", hres); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 5a7626b..a73d23c 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1648,7 +1648,7 @@ void RPC_StartRemoting(struct apartment *apt) /* FIXME: move remote unknown exporting into this function */ } - start_apartment_remote_unknown(); + start_apartment_remote_unknown(apt); } diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 57048c6..75c4b04 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -812,11 +812,10 @@ static const IRemUnknownVtbl RemUnknown_Vtbl = }; /* starts the IRemUnknown listener for the current apartment */ -HRESULT start_apartment_remote_unknown(void) +HRESULT start_apartment_remote_unknown(APARTMENT *apt) { IRemUnknown *pRemUnknown; HRESULT hr = S_OK; - APARTMENT *apt = COM_CurrentApt(); EnterCriticalSection(&apt->cs); if (!apt->remunk_exported) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c5c69f0..e8558dd 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -3475,10 +3475,34 @@ static DWORD CALLBACK implicit_mta_use_proc(void *param) return 0; } +struct implicit_mta_marshal_data +{ + IStream *stream; + HANDLE start; + HANDLE stop; +}; + +static DWORD CALLBACK implicit_mta_marshal_proc(void *param) +{ + struct implicit_mta_marshal_data *data = param; + HRESULT hr; + + hr = CoMarshalInterface(data->stream, &IID_IClassFactory, + (IUnknown *)&Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoMarshalInterface); + + SetEvent(data->start); + + ok(!WaitForSingleObject(data->stop, 1000), "wait failed\n"); + return 0; +} + static void test_implicit_mta(void) { + struct implicit_mta_marshal_data data; HANDLE host_thread, thread; IClassFactory *cf; + IUnknown *proxy; IStream *stream; HRESULT hr; DWORD tid; @@ -3529,6 +3553,32 @@ static void test_implicit_mta(void) end_host_object(tid, host_thread); + /* Thirdly: we can marshal an object from the implicit MTA and then + * unmarshal it into the real one. */ + data.start = CreateEventA(NULL, FALSE, FALSE, NULL); + data.stop = CreateEventA(NULL, FALSE, FALSE, NULL); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.stream); + ok_ole_success(hr, CreateStreamOnHGlobal); + + thread = CreateThread(NULL, 0, implicit_mta_marshal_proc, &data, 0, NULL); + ok(!WaitForSingleObject(data.start, 1000), "wait failed\n"); + + IStream_Seek(data.stream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(data.stream, &IID_IClassFactory, (void **)&cf); + ok_ole_success(hr, CoUnmarshalInterface); + + hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void **)&proxy); + ok_ole_success(hr, IClassFactory_CreateInstance); + + IUnknown_Release(proxy); + + SetEvent(data.stop); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + CloseHandle(thread); + + IStream_Release(data.stream); + CoUninitialize(); }

1 0