From: <cj...@us...> - 2013-04-11 11:29:44
|
Revision: 5770 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5770&view=rev Author: cjacek Date: 2013-04-11 11:29:36 +0000 (Thu, 11 Apr 2013) Log Message: ----------- Updated imported headers to current Wine version. Modified Paths: -------------- trunk/mingw-w64-headers/direct-x/include/d3dx9math.h trunk/mingw-w64-headers/include/winhttp.h Modified: trunk/mingw-w64-headers/direct-x/include/d3dx9math.h =================================================================== --- trunk/mingw-w64-headers/direct-x/include/d3dx9math.h 2013-04-10 18:22:31 UTC (rev 5769) +++ trunk/mingw-w64-headers/direct-x/include/d3dx9math.h 2013-04-11 11:29:36 UTC (rev 5770) @@ -392,6 +392,8 @@ HRESULT WINAPI D3DXSHEvalConeLight(UINT order, const D3DXVECTOR3 *dir, FLOAT radius, FLOAT Rintensity, FLOAT Gintensity, FLOAT Bintensity, FLOAT *rout, FLOAT *gout, FLOAT *bout); FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, const D3DXVECTOR3 *dir); HRESULT WINAPI D3DXSHEvalDirectionalLight(UINT order, const D3DXVECTOR3 *dir, FLOAT Rintensity, FLOAT Gintensity, FLOAT Bintensity, FLOAT *rout, FLOAT *gout, FLOAT *bout); +HRESULT WINAPI D3DXSHEvalHemisphereLight(UINT order, const D3DXVECTOR3 *dir, D3DXCOLOR top, D3DXCOLOR bottom, FLOAT *rout, FLOAT *gout, FLOAT *bout); +HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOAT radius, FLOAT Rintensity, FLOAT Gintensity, FLOAT Bintensity, FLOAT *rout, FLOAT *gout, FLOAT *bout); FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b); FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b); FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b); Modified: trunk/mingw-w64-headers/include/winhttp.h =================================================================== --- trunk/mingw-w64-headers/include/winhttp.h 2013-04-10 18:22:31 UTC (rev 5769) +++ trunk/mingw-w64-headers/include/winhttp.h 2013-04-11 11:29:36 UTC (rev 5770) @@ -19,6 +19,12 @@ #ifndef __WINE_WINHTTP_H #define __WINE_WINHTTP_H +#ifdef _WIN64 +#include <pshpack8.h> +#else +#include <pshpack4.h> +#endif + #define WINHTTPAPI #define BOOLAPI WINHTTPAPI WINBOOL WINAPI @@ -527,6 +533,14 @@ DWORD dwMinorVersion; } HTTP_VERSION_INFO, *LPHTTP_VERSION_INFO; +#ifdef _WS2DEF_ +typedef struct +{ + DWORD cbSize; + SOCKADDR_STORAGE LocalAddress; + SOCKADDR_STORAGE RemoteAddress; +} WINHTTP_CONNECTION_INFO; +#endif #ifdef __cplusplus extern "C" { @@ -565,4 +579,6 @@ } #endif +#include <poppack.h> + #endif /* __WINE_WINHTTP_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |