February 2008 - Wine-commits

Aric Stewart : gdi32: Child fonts need to be scaled like their parent. With input from Dmitry Timoshkov.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 1ce79f87dd6ddebb421d88c94a94b9cfc902134f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce79f87dd6ddebb421d88c94… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 30 07:26:02 2008 -0600 gdi32: Child fonts need to be scaled like their parent. With input from Dmitry Timoshkov. --- dlls/gdi32/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4b54699..81dc300 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4497,6 +4497,7 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) child->font->ntmFlags = child->face->ntmFlags; child->font->orientation = font->orientation; + child->font->scale_y = font->scale_y; hfontlist = HeapAlloc(GetProcessHeap(), 0, sizeof(*hfontlist)); hfontlist->hfont = CreateFontIndirectW(&font->font_desc.lf); list_add_head(&child->font->hfontlist, &hfontlist->entry);

1 0

Francois Gouget : d3dx8: Fix the D3DXAssembleShaderFromFileA/W() prototypes .
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 3d962e27ed69829645f3c8f99c17087f92d89e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d962e27ed69829645f3c8f99… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 5 00:04:54 2008 +0100 d3dx8: Fix the D3DXAssembleShaderFromFileA/W() prototypes. --- dlls/d3dx8/d3dx8_main.c | 4 ++-- include/d3dx8core.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c index c24aedc..ee897a8 100644 --- a/dlls/d3dx8/d3dx8_main.c +++ b/dlls/d3dx8/d3dx8_main.c @@ -73,7 +73,7 @@ HRESULT WINAPI D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags return D3D_OK; } -HRESULT WINAPI D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags, +HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR pSrcFile, DWORD Flags, LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompilationErrors) { @@ -91,7 +91,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags, return ret; } -HRESULT WINAPI D3DXAssembleShaderFromFileW(LPWSTR pSrcFile, DWORD Flags, +HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR pSrcFile, DWORD Flags, LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompilationErrors) { diff --git a/include/d3dx8core.h b/include/d3dx8core.h index fb99e7a..6de4583 100644 --- a/include/d3dx8core.h +++ b/include/d3dx8core.h @@ -114,11 +114,11 @@ HRESULT WINAPI D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompilationErrors); -HRESULT WINAPI D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags, +HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR pSrcFile, DWORD Flags, LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompilationErrors); -HRESULT WINAPI D3DXAssembleShaderFromFileW(LPWSTR pSrcFile, DWORD Flags, +HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR pSrcFile, DWORD Flags, LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompilationErrors);

1 0

Francois Gouget : d3dx8: Add the d3dx8mesh. h header and move the relevant function declarations there.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 1bfdf232d966e1b78b32fe3903ffb78e7c59ee26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bfdf232d966e1b78b32fe390… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 5 00:04:42 2008 +0100 d3dx8: Add the d3dx8mesh.h header and move the relevant function declarations there. Include d3dx8mesh.h in d3dx8.h and add some commented out ones as reminders. --- include/Makefile.in | 1 + include/d3dx8.h | 4 ++++ include/d3dx8core.h | 2 -- include/d3dx8mesh.h | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index cde66cc..7562ebe 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -115,6 +115,7 @@ SRCDIR_INCLUDES = \ d3dx8core.h \ d3dx8math.h \ d3dx8math.inl \ + d3dx8mesh.h \ d3dx9.h \ d3dx9core.h \ d3dx9math.h \ diff --git a/include/d3dx8.h b/include/d3dx8.h index 52ddaf3..0ae27c3 100644 --- a/include/d3dx8.h +++ b/include/d3dx8.h @@ -24,5 +24,9 @@ #include <d3dx8math.h> #include <d3dx8core.h> +/* FIXME: #include <d3dx8tex.h> */ +#include <d3dx8mesh.h> +/* FIXME: #include <d3dx8shape.h> */ +/* FIXME: #include <d3dx8effect.h> */ #endif diff --git a/include/d3dx8core.h b/include/d3dx8core.h index 7e6806b..fb99e7a 100644 --- a/include/d3dx8core.h +++ b/include/d3dx8core.h @@ -109,9 +109,7 @@ DECLARE_INTERFACE_(ID3DXFont,IUnknown) extern "C" { #endif -HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer); HRESULT WINAPI D3DXCreateFont(LPDIRECT3DDEVICE8 pDevice, HFONT hFont, LPD3DXFONT* ppFont); -UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF); HRESULT WINAPI D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags, LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppCompiledShader, diff --git a/include/d3dx8mesh.h b/include/d3dx8mesh.h new file mode 100644 index 0000000..f1eab5c --- /dev/null +++ b/include/d3dx8mesh.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2008 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_D3DX8MESH_H +#define __WINE_D3DX8MESH_H + +#include <d3d8.h> +#include <dxfile.h> + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI D3DXCreateBuffer(DWORD,LPD3DXBUFFER*); +UINT WINAPI D3DXGetFVFVertexSize(DWORD); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_D3DX8MESH_H */

1 0

Francois Gouget : d3dx8: Make d3dx8core.h C++ compatible.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 91d3a794e8b756dbcb7047c77acf1a7f862627dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d3a794e8b756dbcb7047c77… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 5 00:04:37 2008 +0100 d3dx8: Make d3dx8core.h C++ compatible. --- include/d3dx8core.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/d3dx8core.h b/include/d3dx8core.h index f4698ea..7e6806b 100644 --- a/include/d3dx8core.h +++ b/include/d3dx8core.h @@ -105,6 +105,10 @@ DECLARE_INTERFACE_(ID3DXFont,IUnknown) /************************************************************************************* * Define entrypoints */ +#ifdef __cplusplus +extern "C" { +#endif + HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer); HRESULT WINAPI D3DXCreateFont(LPDIRECT3DDEVICE8 pDevice, HFONT hFont, LPD3DXFONT* ppFont); UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF); @@ -121,4 +125,8 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPWSTR pSrcFile, DWORD Flags, LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompilationErrors); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_D3DX8CORE_H */

1 0

Francois Gouget : d3dx8: Fix the D3DXMatrixAffineTransformation() prototype .
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 0894bf25dccada99269fe7d171e20a906014053c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0894bf25dccada99269fe7d17… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 5 00:03:55 2008 +0100 d3dx8: Fix the D3DXMatrixAffineTransformation() prototype. --- dlls/d3dx8/math.c | 2 +- include/d3dx8math.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 0446198..6573c68 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -59,7 +59,7 @@ D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, CONST D3DXCOLOR *pc /*_________________D3DXMatrix____________________*/ -D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, float scaling, D3DXVECTOR3 *rotationcenter, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) +D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR3 *rotationcenter, CONST D3DXQUATERNION *rotation, CONST D3DXVECTOR3 *translation) { D3DXMATRIX m1, m2, m3, m4, m5, p1, p2, p3; diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 755698a..66d8fea 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -271,7 +271,7 @@ extern "C" { D3DXCOLOR* WINAPI D3DXColorAdjustContrast(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s); D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s); -D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, float scaling, D3DXVECTOR3 *rotationcenter, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation); +D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR3 *rotationcenter, CONST D3DXQUATERNION *rotation, CONST D3DXVECTOR3 *translation); FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm); D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, CONST D3DXMATRIX *pm); D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup);

1 0

Francois Gouget : winapi_check: Update win32.api for d3dx8.dll.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: e52dad1eb758cad2d8d62dbbe0a79a98d0c73a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52dad1eb758cad2d8d62dbbe… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 5 00:02:09 2008 +0100 winapi_check: Update win32.api for d3dx8.dll. --- tools/winapi/win32.api | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index e79abc3..1fd1697 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -933,16 +933,38 @@ HFONT HRESULT UINT +%float + +FLOAT + %ptr +D3DXCOLOR * +D3DXMATRIX * +D3DXPLANE * +D3DXQUATERNION * +D3DXVECTOR2 * +D3DXVECTOR3 * +D3DXVECTOR4 * +D3DVIEWPORT8 * +FLOAT * LPCVOID LPD3DXBUFFER * LPD3DXFONT * +LPD3DXMATRIXSTACK * LPDIRECT3DDEVICE8 %str -LPSTR +LPCSTR + +%wstr + +LPCWSTR + +%void + +void %%d3dxof.dll

1 0

Francois Gouget : winapi_check: Assorted win32.api updates.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 511aca524461be6c5c35392bb518cae6c06adbd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=511aca524461be6c5c35392bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 5 00:01:58 2008 +0100 winapi_check: Assorted win32.api updates. --- tools/winapi/win32.api | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 55574f7..e79abc3 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -123,7 +123,11 @@ PACL * PACTRL_ACCESSW * PACTRL_AUDITW * PBOOL +PCREDENTIALA +PCREDENTIALA * PCREDENTIALA ** +PCREDENTIALW +PCREDENTIALW * PCREDENTIALW ** PDWORD PEXPLICIT_ACCESSA @@ -1380,6 +1384,7 @@ REFIID %long HRESULT +UINT %ptr @@ -4561,6 +4566,8 @@ LPCWSTR %long BOOL +CONFIGRET +DEVINST DI_FUNCTION DWORD HANDLE @@ -4569,6 +4576,7 @@ HDSKSPC HINF HINSTANCE HKEY +HMACHINE HSPFILELOG HSPFILEQ HSTRING_TABLE @@ -4578,6 +4586,7 @@ LogSeverity LONG REGSAM UINT +ULONG %long --pointer @@ -4600,6 +4609,7 @@ LPWIN32_FIND_DATAW LPWSTR * PBYTE PDWORD +PHMACHINE PINFCONTEXT PINT PSECURITY_DESCRIPTOR @@ -4625,15 +4635,16 @@ PCSTR * PCWSTR * PSTR * PUINT +PULONG PVOID PWSTR * UINT * -void * %str LPCSTR LPSTR +PCHAR PCSTR PSTR @@ -5114,6 +5125,7 @@ pTW_IDENTITY BOOL DWORD +HINSTANCE HRESULT HWND int

1 0

Francois Gouget : d3dx8core.h: Remove some extraneous #include directives.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 7e34c708c1b3bdbb7d4921c1153403a8d8840b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e34c708c1b3bdbb7d4921c11… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 5 00:03:02 2008 +0100 d3dx8core.h: Remove some extraneous #include directives. --- include/d3dx8core.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/include/d3dx8core.h b/include/d3dx8core.h index 051deb7..f4698ea 100644 --- a/include/d3dx8core.h +++ b/include/d3dx8core.h @@ -19,11 +19,7 @@ #ifndef __WINE_D3DX8CORE_H #define __WINE_D3DX8CORE_H -#include <objbase.h> - #include <d3d8.h> -#include <d3d8types.h> -#include <d3d8caps.h> /***************************************************************************** * #defines and error codes

1 0

Francois Gouget : winapi_check: Update win32.api for acledit.dll, ctapi32. dll and inetcomm.dll.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 566b10a3308c37c1ab81e797451f485b3c5479a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566b10a3308c37c1ab81e7974… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 5 00:01:47 2008 +0100 winapi_check: Update win32.api for acledit.dll, ctapi32.dll and inetcomm.dll. --- tools/winapi/win32.api | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 067ee40..55574f7 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1,3 +1,11 @@ +%%acledit.dll + +%long + +HWND +LONG +WORD + %%activeds.dll %long @@ -860,6 +868,18 @@ int void +%%ctapi32.dll + +%long + +IS8 +IU16 + +%ptr + +IU8 * +IU16 * + %%d3d8.dll %long @@ -1954,6 +1974,21 @@ LPSTR LPCWSTR LPWSTR +%%inetcomm.dll + +%long + +DWORD +HRESULT + +%ptr + +IMimeAllocator ** +IMimeMessage ** +IMimeSecurity ** +IStream ** +IUnknown * + %%inseng.dll %long

1 0

Francois Gouget : msvcrt: __CxxDetectRethrow() and __CxxQueryExceptionSize( ) are implemented now so export them.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: fb1b0a1c32bea4e8ec1f8b70be212dca8f728aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb1b0a1c32bea4e8ec1f8b70b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 5 00:01:31 2008 +0100 msvcrt: __CxxDetectRethrow() and __CxxQueryExceptionSize() are implemented now so export them. --- dlls/msvcrt/msvcrt.spec | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ce36fd5..d6cffcb 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -75,8 +75,10 @@ @ extern _HUGE MSVCRT__HUGE @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) +@ cdecl __CxxDetectRethrow(ptr) @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ stdcall -i386 __CxxLongjmpUnwind(ptr) +@ cdecl __CxxQueryExceptionSize() @ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast @ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid

1 0