[PATCH v2 0/1] MR5336: d3dcompiler: Add D3DCreateLinker stub.

[Vijay Kiran Kamuju (＠infyquest)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52622

--
  v2: d3dcompiler: Add D3DCreateLinker stub.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5336

[PATCH v2 1/1] d3dcompiler: Add D3DCreateLinker stub.

[Vijay Kiran Kamuju]

From: Vijay Kiran Kamuju <infyquest(a)gmail.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52622
---
 dlls/d3dcompiler_43/compiler.c          |  6 ++++++
 dlls/d3dcompiler_47/d3dcompiler_47.spec |  2 +-
 include/d3d11shader.h                   | 16 ++++++++++++++++
 include/d3dcompiler.h                   |  1 +
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c
index e5c9981ded5..4b2b05df917 100644
--- a/dlls/d3dcompiler_43/compiler.c
+++ b/dlls/d3dcompiler_43/compiler.c
@@ -774,6 +774,12 @@ end:
     return hr;
 }
 
+HRESULT WINAPI D3DCreateLinker(ID3D11Linker **linker)
+{
+    FIXME("linker %p stub!\n", linker);
+    return E_NOTIMPL;
+}
+
 HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module)
 {
     FIXME("data %p, size %Iu, module %p stub!\n", data, size, module);
diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec
index ca132979565..3ed049e6ab8 100644
--- a/dlls/d3dcompiler_47/d3dcompiler_47.spec
+++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec
@@ -5,7 +5,7 @@
 @ stub D3DCompressShaders
 @ stdcall D3DCreateBlob(long ptr)
 @ stub D3DCreateFunctionLinkingGraph
-@ stub D3DCreateLinker
+@ stdcall D3DCreateLinker(ptr)
 @ stub D3DDecompressShaders
 @ stdcall D3DDisassemble(ptr long long ptr ptr)
 @ stub D3DDisassemble10Effect(ptr long ptr)
diff --git a/include/d3d11shader.h b/include/d3d11shader.h
index a7441508146..fee19567c3f 100644
--- a/include/d3d11shader.h
+++ b/include/d3d11shader.h
@@ -261,4 +261,20 @@ DECLARE_INTERFACE_(ID3D11Module, IUnknown)
 };
 #undef INTERFACE
 
+DEFINE_GUID(IID_ID3D11Linker, 0x59a6cd0e, 0xe10d, 0x4c1f, 0x88, 0xc0, 0x63, 0xab, 0xa1, 0xda, 0xf3, 0x0e);
+
+#define INTERFACE ID3D11Linker
+DECLARE_INTERFACE_(ID3D11Linker, IUnknown)
+{
+    STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+
+    /* ID3D11Linker methods */
+    STDMETHOD(Link)(THIS_ ID3D11ModuleInstance **instance, LPCSTR instname, LPCSTR targetname, UINT flags, ID3DBlob **shader, ID3DBlob **error) PURE;
+    STDMETHOD(UseLibrary)(THIS_ ID3D11ModuleInstance **libinstance) PURE;
+    STDMETHOD(AddClipPlaneFromCBuffer)(THIS_ UINT bufferslot, UINT bufferentry) PURE;
+};
+#undef INTERFACE
+
 #endif
diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h
index f897a785992..87821a9031a 100644
--- a/include/d3dcompiler.h
+++ b/include/d3dcompiler.h
@@ -153,6 +153,7 @@ typedef HRESULT (WINAPI *pD3DPreprocess)(const void *data, SIZE_T size, const ch
         const D3D_SHADER_MACRO *defines, ID3DInclude *include,
         ID3DBlob **shader, ID3DBlob **error_messages);
 
+HRESULT WINAPI D3DCreateLinker(ID3D11Linker **linker);
 HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module);
 
 #ifdef __cplusplus
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/5336

[Matteo Bruni (＠Mystral)]

Matteo Bruni (@Mystral) commented about include/d3d11shader.h:
> };
>  #undef INTERFACE
>
> +DEFINE_GUID(IID_ID3D11Linker, 0x59a6cd0e, 0xe10d, 0x4c1f, 0x88, 0xc0, 0x63, 0xab, 0xa1, 0xda, 0xf3, 0x0e);
> +
> +#define INTERFACE ID3D11Linker
> +DECLARE_INTERFACE_(ID3D11Linker, IUnknown)
> +{
> +    STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE;
> +    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
> +    STDMETHOD_(ULONG, Release)(THIS) PURE;
> +
> +    /* ID3D11Linker methods */
> +    STDMETHOD(Link)(THIS_ ID3D11ModuleInstance **instance, LPCSTR instname, LPCSTR targetname, UINT flags, ID3DBlob **shader, ID3DBlob **error) PURE;
> In my version of the header this is a 'single' pointer, e.g. `ID3D11ModuleInstance *instance`

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5336#note_65237

[Matteo Bruni (＠Mystral)]

Matteo Bruni (@Mystral) commented about include/d3d11shader.h:
> };
>  #undef INTERFACE
>
> +DEFINE_GUID(IID_ID3D11Linker, 0x59a6cd0e, 0xe10d, 0x4c1f, 0x88, 0xc0, 0x63, 0xab, 0xa1, 0xda, 0xf3, 0x0e);
> +
> +#define INTERFACE ID3D11Linker
> +DECLARE_INTERFACE_(ID3D11Linker, IUnknown)
> +{
> +    STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE;
> +    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
> +    STDMETHOD_(ULONG, Release)(THIS) PURE;
> +
> +    /* ID3D11Linker methods */
> +    STDMETHOD(Link)(THIS_ ID3D11ModuleInstance **instance, LPCSTR instname, LPCSTR targetname, UINT flags, ID3DBlob **shader, ID3DBlob **error) PURE;
> +    STDMETHOD(UseLibrary)(THIS_ ID3D11ModuleInstance **libinstance) PURE;
> Same here, e.g. `ID3D11ModuleInstance *library`

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5336#note_65238

[Matteo Bruni (＠Mystral)]

Does this actually help with the referenced bug?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5336#note_65239