wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Francois Gouget : testbot: Better track job status changes.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: tools Branch: master Commit: c6aed2663bb6e18816a8fce7e3978c50dea0c68a URL: https://source.winehq.org/git/tools.git/?a=commit;h=c6aed2663bb6e18816a8fce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 16 17:21:26 2022 +0200 testbot: Better track job status changes. Only set OldStatus once to avoid issues in case the status is changed multiple times before the job is saved. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 3da6ae7b..b54f864d 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -92,15 +92,6 @@ use WineTestBot::Engine::Notify; use WineTestBot::TaskFailures; -sub _initialize($$) -{ - my ($self, $Collection) = @_; - - $self->SUPER::_initialize($Collection); - - $self->{OldStatus} = undef; -} - sub InitializeNew($$) { my ($self, $Collection) = @_; @@ -171,10 +162,10 @@ sub Status($;$) my $CurrentStatus = $self->SUPER::Status; return $CurrentStatus if (!defined $NewStatus); - if (! defined($CurrentStatus) || $NewStatus ne $CurrentStatus) + if (!defined $CurrentStatus or $NewStatus ne $CurrentStatus) { + $self->{OldStatus} ||= $CurrentStatus; $self->SUPER::Status($NewStatus); - $self->{OldStatus} = $CurrentStatus; } return $NewStatus; @@ -185,15 +176,11 @@ sub OnSaved($) my ($self) = @_; $self->SUPER::OnSaved(); - - if (defined($self->{OldStatus})) + if (defined $self->{OldStatus} and $self->{OldStatus} ne $self->Status) { - my $NewStatus = $self->Status; - if ($NewStatus ne $self->{OldStatus}) - { - JobStatusChange($self->GetKey(), $self->{OldStatus}, $NewStatus); - } + JobStatusChange($self->GetKey(), $self->{OldStatus}, $self->Status); } + delete $self->{OldStatus}; } =pod

1 0

Francois Gouget : patches: Take the .testbot file Status into account.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: tools Branch: master Commit: 7d320f65aa489279440c6ee92ae6ce04df2928ef URL: https://source.winehq.org/git/tools.git/?a=commit;h=7d320f65aa489279440c6ee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 16 17:20:39 2022 +0200 patches: Take the .testbot file Status into account. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/patches/update b/patches/update index 5d20f2a1..494d2e15 100755 --- a/patches/update +++ b/patches/update @@ -210,7 +210,8 @@ foreach my $file (readdir DIR) { utf8::decode($_); last if /^$/; - if (/^Job-ID: (.*)$/) { $patch{"testjob"} = $1; } + if (/^Status: (.*)$/) { $patch{"testbot"} = $1; } + elsif (/^Job-ID: (.*)$/) { $patch{"testjob"} = $1; } elsif (/^URL: (.*)$/) { $patch{"testurl"} = $1; } } close LOG; @@ -254,7 +255,6 @@ sub assign_parent($) if ($patch->{"from_marvin"}) { $parent->{"testbot"} = "<a href=\"data/$patch->{id}\">Failed</a>"; - $parent->{"testclass"} = "testbot botfail"; } return $parent; } @@ -320,6 +320,10 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { printf INDEX "<td class=\"failmark\">X</td>"; } + if ($patch->{"testbot"} and $patch->{"testbot"} ne "OK") + { + $patch->{"testclass"} .= " botfail"; + } printf INDEX "<td class=\"%s\">%s</td>", $patch->{"testclass"}, $patch->{"testbot"}; if ($patch->{"testjob"} && $patch->{"testurl"}) {

1 0

Francois Gouget : testbot/web: Tweak the failures page columns.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: tools Branch: master Commit: e49b4c5231fca6973fe70b86c4c2435987cc9a7d URL: https://source.winehq.org/git/tools.git/?a=commit;h=e49b4c5231fca6973fe70b8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 16 17:18:23 2022 +0200 testbot/web: Tweak the failures page columns. Show the bug id in the failure list: this makes it easier to find all the failures related to a given bug. Shorten some column labels so they don't make the column too wide. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Failures.pm | 6 +++--- testbot/web/FailuresList.pl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index b37b9e04..344af756 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -156,9 +156,9 @@ my @PropertyDescriptors = ( # Every entry must be associated with a Wine bug. # Note: The 'deleted' bug status means this failure entry should be # deleted as soon as it is not referenced anymore. - CreateBasicPropertyDescriptor("BugId", "WineHQ bug id", !1, 1, "N", 10), - CreateBasicPropertyDescriptor("BugStatus", "WineHQ bug status", !1, !1, "A", 32), - CreateBasicPropertyDescriptor("BugDescription", "WineHQ bug description", !1, !1, "A", 128), + CreateBasicPropertyDescriptor("BugId", "Bug id", !1, 1, "N", 10), + CreateBasicPropertyDescriptor("BugStatus", "Bug status", !1, !1, "A", 32), + CreateBasicPropertyDescriptor("BugDescription", "WineHQ Bug description", !1, !1, "A", 128), CreateDetailrefPropertyDescriptor("TaskFailures", "Tasks", \&CreateTaskFailures), ); diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index f2608dc4..f763413f 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -55,7 +55,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Notes|ConfigRegExp|FailureRegExp|BugId)$/ ? "" : + return $PropertyName =~ /^(?:Notes|ConfigRegExp|FailureRegExp)$/ ? "" : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -79,7 +79,7 @@ sub GenerateDataView($$$) my ($self, $Row, $Col) = @_; my $PropertyName = $Col->{Descriptor}->GetName(); - if ($PropertyName =~ /^Test(?:Module|Unit)$/) + if ($PropertyName eq "TestUnit") { print "<a href='", $self->escapeHTML($self->GetDetailsLink($Row)), "'>", $self->escapeHTML($Row->{Item}->$PropertyName), "</a>";

1 0

Andrew Eikum : include: Remove duplicate ICodecAPI::GetParameterValues function.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 712c547e0869b0caf797694137e36bacea614aa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=712c547e0869b0caf7976941… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 15 13:00:36 2022 -0500 include: Remove duplicate ICodecAPI::GetParameterValues function. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/icodecapi.idl | 1 - 1 file changed, 1 deletion(-) diff --git a/include/icodecapi.idl b/include/icodecapi.idl index 7954b3fc2f6..dc31daf2e2c 100644 --- a/include/icodecapi.idl +++ b/include/icodecapi.idl @@ -42,7 +42,6 @@ interface ICodecAPI : IUnknown HRESULT GetParameterRange ([in] const GUID *api, [out] VARIANT *min, [out] VARIANT *max, [out] VARIANT *delta); HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); - HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); HRESULT GetDefaultValue ([in] const GUID *api, [out] VARIANT *value); HRESULT GetValue ([in] const GUID *api, [out] VARIANT *value);

1 0

Connor McAdams : uiautomationcore: Add basic IAccessible2 support.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 62d76348b371e0a9f9dd3a67b801cc3c7cc4bc36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d76348b371e0a9f9dd3a67… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 13 13:04:13 2022 -0400 uiautomationcore: Add basic IAccessible2 support. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 603 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 53 +++ 2 files changed, 656 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=62d76348b371e0a9f9dd…

1 0

Connor McAdams : ia2comproxy: Introduce new proxy stub DLL for IAccessible2.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 7d5708a18224e588ffa456996c4f9f0edee87360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d5708a18224e588ffa45699… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 13 12:39:04 2022 -0400 ia2comproxy: Introduce new proxy stub DLL for IAccessible2. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/ia2comproxy/Makefile.in | 8 ++++++++ dlls/ia2comproxy/ia2_classes.idl | 30 ++++++++++++++++++++++++++++++ dlls/ia2comproxy/ia2comproxy.spec | 4 ++++ dlls/ia2comproxy/oleacc_classes.idl | 21 +++++++++++++++++++++ 6 files changed, 66 insertions(+) diff --git a/configure b/configure index faf7e0e1a8e..51a47e809e5 100755 --- a/configure +++ b/configure @@ -1120,6 +1120,7 @@ enable_hlink enable_hnetcfg enable_http_sys enable_httpapi +enable_ia2comproxy enable_iccvid enable_icmp enable_ieframe @@ -21492,6 +21493,7 @@ wine_fn_config_makefile dlls/hnetcfg/tests enable_tests wine_fn_config_makefile dlls/http.sys enable_http_sys wine_fn_config_makefile dlls/httpapi enable_httpapi wine_fn_config_makefile dlls/httpapi/tests enable_tests +wine_fn_config_makefile dlls/ia2comproxy enable_ia2comproxy wine_fn_config_makefile dlls/iccvid enable_iccvid wine_fn_config_makefile dlls/icmp enable_icmp wine_fn_config_makefile dlls/ieframe enable_ieframe diff --git a/configure.ac b/configure.ac index fbdfbb05b3b..9ad1b19164c 100644 --- a/configure.ac +++ b/configure.ac @@ -2661,6 +2661,7 @@ WINE_CONFIG_MAKEFILE(dlls/hnetcfg/tests) WINE_CONFIG_MAKEFILE(dlls/http.sys) WINE_CONFIG_MAKEFILE(dlls/httpapi) WINE_CONFIG_MAKEFILE(dlls/httpapi/tests) +WINE_CONFIG_MAKEFILE(dlls/ia2comproxy) WINE_CONFIG_MAKEFILE(dlls/iccvid) WINE_CONFIG_MAKEFILE(dlls/icmp) WINE_CONFIG_MAKEFILE(dlls/ieframe) diff --git a/dlls/ia2comproxy/Makefile.in b/dlls/ia2comproxy/Makefile.in new file mode 100644 index 00000000000..48f58a8093e --- /dev/null +++ b/dlls/ia2comproxy/Makefile.in @@ -0,0 +1,8 @@ +MODULE = ia2comproxy.dll +IMPORTS = uuid oleacc oleaut32 ole32 rpcrt4 + +IDL_SRCS = \ + ia2_classes.idl \ + oleacc_classes.idl + +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION diff --git a/dlls/ia2comproxy/ia2_classes.idl b/dlls/ia2comproxy/ia2_classes.idl new file mode 100644 index 00000000000..4102ea8119c --- /dev/null +++ b/dlls/ia2comproxy/ia2_classes.idl @@ -0,0 +1,30 @@ +/* + * Copyright 2022 Connor McAdams for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep ident +#pragma makedep proxy +#pragma makedep register + +cpp_quote("#include \"oleacc.h\"") +#include "wine/iaccessible2.idl" + +[ + threading(both), + uuid(01c20f2b-3dd2-400f-949f-ad00bdab1d41) /* IAccessibleHyperLink */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/ia2comproxy/ia2comproxy.spec b/dlls/ia2comproxy/ia2comproxy.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/ia2comproxy/ia2comproxy.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/ia2comproxy/oleacc_classes.idl b/dlls/ia2comproxy/oleacc_classes.idl new file mode 100644 index 00000000000..6621174abbd --- /dev/null +++ b/dlls/ia2comproxy/oleacc_classes.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2022 Connor McAdams for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep ident + +#include "oleacc.idl"

1 0

Connor McAdams : include: Import IAccessible2 headers.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: ad8c61d897b2ee7d2347df4fa7f03d6b8cb0d993 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad8c61d897b2ee7d2347df4f… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 13 12:19:22 2022 -0400 include: Import IAccessible2 headers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/Makefile.in | 1 + include/wine/iaccessible2.idl | 5473 +++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 3 files changed, 5475 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ad8c61d897b2ee7d2347…

1 0

Piotr Caban : d3dx10/tests: Add D3DX10CreateAsyncTextureProcessor tests.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 2e2377df21b003186d6f170c5127392a989f312d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e2377df21b003186d6f170c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 31 16:56:38 2022 +0200 d3dx10/tests: Add D3DX10CreateAsyncTextureProcessor tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 026eaf0dbb6..d8839626c3b 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2003,6 +2003,69 @@ static void test_D3DX10CreateAsyncTextureInfoProcessor(void) CoUninitialize(); } +static void test_D3DX10CreateAsyncTextureProcessor(void) +{ + ID3DX10DataProcessor *dp; + ID3D10Resource *resource; + ID3D10Device *device; + HRESULT hr; + int i; + + device = create_device(); + if (!device) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + CoInitialize(NULL); + + hr = D3DX10CreateAsyncTextureProcessor(device, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncTextureProcessor(NULL, NULL, &dp); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncTextureProcessor(device, NULL, &dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_Process(dp, (void *)test_image[0].data, 0); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_Process(dp, NULL, test_image[0].size); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_Destroy(dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + winetest_push_context("Test %u", i); + + hr = D3DX10CreateAsyncTextureProcessor(device, NULL, &dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataProcessor_Process(dp, (void *)test_image[i].data, test_image[i].size); + todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + hr = ID3DX10DataProcessor_CreateDeviceObject(dp, (void **)&resource); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + check_resource_info(resource, test_image + i, __LINE__); + check_resource_data(resource, test_image + i, __LINE__); + ID3D10Resource_Release(resource); + } + + hr = ID3DX10DataProcessor_Destroy(dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + winetest_pop_context(); + } + + CoUninitialize(); + + ID3D10Device_Release(device); +} + static void test_get_image_info(void) { static const WCHAR test_resource_name[] = L"resource.data"; @@ -3498,6 +3561,7 @@ START_TEST(d3dx10) test_D3DX10CreateAsyncFileLoader(); test_D3DX10CreateAsyncResourceLoader(); test_D3DX10CreateAsyncTextureInfoProcessor(); + test_D3DX10CreateAsyncTextureProcessor(); test_get_image_info(); test_create_texture(); test_font();

1 0

Piotr Caban : d3dx10: Add D3DX10CreateAsyncTextureProcessor implementation.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 0d457b2ce285e9964e88eed0b5e051197d8fc854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d457b2ce285e9964e88eed0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 11 20:05:00 2022 +0200 d3dx10: Add D3DX10CreateAsyncTextureProcessor implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 81 ++++++++++++++++++++- dlls/d3dx10_43/dxhelpers.h | 8 +++ dlls/d3dx10_43/texture.c | 176 +++++++++++++++++++++++++++++++++------------ 3 files changed, 216 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d457b2ce285e9964e88…

1 0

Piotr Caban : d3dx10: Add D3DX10CreateAsyncTextureProcessor stub.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 04b6412c1835e395670b0abd8a7f8ef7b8acf1b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04b6412c1835e395670b0abd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 31 16:42:11 2022 +0200 d3dx10: Add D3DX10CreateAsyncTextureProcessor stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 7 +++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10async.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 0d75a64ff9e..cd41e405210 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -514,6 +514,13 @@ HRESULT WINAPI D3DX10CreateAsyncTextureInfoProcessor(D3DX10_IMAGE_INFO *info, ID return S_OK; } +HRESULT WINAPI D3DX10CreateAsyncTextureProcessor(ID3D10Device *device, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10DataProcessor **processor) +{ + FIXME("device %p, load_info %p, processor %p stub!\n", device, load_info, processor); + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, ID3D10Blob **errors, HRESULT *hresult) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index c0a2c9fa56c..95160a067c5 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -17,7 +17,7 @@ @ stub D3DX10CreateAsyncShaderPreprocessProcessor(str ptr ptr ptr ptr ptr) @ stub D3DX10CreateAsyncShaderResourceViewProcessor(ptr ptr ptr) @ stdcall D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) -@ stub D3DX10CreateAsyncTextureProcessor(ptr ptr ptr) +@ stdcall D3DX10CreateAsyncTextureProcessor(ptr ptr ptr) @ stdcall D3DX10CreateDevice(ptr long long long ptr) @ stdcall D3DX10CreateDeviceAndSwapChain(ptr long long long ptr ptr ptr) @ stdcall D3DX10CreateEffectFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr ptr) diff --git a/include/d3dx10async.h b/include/d3dx10async.h index c932be91b01..931458f4813 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -76,6 +76,8 @@ HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, HRESULT WINAPI D3DX10CreateAsyncResourceLoaderA(HMODULE module, const char *resource, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *resource, ID3DX10DataLoader **loader); +HRESULT WINAPI D3DX10CreateAsyncTextureProcessor(ID3D10Device *device, + D3DX10_IMAGE_LOAD_INFO *info, ID3DX10DataProcessor **processor); HRESULT WINAPI D3DX10CreateAsyncTextureInfoProcessor(D3DX10_IMAGE_INFO *info, ID3DX10DataProcessor **processor); #endif

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022