Re: Implement D3DXCreateTextureFromFile

[Dmitry Timoshkov]

"Luis C. Busquets Pérez"  wrote:
> diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c
> index c24aedc..931e6c1 100644
> --- a/dlls/d3dx8/d3dx8_main.c
> +++ b/dlls/d3dx8/d3dx8_main.c
> @@ -32,6 +32,30 @@
> #include "wine/unicode.h"
> #include "d3dx8_private.h"
>
> +typedef enum D3DXIMAGE_FILEFORMAT
> +{
> - D3DXIFF_BMP = 0,
> - D3DXIFF_JPG = 1,
> - D3DXIFF_TGA = 2,
> - D3DXIFF_PNG = 3,
> - D3DXIFF_DDS = 4,
> - D3DXIFF_PPM = 5,
> - D3DXIFF_DIB = 6,
> - D3DXIFF_HDR = 7,
> - D3DXIFF_PFM = 8,
> - D3DXIFF_FORCE_DWORD = 0x7fffffff,
>
> +} D3DXIMAGE_FILEFORMAT, *LPD3DXIMAGE_FILEFORMAT;

D3DXIMAGE_FILEFORMAT s inot used in your patch, so it either should be
a separate patch, or removed.
> +typedef struct _D3DXIMAGE_INFO {
> - UINT Width;
> - UINT Height;
> - UINT Depth;
> - UINT MipLevels;
> - D3DFORMAT Format;
> - D3DRESOURCETYPE ResourceType;
> - D3DXIMAGE_FILEFORMAT ImageFileFormat;
>
> +} D3DXIMAGE_INFO;

If D3DXIMAGE_INFO is used in public API definitions it should be placed
in an appropriate SDK header.

Implement D3DXCreateTextureFromFile

[Francois Gouget]

On Sun, 27 Jan 2008, Dmitry Timoshkov wrote:
> "Luis C. Busquets Pérez"  wrote:
> > diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c
> > index c24aedc..931e6c1 100644
> > --- a/dlls/d3dx8/d3dx8_main.c
> > +++ b/dlls/d3dx8/d3dx8_main.c
> > @@ -32,6 +32,30 @@
> > #include "wine/unicode.h"
> > #include "d3dx8_private.h"
> >
> > +typedef enum D3DXIMAGE_FILEFORMAT
> > +{
> > - D3DXIFF_BMP = 0,
> > - D3DXIFF_JPG = 1,
> > - D3DXIFF_TGA = 2,
> > - D3DXIFF_PNG = 3,
> > - D3DXIFF_DDS = 4,
> > - D3DXIFF_PPM = 5,
> > - D3DXIFF_DIB = 6,
> > - D3DXIFF_HDR = 7,
> > - D3DXIFF_PFM = 8,
> > - D3DXIFF_FORCE_DWORD = 0x7fffffff,
> >
> > +} D3DXIMAGE_FILEFORMAT, *LPD3DXIMAGE_FILEFORMAT;
>
> D3DXIMAGE_FILEFORMAT s inot used in your patch, so it either should be
> a separate patch, or removed.

It should go in include/d3dx9tex.h, like D3DXIMAGE_INFO (though it's a 
bit strange for a d3d8 library).