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

Owen Rudge : wsdapi/tests: Ensure probe message is given unique GUID.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: 5cefe40f54212f80a7616c625cd371929797575b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cefe40f54212f80a7616c62… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 29 23:14:04 2018 +0100 wsdapi/tests: Ensure probe message is given unique GUID. This patch fixes a potential issue on the Wine test VMs where messages can be received by other VMs before they are ready to process them. wsdapi.dll then filters out the subsequent duplicate messages from the correct VM and the test fails. Avoid this by not using a hard-coded GUID. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index b76ffaf..eaefa3a 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wsdapi.dll -IMPORTS = wsdapi ole32 oleaut32 user32 ws2_32 advapi32 iphlpapi +IMPORTS = wsdapi ole32 oleaut32 user32 ws2_32 advapi32 iphlpapi rpcrt4 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index ae2fa39..e73ee77 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -47,10 +47,11 @@ static const char testProbeMessage[] = "<?xml version=\"1.0\" encoding=\"utf-8\" "xmlns:wsd=\"http://schemas.xmlsoap.org/ws/2005/04/discovery\" " "xmlns:grog=\"http://more.tests/\"><soap:Header><wsa:To>urn:schemas-xmlsoap-org:ws:2005:04:discovery</wsa:To>" "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe</wsa:Action>" - "<wsa:MessageID>urn:uuid:aa3eb169-9440-4eb7-9090-88402664cc6a</wsa:MessageID></soap:Header>" + "<wsa:MessageID>urn:uuid:%s</wsa:MessageID></soap:Header>" "<soap:Body><wsd:Probe><wsd:Types>grog:Cider</wsd:Types></wsd:Probe></soap:Body></soap:Envelope>"; static HANDLE probe_event = NULL; +static UUID probe_message_id; #define MAX_CACHED_MESSAGES 5 #define MAX_LISTENING_THREADS 20 @@ -465,6 +466,22 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP { ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); ok(pSoap->Header.To != NULL, "pSoap->Header.To == NULL\n"); + + ok(pSoap->Header.MessageID != NULL, "pSoap->Header.MessageID == NULL"); + + /* Ensure the message ID is at least 9 characters long (to skip past the 'urn:uuid:' prefix) */ + if ((pSoap->Header.MessageID != NULL) && (lstrlenW(pSoap->Header.MessageID) > 9)) + { + UUID uuid; + RPC_STATUS ret = UuidFromStringW((LPWSTR)pSoap->Header.MessageID + 9, &uuid); + + trace("Received message with UUID '%s' (expected UUID '%s')\n", wine_dbgstr_guid(&uuid), + wine_dbgstr_guid(&probe_message_id)); + + /* Check if we've either received a message without a UUID, or the UUID isn't the one we sent. If so, + ignore it and wait for another message. */ + if ((ret != RPC_S_OK) || (UuidEqual(&uuid, &probe_message_id, &ret) == FALSE)) return S_OK; + } } SetEvent(probe_event); @@ -623,6 +640,7 @@ static void Publish_tests(void) static const WCHAR uri3[] = {'h','t','t','p',':','/','/','t','h','i','r','d','.','u','r','l','/',0}; WSD_NAME_LIST types_list; WSD_URI_LIST scopes_list, xaddrs_list; + unsigned char *probe_uuid_str; rc = WSDCreateDiscoveryPublisher(NULL, &publisher); ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); @@ -818,8 +836,23 @@ after_publish_test: /* Test the receiving of a probe message */ probe_event = CreateEventW(NULL, TRUE, FALSE, NULL); - ok(send_udp_multicast_of_type(testProbeMessage, sizeof(testProbeMessage) - 1, AF_INET) == TRUE, "Sending Probe message failed\n"); - todo_wine ok(WaitForSingleObject(probe_event, 2000) == WAIT_OBJECT_0, "Probe message not received\n"); + + UuidCreate(&probe_message_id); + UuidToStringA(&probe_message_id, &probe_uuid_str); + + ok(probe_uuid_str != NULL, "Failed to create UUID for probe message\n"); + + if (probe_uuid_str != NULL) + { + char probe_message[sizeof(testProbeMessage) + 50]; + sprintf(probe_message, testProbeMessage, probe_uuid_str); + + ok(send_udp_multicast_of_type(probe_message, strlen(probe_message), AF_INET) == TRUE, "Sending Probe message failed\n"); + todo_wine ok(WaitForSingleObject(probe_event, 2000) == WAIT_OBJECT_0, "Probe message not received\n"); + + RpcStringFreeA(&probe_uuid_str); + } + CloseHandle(probe_event); ref = IWSDiscoveryPublisher_Release(publisher);

1 0

Michael Stefaniuc : d3d10_1/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: be12dcf9da2ce14b70ebc935924de9db62bc81b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be12dcf9da2ce14b70ebc935… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:26 2018 +0200 d3d10_1/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 7c2b3ba..f6abea0 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -104,7 +104,7 @@ static void test_create_device(void) HWND window; HRESULT hr; - for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i) { if (SUCCEEDED(hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, d3d10_feature_levels[i], D3D10_1_SDK_VERSION, &device))) @@ -279,7 +279,7 @@ static void test_device_interfaces(void) unsigned int i; HRESULT hr; - for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i) { struct device_desc device_desc; @@ -320,7 +320,7 @@ static void test_device_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } - for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i) { struct device_desc device_desc; @@ -614,7 +614,7 @@ static void test_create_blend_state(void) refcount = ID3D10BlendState1_Release(blend_state2); ok(!refcount, "Blend state has %u references left.\n", refcount); - for (i = 0; i < sizeof(desc_conversion_tests) / sizeof(*desc_conversion_tests); ++i) + for (i = 0; i < ARRAY_SIZE(desc_conversion_tests); ++i) { const D3D10_BLEND_DESC1 *current_desc = &desc_conversion_tests[i];

1 0

Michael Stefaniuc : wer/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: a237867ca7b31c1b04b6d15b808dbbd5439dd581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a237867ca7b31c1b04b6d15b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:35 2018 +0200 wer/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wer/tests/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index b10a819..11a02fb 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -66,7 +66,7 @@ static void test_WerAddExcludedApplication(void) ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); /* appname has a path */ - res = GetWindowsDirectoryW(buffer, sizeof(buffer) / sizeof(buffer[0])); + res = GetWindowsDirectoryW(buffer, ARRAY_SIZE(buffer)); if (res > 0) { /* the last part from the path is added to the inclusion list */ hr = WerAddExcludedApplication(buffer, FALSE); @@ -118,7 +118,7 @@ static void test_WerRemoveExcludedApplication(void) "got 0x%x (expected E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))\n", hr); /* appname has a path */ - res = GetWindowsDirectoryW(buffer, sizeof(buffer) / sizeof(buffer[0])); + res = GetWindowsDirectoryW(buffer, ARRAY_SIZE(buffer)); if (res > 0) { hr = WerRemoveExcludedApplication(buffer, FALSE); ok((hr == E_FAIL) || (hr == __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND)), @@ -223,7 +223,7 @@ static void test_WerReportCreate(void) /* multiple active reports are possible */ memset(table, 0, sizeof(table)); - for (i = 0; i < (sizeof(table) / sizeof(table[0]) -1); i++) { + for (i = 0; i < (ARRAY_SIZE(table) - 1); i++) { report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, WerReportCritical, NULL, &table[i]); ok(hr == S_OK, "%02d: got 0x%x and %p (expected S_OK)\n", i, hr, table[i]);

1 0

Francois Gouget : testbot: Fix error checking on a Steps::Save() call.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: tools Branch: master Commit: a0e2d911c1a47e910bab11fcd0137d3a33389f42 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a0e2d911c1a47e910bab11f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 30 15:27:43 2018 +0200 testbot: Fix error checking on a Steps::Save() call. Collection::Save() returns three values, unlike Item::Save() which only returns two! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 6be271b..ef0d98e 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -98,7 +98,7 @@ sub OnDelete($) my $Steps = $self->Steps; map { $_->PreviousNo(undef) } @{$Steps->GetItems()}; - my ($_ErrProperty, $ErrMessage) = $Steps->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Steps->Save(); return $ErrMessage || $self->SUPER::OnDelete(); }

1 0

Francois Gouget : testbot/build: Fix handling of directory addition / removal.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: tools Branch: master Commit: f9501a1f91a5e2a5da2649d1e74ca678c950d375 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f9501a1f91a5e2a5da2649d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 30 08:05:35 2018 +0200 testbot/build: Fix handling of directory addition / removal. When a directory is added or removed we must re-run make_makefiles. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 6c72e16..a466df3 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -87,7 +87,16 @@ sub _AddTest($$$) } # Assume makefile modifications may break the build but not the tests - return if ($File eq "Makefile.in" or $Impacts->{NoUnits}); + if ($File eq "Makefile.in") + { + if ($Change eq "new" or $Change eq "rm") + { + # This adds / removes a directory + $Impacts->{Makefiles} = 1; + } + return; + } + return if ($Impacts->{NoUnits}); if (!$Tests->{$Module}->{Files}) {

1 0

Francois Gouget : testbot/build: Always rebuild the native tools.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: tools Branch: master Commit: aa2a4355b05cdcbbc5f0a1184859f0eeaa6c83c1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=aa2a4355b05cdcbbc5f0a11… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 30 08:05:15 2018 +0200 testbot/build: Always rebuild the native tools. It does not take long and it is actually hard to really know when to rebuild them if taking into account their libs/ and include/ dependencies. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 20 ++++++++------------ testbot/lib/WineTestBot/PatchUtils.pm | 6 +----- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 5e6b370..03733ce 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -83,7 +83,7 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "Patch failed to apply\n"; - return -1; + return 0; } my $Impacts = GetPatchImpact($PatchFile, "nounits"); @@ -96,7 +96,7 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "make_makefiles failed\n"; - return -1; + return 0; } } @@ -109,11 +109,11 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "Autoconf failed\n"; - return -1; + return 0; } } - return $Impacts->{Tools}; + return 1; } my $ncpus; @@ -249,21 +249,17 @@ else FatalError "Invalid number of bits $BitIndicators\n"; } -my $NeedBuildNative = ApplyPatch($PatchFile); -if ($NeedBuildNative < 0) +if (!ApplyPatch($PatchFile)) { exit(1); } CountCPUs(); -if ($NeedBuildNative) +InfoMsg "Building tools\n"; +if (!BuildNative()) { - InfoMsg "Building tools\n"; - if (!BuildNative()) - { - exit(1); - } + exit(1); } if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32)) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 2000c90..6c72e16 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -142,11 +142,7 @@ sub GetPatchImpact($;$) } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { - $Impacts->{Makefiles} = $Impacts->{Tools} = 1; - } - elsif ($Line =~ m=^--- \w+/tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)$=) - { - $Impacts->{Tools} = 1; + $Impacts->{Makefiles} = 1; } elsif ($Line =~ m=^--- /dev/null$=) {

1 0

Pablo Martin : d3d11: Make d3d11 *SetConstantBuffers use a helper method.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: 537c9dab9f8c0bc962385fa41c848690240b9cd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=537c9dab9f8c0bc962385fa4… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Tue May 29 08:39:55 2018 +0200 d3d11: Make d3d11 *SetConstantBuffers use a helper method. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 101 +++++++++++++++------------------------------------- 1 file changed, 29 insertions(+), 72 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 36ed44b..5b5449c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -97,6 +97,23 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceConte return refcount; } +static void d3d11_immediate_context_set_constant_buffers(ID3D11DeviceContext1 *iface, + enum wined3d_shader_type type, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) +{ + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + unsigned int i; + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_constant_buffer(device->wined3d_device, type, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } + wined3d_mutex_unlock(); +} + static void STDMETHODCALLTYPE d3d11_immediate_context_GetDevice(ID3D11DeviceContext1 *iface, ID3D11Device **device) { struct d3d_device *device_object = device_from_immediate_ID3D11DeviceContext1(iface); @@ -140,21 +157,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_SetPrivateDataInterface static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - - wined3d_device_set_vs_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_set_constant_buffers(iface, WINED3D_SHADER_TYPE_VERTEX, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShaderResources(ID3D11DeviceContext1 *iface, @@ -302,21 +309,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext1 static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - - wined3d_device_set_ps_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_set_constant_buffers(iface, WINED3D_SHADER_TYPE_PIXEL, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11DeviceContext1 *iface, @@ -405,21 +402,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - - wined3d_device_set_gs_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_set_constant_buffers(iface, WINED3D_SHADER_TYPE_GEOMETRY, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceContext1 *iface, @@ -1260,21 +1247,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - - wined3d_device_set_hs_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_set_constant_buffers(iface, WINED3D_SHADER_TYPE_HULL, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D11DeviceContext1 *iface, @@ -1337,21 +1314,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - - wined3d_device_set_ds_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_set_constant_buffers(iface, WINED3D_SHADER_TYPE_DOMAIN, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShaderResources(ID3D11DeviceContext1 *iface, @@ -1434,21 +1401,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetConstantBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); - unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); - wined3d_mutex_lock(); - for (i = 0; i < buffer_count; ++i) - { - struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - - wined3d_device_set_cs_cb(device->wined3d_device, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); - } - wined3d_mutex_unlock(); + d3d11_immediate_context_set_constant_buffers(iface, WINED3D_SHADER_TYPE_COMPUTE, start_slot, + buffer_count, buffers); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetConstantBuffers(ID3D11DeviceContext1 *iface,

1 0

Lucian Poston : include: Add ID2D1DeviceContext definition.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: 6f1efb83c4066af1e0af8936abb41c85b631e0e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f1efb83c4066af1e0af8936… Author: Lucian Poston <lucian.poston(a)gmail.com> Date: Tue May 29 21:22:37 2018 +0430 include: Add ID2D1DeviceContext definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 284 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/dcommon.idl | 16 +++ 2 files changed, 300 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f1efb83c4066af1e0af…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: 37e837113ce6654c436211031712719e8f9f29a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e837113ce6654c43621103… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue May 29 20:50:30 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index ca03e92..b445ad9 100644 --- a/po/lt.po +++ b/po/lt.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-05-11 22:08+0300\n" +"PO-Revision-Date: 2018-05-29 20:50+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12809,10 +12809,8 @@ msgid "Confirm Value Delete" msgstr "Reikšmės šalinimo patvirtinimas" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Ar tikrai norite pašalinti registro reikšmę „%1“?" +msgstr "Ar tikrai norite pašalinti pasirinktą registro reikšmę?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found."

1 0

Kim Geonwoo (김건우) : po: Update Korean translation.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: 17f6b9d37e155db244672d0c0dda0648de872fdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=17f6b9d37e155db244672d0c… Author: Kim Geonwoo (김건우) <rlarjsdn122(a)naver.com> Date: Mon May 28 23:30:17 2018 +0900 po: Update Korean translation. Signed-off-by: Kim Geonwoo (김건우) <rlarjsdn122(a)naver.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 1222 +++++++++++++++++++++++--------------------------------------- 1 file changed, 455 insertions(+), 767 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=17f6b9d37e155db24467…

1 0