[PATCH 7/9] d3dx9_36: Fix some spec file entries

Matteo Bruni matteo.mystral at gmail.com
Thu Jan 9 15:57:57 CST 2020


On Wed, Jan 8, 2020 at 9:23 PM André Hentschel <nerv at dawncrow.de> wrote:
>
> Signed-off-by: André Hentschel <nerv at dawncrow.de>
> ---
>  dlls/d3dx9_36/d3dx9_36.spec | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
> index de8b12ce03b..b46efd8d9cf 100644
> --- a/dlls/d3dx9_36/d3dx9_36.spec
> +++ b/dlls/d3dx9_36/d3dx9_36.spec
> @@ -37,10 +37,10 @@
>  @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
>  @ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
>  @ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr)
> -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr)
> +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr)
>  @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
>  @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr)
> -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
> +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr)
>  @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
>  @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr)
>  @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr)
> @@ -109,10 +109,10 @@
>  @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr)
>  @ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
>  @ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr)
> -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr)
> +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr)
>  @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
>  @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr)
> -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
> +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr)
>  @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
>  @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr)
>  @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr)
> @@ -191,7 +191,7 @@
>  @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long)
>  @ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr)
>  @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr)
> -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr)
> +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr)
>  @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
>  @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr)
>  @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr)
> @@ -283,10 +283,10 @@
>  @ stub D3DXSavePRTCompBufferToFileW(ptr ptr)
>  @ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr)
>  @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr)
> -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr)
> +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr)
>  @ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr)
>  @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr)
> -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr)
> +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr)
>  @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
>  @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
>  @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)

Those look okay but you missed the corresponding A variants to the W
functions you're touching. You also need to update all the other
d3dx9_xx.spec files in the same fashion...



More information about the wine-devel mailing list