From: Vijay Kiran Kamuju infyquest@gmail.com
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56176 --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/d3dx11_43.spec | 2 +- dlls/d3dx11_43/main.c | 7 +++++++ include/d3dx11core.idl | 3 +++ 4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 2d93b8d760a..f8c05089657 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -25,7 +25,7 @@ @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW -@ stub D3DX11CreateThreadPump +@ stdcall D3DX11CreateThreadPump(long long ptr) @ stdcall D3DX11FilterTexture(ptr ptr long long) @ stdcall D3DX11GetImageInfoFromFileA(str ptr ptr ptr) @ stdcall D3DX11GetImageInfoFromFileW(wstr ptr ptr ptr) diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 2d93b8d760a..f8c05089657 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -25,7 +25,7 @@ @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW -@ stub D3DX11CreateThreadPump +@ stdcall D3DX11CreateThreadPump(long long ptr) @ stdcall D3DX11FilterTexture(ptr ptr long long) @ stdcall D3DX11GetImageInfoFromFileA(str ptr ptr ptr) @ stdcall D3DX11GetImageInfoFromFileW(wstr ptr ptr ptr) diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c index 5dad027864f..8a5eb7c23dd 100644 --- a/dlls/d3dx11_43/main.c +++ b/dlls/d3dx11_43/main.c @@ -38,6 +38,13 @@ BOOL WINAPI D3DX11CheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver) return d3d_sdk_ver == D3D11_SDK_VERSION && d3dx_sdk_ver == D3DX11_SDK_VERSION; }
+HRESULT WINAPI D3DX11CreateThreadPump(UINT iothreads, UINT procthreads, ID3DX11ThreadPump **pump) +{ + FIXME("iothreads %u, procthreads %u, pump %p stub!\n", context, texture, pump); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter) { FIXME("context %p, texture %p, src_level %u, filter %#x stub!\n", context, texture, src_level, filter); diff --git a/include/d3dx11core.idl b/include/d3dx11core.idl index f619e3b1b02..66c99f3162b 100644 --- a/include/d3dx11core.idl +++ b/include/d3dx11core.idl @@ -63,3 +63,6 @@ interface ID3DX11ThreadPump : IUnknown HRESULT PurgeAllItems(); HRESULT GetQueueStatus([in] UINT *io_queue, [in] UINT *process_queue, [in] UINT *device_queue); } + +cpp_quote("HRESULT WINAPI D3DX11CheckVersion(UINT, UINT);") +cpp_quote("HRESULT WINAPI D3DX11CreateThreadPump(UINT, UINT, ID3DX11ThreadPump**);")
Hi,
It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.
The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=144210
Your paranoid android.
=== debian11 (build log) ===
../wine/dlls/d3dx11_43/main.c:36:13: error: conflicting types for ���D3DX11CheckVersion��� ../wine/dlls/d3dx11_43/main.c:43:60: error: ���context��� undeclared (first use in this function); did you mean ���IContext���? ../wine/dlls/d3dx11_43/main.c:43:69: error: ���texture��� undeclared (first use in this function) ../wine/dlls/d3dx11_43/main.c:36:13: error: conflicting types for ���D3DX11CheckVersion��� ../wine/dlls/d3dx11_43/main.c:43:60: error: ���context��� undeclared (first use in this function); did you mean ���IContext���? ../wine/dlls/d3dx11_43/main.c:43:69: error: ���texture��� undeclared (first use in this function) Task: The win32 Wine build failed
=== debian11b (build log) ===
../wine/dlls/d3dx11_43/main.c:36:13: error: conflicting types for ���D3DX11CheckVersion��� ../wine/dlls/d3dx11_43/main.c:43:60: error: ���context��� undeclared (first use in this function); did you mean ���IContext���? ../wine/dlls/d3dx11_43/main.c:43:69: error: ���texture��� undeclared (first use in this function) ../wine/dlls/d3dx11_43/main.c:36:13: error: conflicting types for ���D3DX11CheckVersion��� ../wine/dlls/d3dx11_43/main.c:43:60: error: ���context��� undeclared (first use in this function); did you mean ���IContext���? ../wine/dlls/d3dx11_43/main.c:43:69: error: ���texture��� undeclared (first use in this function) Task: The wow64 Wine build failed
This is implemented for d3dx10, we should reuse or duplicate it somehow for d3dx11. Stub is not useful I think.
On Wed Mar 20 21:26:48 2024 +0000, Nikolay Sivov wrote:
This is implemented for d3dx10, we should reuse or duplicate it somehow for d3dx11. Stub is not useful I think.
That's basically my thought as well.
On Wed Mar 20 21:26:48 2024 +0000, Matteo Bruni wrote:
That's basically my thought as well.
I think its better to duplicate it for d3dx11 as we don't share code between the d3dx10 and d3dx11. I will duplicate the code and tests.
On Wed Mar 20 22:14:06 2024 +0000, Vijay Kiran Kamuju wrote:
I think its better to duplicate it for d3dx11 as we don't share code between the d3dx10 and d3dx11. I will duplicate the code and tests.
We do in fact want to share code among d3dx* versions. See https://gitlab.winehq.org/wine/wine/-/merge_requests/5022#note_60346 and !5202 for the initial steps in that direction, focused on the texture functions.
On Wed Mar 20 23:36:30 2024 +0000, Matteo Bruni wrote:
We do in fact want to share code among d3dx* versions. See https://gitlab.winehq.org/wine/wine/-/merge_requests/5022#note_60346 and !5202 for the initial steps in that direction, focused on the texture functions.
I will initially only add the ID3X11ThreadPump interface stubs and the D3DX11CreateThreadPump function, so that once the common code steps are further advanced, we can fill in the interface functions.
-
Marvin -
Matteo Bruni (＠Mystral) -
Nikolay Sivov (＠nsivov)
-
Vijay Kiran Kamuju
-
Vijay Kiran Kamuju (＠infyquest)