winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2007
----- 2025 -----
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
4 participants
996 discussions
Start a n
N
ew thread
Louis Lenders : d3dx8: Update spec file.
by Alexandre Julliard
04 Oct '07
04 Oct '07
Module: wine Branch: master Commit: 514db0a59d07b999c83de8e2275e6166398b7b3b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=514db0a59d07b999c83de8e22…
Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Oct 4 09:11:14 2007 +0100 d3dx8: Update spec file. --- dlls/d3dx8/d3dx8.spec | 153 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 150 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index c41a39a.
…
[View More]
.3293614 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -1,6 +1,153 @@ -@ stdcall D3DXAssembleShader(ptr long long ptr ptr ptr) +@ stub D3DXVec2Normalize +@ stub D3DXVec2Hermite +@ stub D3DXVec2CatmullRom +@ stub D3DXVec2BaryCentric +@ stub D3DXVec2Transform +@ stub D3DXVec2TransformCoord +@ stub D3DXVec2TransformNormal +@ stub D3DXVec3Normalize +@ stub D3DXVec3Hermite +@ stub D3DXVec3CatmullRom +@ stub D3DXVec3BaryCentric +@ stub D3DXVec3Transform +@ stub D3DXVec3TransformCoord +@ stub D3DXVec3TransformNormal +@ stub D3DXVec3Project +@ stub D3DXVec3Unproject +@ stub D3DXVec4Cross +@ stub D3DXVec4Normalize +@ stub D3DXVec4Hermite +@ stub D3DXVec4CatmullRom +@ stub D3DXVec4BaryCentric +@ stub D3DXVec4Transform +@ stub D3DXMatrixfDeterminant +@ stub D3DXMatrixMultiply +@ stub D3DXMatrixTranspose +@ stub D3DXMatrixInverse +@ stub D3DXMatrixScaling +@ stub D3DXMatrixTranslation +@ stub D3DXMatrixRotationX +@ stub D3DXMatrixRotationY +@ stub D3DXMatrixRotationZ +@ stub D3DXMatrixRotationAxis +@ stub D3DXMatrixRotationQuaternion +@ stub D3DXMatrixRotationYawPitchRoll +@ stub D3DXMatrixTransformation +@ stub D3DXMatrixAffineTransformation +@ stub D3DXMatrixLookAtRH +@ stub D3DXMatrixLookAtLH +@ stub D3DXMatrixPerspectiveRH +@ stub D3DXMatrixPerspectiveLH +@ stub D3DXMatrixPerspectiveFovRH +@ stub D3DXMatrixPerspectiveFovLH +@ stub D3DXMatrixPerspectiveOffCenterRH +@ stub D3DXMatrixPerspectiveOffCenterLH +@ stub D3DXMatrixOrthoRH +@ stub D3DXMatrixOrthoLH +@ stub D3DXMatrixOrthoOffCenterRH +@ stub D3DXMatrixOrthoOffCenterLH +@ stub D3DXMatrixShadow +@ stub D3DXMatrixReflect +@ stub D3DXQuaternionToAxisAngle +@ stub D3DXQuaternionRotationMatrix +@ stub D3DXQuaternionRotationAxis +@ stub D3DXQuaternionRotationYawPitchRoll +@ stub D3DXQuaternionMultiply +@ stub D3DXQuaternionNormalize +@ stub D3DXQuaternionInverse +@ stub D3DXQuaternionLn +@ stub D3DXQuaternionExp +@ stub D3DXQuaternionSlerp +@ stub D3DXQuaternionSquad +@ stub D3DXQuaternionBaryCentric +@ stub D3DXPlaneNormalize +@ stub D3DXPlaneIntersectLine +@ stub D3DXPlaneFromPointNormal +@ stub D3DXPlaneFromPoints +@ stub D3DXPlaneTransform +@ stub D3DXColorAdjustSaturation +@ stub D3DXColorAdjustContrast +@ stub D3DXCreateMatrixStack +@ stdcall D3DXCreateFont(ptr ptr ptr) +@ stub D3DXCreateFontIndirect +@ stub D3DXCreateSprite +@ stub D3DXCreateRenderToSurface +@ stub D3DXCreateRenderToEnvMap @ stdcall D3DXAssembleShaderFromFileA(ptr long ptr ptr ptr) @ stdcall D3DXAssembleShaderFromFileW(ptr long ptr ptr ptr) -@ stdcall D3DXCreateBuffer(long ptr) -@ stdcall D3DXCreateFont(ptr ptr ptr) @ stdcall D3DXGetFVFVertexSize(long) +@ stub D3DXGetErrorStringA +@ stub D3DXGetErrorStringW +@ stdcall D3DXAssembleShader(ptr long long ptr ptr ptr) +@ stub D3DXCompileEffectFromFileA +@ stub D3DXCompileEffectFromFileW +@ stub D3DXCompileEffect +@ stub D3DXCreateEffect +@ stub D3DXCreateMesh +@ stub D3DXCreateMeshFVF +@ stub D3DXCreateSPMesh +@ stub D3DXCleanMesh +@ stub D3DXValidMesh +@ stub D3DXGeneratePMesh +@ stub D3DXSimplifyMesh +@ stub D3DXComputeBoundingSphere +@ stub D3DXComputeBoundingBox +@ stub D3DXComputeNormals +@ stdcall D3DXCreateBuffer(long ptr) +@ stub D3DXLoadMeshFromX +@ stub D3DXSaveMeshToX +@ stub D3DXCreatePMeshFromStream +@ stub D3DXCreateSkinMesh +@ stub D3DXCreateSkinMeshFVF +@ stub D3DXCreateSkinMeshFromMesh +@ stub D3DXLoadMeshFromXof +@ stub D3DXLoadSkinMeshFromXof +@ stub D3DXTesselateMesh +@ stub D3DXDeclaratorFromFVF +@ stub D3DXFVFFromDeclarator +@ stub D3DXWeldVertices +@ stub D3DXIntersect +@ stub D3DXSphereBoundProbe +@ stub D3DXBoxBoundProbe +@ stub D3DXCreatePolygon +@ stub D3DXCreateBox +@ stub D3DXCreateCylinder +@ stub D3DXCreateSphere +@ stub D3DXCreateTorus +@ stub D3DXCreateTeapot +@ stub D3DXCreateTextA +@ stub D3DXCreateTextW +@ stub D3DXLoadSurfaceFromFileA +@ stub D3DXLoadSurfaceFromFileW +@ stub D3DXLoadSurfaceFromResourceA +@ stub D3DXLoadSurfaceFromResourceW +@ stub D3DXLoadSurfaceFromFileInMemory +@ stub D3DXLoadSurfaceFromSurface +@ stub D3DXLoadSurfaceFromMemory +@ stub D3DXLoadVolumeFromVolume +@ stub D3DXLoadVolumeFromMemory +@ stub D3DXCheckTextureRequirements +@ stub D3DXCreateTexture +@ stub D3DXCreateTextureFromFileA +@ stub D3DXCreateTextureFromFileW +@ stub D3DXCreateTextureFromResourceA +@ stub D3DXCreateTextureFromResourceW +@ stub D3DXCreateTextureFromFileExA +@ stub D3DXCreateTextureFromFileExW +@ stub D3DXCreateTextureFromResourceExA +@ stub D3DXCreateTextureFromResourceExW +@ stub D3DXCreateTextureFromFileInMemory +@ stub D3DXCreateTextureFromFileInMemoryEx +@ stub D3DXFilterTexture +@ stub D3DXCheckCubeTextureRequirements +@ stub D3DXCreateCubeTexture +@ stub D3DXCreateCubeTextureFromFileA +@ stub D3DXCreateCubeTextureFromFileW +@ stub D3DXCreateCubeTextureFromFileExA +@ stub D3DXCreateCubeTextureFromFileExW +@ stub D3DXCreateCubeTextureFromFileInMemory +@ stub D3DXCreateCubeTextureFromFileInMemoryEx +@ stub D3DXFilterCubeTexture +@ stub D3DXCheckVolumeTextureRequirements +@ stub D3DXCreateVolumeTexture +@ stub D3DXFilterVolumeTexture
[View Less]
1
0
0
0
Louis Lenders : d3dx8: Add DllMain.
by Alexandre Julliard
04 Oct '07
04 Oct '07
Module: wine Branch: master Commit: 547d4067192e593664c9314b073c6bac3d75aa24 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=547d4067192e593664c9314b0…
Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Oct 4 08:50:36 2007 +0100 d3dx8: Add DllMain. --- dlls/d3dx8/d3dx8_main.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c index 958ef9b..9221221 100644 --- a/dlls/
…
[View More]
d3dx8/d3dx8_main.c +++ b/dlls/d3dx8/d3dx8_main.c @@ -90,3 +90,21 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPSTR pSrcFile, DWORD Flags, FIXME("(void): stub\n"); return D3D_OK; } + +/*********************************************************************** + * DllMain. + */ +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}
[View Less]
1
0
0
0
Rob Shearman : server: Add primitive support for setting and getting the security descriptor of files based on their Unix permissions .
by Alexandre Julliard
04 Oct '07
04 Oct '07
Module: wine Branch: master Commit: cb124c9b1281a15a8c776b65a1cb309490b4c9b6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cb124c9b1281a15a8c776b65a…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 3 20:19:05 2007 +0100 server: Add primitive support for setting and getting the security descriptor of files based on their Unix permissions. --- server/file.c | 251 ++++++++++++++++++++++++++++++++++++++++++++++++++++- server/security.h | 13 +++ server/
…
[View More]
token.c | 15 +--- 3 files changed, 264 insertions(+), 15 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb124c9b1281a15a8c776…
[View Less]
1
0
0
0
Rob Shearman : server: Add get_sd and set_sd object operations to allow the security descriptor to be stored somewhere other than server memory , such as on disk.
by Alexandre Julliard
04 Oct '07
04 Oct '07
Module: wine Branch: master Commit: c1707d89383f721d8d138d43e89c9788bd2d558c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c1707d89383f721d8d138d43e…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 3 13:10:37 2007 +0100 server: Add get_sd and set_sd object operations to allow the security descriptor to be stored somewhere other than server memory, such as on disk. --- server/async.c | 4 ++++ server/atom.c | 2 ++ server/change.c | 2 +
…
[View More]
+ server/clipboard.c | 2 ++ server/completion.c | 2 ++ server/console.c | 6 ++++++ server/debugger.c | 4 ++++ server/device.c | 6 ++++++ server/directory.c | 2 ++ server/event.c | 2 ++ server/fd.c | 8 ++++++++ server/file.c | 2 ++ server/handle.c | 6 ++++-- server/hook.c | 2 ++ server/mailslot.c | 6 ++++++ server/mapping.c | 2 ++ server/mutex.c | 2 ++ server/named_pipe.c | 8 ++++++++ server/object.c | 12 +++++++++--- server/object.h | 7 ++++++- server/process.c | 4 ++++ server/queue.c | 4 ++++ server/registry.c | 2 ++ server/request.c | 2 ++ server/semaphore.c | 2 ++ server/serial.c | 2 ++ server/signal.c | 2 ++ server/snapshot.c | 2 ++ server/sock.c | 2 ++ server/symlink.c | 2 ++ server/thread.c | 4 ++++ server/timer.c | 2 ++ server/token.c | 2 ++ server/winstation.c | 4 ++++ 34 files changed, 117 insertions(+), 6 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1707d89383f721d8d138…
[View Less]
1
0
0
0
Rob Shearman : server: Add a simple mapping from Unix uids to NT SIDs.
by Alexandre Julliard
04 Oct '07
04 Oct '07
Module: wine Branch: master Commit: 8184bcc91a506a16923a9b98578ee8ebbb82e412 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8184bcc91a506a16923a9b985…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 3 13:09:33 2007 +0100 server: Add a simple mapping from Unix uids to NT SIDs. --- server/security.h | 1 + server/token.c | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/server/security.h b/server/security.h index
…
[View More]
88b437d..74ff2bb 100644 --- a/server/security.h +++ b/server/security.h @@ -55,6 +55,7 @@ extern const SID *token_get_user( struct token *token ); extern const SID *token_get_primary_group( struct token *token ); extern void security_set_thread_token( struct thread *thread, obj_handle_t handle ); +extern const SID *security_unix_uid_to_sid( uid_t uid ); extern int check_object_access( struct object *obj, unsigned int *access ); static inline int thread_single_check_privilege( struct thread *thread, const LUID *priv) diff --git a/server/token.c b/server/token.c index 00cd6db..892fbab 100644 --- a/server/token.c +++ b/server/token.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <unistd.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -66,6 +67,7 @@ const LUID SeCreateGlobalPrivilege = { 30, 0 }; static const SID world_sid = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY }, { SECURITY_WORLD_RID } }; static const SID local_sid = { SID_REVISION, 1, { SECURITY_LOCAL_SID_AUTHORITY }, { SECURITY_LOCAL_RID } }; static const SID interactive_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_INTERACTIVE_RID } }; +static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_ANONYMOUS_LOGON_RID } }; static const SID authenticated_user_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } }; static const SID local_system_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } }; static const PSID security_world_sid = (PSID)&world_sid; @@ -196,6 +198,15 @@ static const ACE_HEADER *ace_next( const ACE_HEADER *ace ) return (const ACE_HEADER *)((const char *)ace + ace->AceSize); } +const SID *security_unix_uid_to_sid( uid_t uid ) +{ + /* very simple mapping: either the current user or not the current user */ + if (uid == getuid()) + return &interactive_sid; + else + return &anonymous_logon_sid; +} + static int acl_is_valid( const ACL *acl, data_size_t size ) { ULONG i; @@ -639,9 +650,7 @@ struct token *token_create_admin( void ) { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID }, }; static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; - /* note: we just set the user sid to be the interactive builtin sid - - * we should really translate the UNIX user id to a sid */ - token = create_token( TRUE, &interactive_sid, + token = create_token( TRUE, security_unix_uid_to_sid( getuid() ), admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), default_dacl, admin_source, NULL, -1 );
[View Less]
1
0
0
0
Stefan Dösinger : wined3d: Nested loop support.
by Alexandre Julliard
04 Oct '07
04 Oct '07
Module: wine Branch: master Commit: 3f16f029405f7a243b4b42c81d617463b252b81e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3f16f029405f7a243b4b42c81…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 14 13:21:52 2007 +0200 wined3d: Nested loop support. --- dlls/wined3d/baseshader.c | 12 ++++++++++-- dlls/wined3d/glsl_shader.c | 40 ++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 43
…
[View More]
insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 67888b2..cba756e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -193,6 +193,7 @@ HRESULT shader_get_registers_used( IWineD3DStateBlockImpl *stateBlock) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; + unsigned int cur_loop_depth = 0, max_loop_depth = 0; /* There are some minor differences between pixel and vertex shaders */ char pshader = shader_is_pshader_version(This->baseShader.hex_version); @@ -305,9 +306,15 @@ HRESULT shader_get_registers_used( /* If there's a loop in the shader */ } else if (WINED3DSIO_LOOP == curOpcode->opcode || WINED3DSIO_REP == curOpcode->opcode) { - reg_maps->loop = 1; + cur_loop_depth++; + if(cur_loop_depth > max_loop_depth) + max_loop_depth = cur_loop_depth; pToken += curOpcode->num_params; - + + } else if (WINED3DSIO_ENDLOOP == curOpcode->opcode || + WINED3DSIO_ENDREP == curOpcode->opcode) { + cur_loop_depth--; + /* For subroutine prototypes */ } else if (WINED3DSIO_LABEL == curOpcode->opcode) { @@ -424,6 +431,7 @@ HRESULT shader_get_registers_used( } } } + reg_maps->loop_depth = max_loop_depth; return WINED3D_OK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f05cd72..8a0603b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -640,12 +640,12 @@ void shader_generate_glsl_declarations( shader_addline(buffer, "attribute vec4 attrib%i;\n", i); } - /* Declare loop register aL */ - if (reg_maps->loop) { - shader_addline(buffer, "int aL;\n"); - shader_addline(buffer, "int tmpInt;\n"); + /* Declare loop registers aLx */ + for (i = 0; i < reg_maps->loop_depth; i++) { + shader_addline(buffer, "int aL%u;\n", i); + shader_addline(buffer, "int tmpInt%u;\n", i); } - + /* Temporary variables for matrix operations */ shader_addline(buffer, "vec4 tmp0;\n"); shader_addline(buffer, "vec4 tmp1;\n"); @@ -829,7 +829,7 @@ static void shader_glsl_get_register_name( } break; case WINED3DSPR_LOOP: - sprintf(tmpStr, "aL"); + sprintf(tmpStr, "aL%u", This->baseShader.cur_loop_regno - 1); break; case WINED3DSPR_SAMPLER: if (pshader) @@ -1817,22 +1817,42 @@ void shader_glsl_sincos(SHADER_OPCODE_ARG* arg) { /* FIXME: I don't think nested loops will work correctly this way. */ void shader_glsl_loop(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src1_param; + IWineD3DBaseShaderImpl* shader = (IWineD3DBaseShaderImpl*) arg->shader; shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_ALL, &src1_param); - - shader_addline(arg->buffer, "for (tmpInt = 0, aL = %s.y; tmpInt < %s.x; tmpInt++, aL += %s.z) {\n", - src1_param.reg_name, src1_param.reg_name, src1_param.reg_name); + + shader_addline(arg->buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z) {\n", + shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_regno, + src1_param.reg_name, shader->baseShader.cur_loop_depth, src1_param.reg_name, + shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_regno, src1_param.reg_name); + + shader->baseShader.cur_loop_depth++; + shader->baseShader.cur_loop_regno++; } void shader_glsl_end(SHADER_OPCODE_ARG* arg) { + IWineD3DBaseShaderImpl* shader = (IWineD3DBaseShaderImpl*) arg->shader; + shader_addline(arg->buffer, "}\n"); + + if(arg->opcode->opcode == WINED3DSIO_ENDLOOP) { + shader->baseShader.cur_loop_depth--; + shader->baseShader.cur_loop_regno--; + } + if(arg->opcode->opcode == WINED3DSIO_ENDREP) { + shader->baseShader.cur_loop_depth--; + } } void shader_glsl_rep(SHADER_OPCODE_ARG* arg) { + IWineD3DBaseShaderImpl* shader = (IWineD3DBaseShaderImpl*) arg->shader; glsl_src_param_t src0_param; shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, &src0_param); - shader_addline(arg->buffer, "for (tmpInt = 0; tmpInt < %s; tmpInt++) {\n", src0_param.param_str); + shader_addline(arg->buffer, "for (tmpInt%d = 0; tmpInt%d < %s; tmpInt%d++) {\n", + shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_depth, + src0_param.param_str, shader->baseShader.cur_loop_depth); + shader->baseShader.cur_loop_depth++; } void shader_glsl_if(SHADER_OPCODE_ARG* arg) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da4a90c..431160d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1654,8 +1654,8 @@ typedef struct shader_reg_maps { char bumpmat, luminanceparams; char usesnrm, vpos; - /* Whether or not a loop is used in this shader */ - char loop; + /* Whether or not loops are used in this shader, and nesting depth */ + unsigned loop_depth; /* Whether or not this shader uses fog */ char fog; @@ -1885,6 +1885,7 @@ typedef struct IWineD3DBaseShaderClass UINT functionLength; GLuint prgId; BOOL is_compiled; + UINT cur_loop_depth, cur_loop_regno; /* Type of shader backend */ int shader_mode;
[View Less]
1
0
0
0
Stefan Dösinger : wined3d: Implement the vFace register.
by Alexandre Julliard
04 Oct '07
04 Oct '07
Module: wine Branch: master Commit: 3c6d97278f2d46ce141a3f06075f2b9fe6a23c96 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3c6d97278f2d46ce141a3f060…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 4 08:24:03 2007 +0200 wined3d: Implement the vFace register. --- dlls/wined3d/glsl_shader.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 90062b8..f05cd72 100644 -
…
[View More]
-- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -871,10 +871,12 @@ static void shader_glsl_get_register_name( if (reg == 0) { /* vPos */ sprintf(tmpStr, "vpos"); + } else if (reg == 1){ + /* Note that gl_FrontFacing is a bool, while vFace is + * a float for which the sign determines front/back + */ + sprintf(tmpStr, "(gl_FrontFacing ? 1.0 : -1.0)"); } else { - /* gl_FrontFacing could be used for vFace, but note that - * gl_FrontFacing is a bool, while vFace is a float for - * which the sign determines front/back */ FIXME("Unhandled misctype register %d\n", reg); sprintf(tmpStr, "unrecognized_register"); }
[View Less]
1
0
0
0
Damjan Jovanovic : ws2_32: Silently ignore WS_IP_DONTFRAGMENT.
by Alexandre Julliard
04 Oct '07
04 Oct '07
Module: wine Branch: master Commit: 5591c969a61b03dab2b0aa379d1b321c4762b85a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5591c969a61b03dab2b0aa379…
Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Oct 4 08:48:57 2007 +0200 ws2_32: Silently ignore WS_IP_DONTFRAGMENT. --- dlls/ws2_32/socket.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c517f7e..2e5e558 100644 --- a/dlls/
…
[View More]
ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1924,6 +1924,10 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } release_sock_fd( s, fd ); return ret; + case WS_IP_DONTFRAGMENT: + FIXME("WS_IP_DONTFRAGMENT is always false!\n"); + *(BOOL*)optval = FALSE; + return 0; } FIXME("Unknown IPPROTO_IP optname 0x%08x\n", optname); return SOCKET_ERROR; @@ -3008,6 +3012,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_TTL: convert_sockopt(&level, &optname); break; + case WS_IP_DONTFRAGMENT: + FIXME("IP_DONTFRAGMENT is silently ignored!\n"); + return 0; default: FIXME("Unknown IPPROTO_IP optname 0x%08x\n", optname); return SOCKET_ERROR;
[View Less]
1
0
0
0
James Hawkins : user32: Test the ddeml client interface.
by Alexandre Julliard
04 Oct '07
04 Oct '07
Module: wine Branch: master Commit: 58639cc814a61e0b9ed0917446a61acb119a833c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=58639cc814a61e0b9ed091744…
Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 4 00:28:45 2007 -0500 user32: Test the ddeml client interface. --- dlls/user32/tests/dde.c | 585 ++++++++++++++++++++++++++++++++++++++++++++++- include/ddeml.h | 1 + 2 files changed, 578 insertions(+), 8 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=58639cc814a61e0b9ed09…
1
0
0
0
Mikolaj Zalewski : advapi32: security: Remove unneeded FIXME.
by Alexandre Julliard
04 Oct '07
04 Oct '07
Module: wine Branch: master Commit: 719da96a3eb74a8a6d73eef3cbea88811600f608 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=719da96a3eb74a8a6d73eef3c…
Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Sep 28 10:51:32 2007 -0700 advapi32: security: Remove unneeded FIXME. --- dlls/advapi32/security.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 23e9ad2..2e8a124 100644 --- a/
…
[View More]
dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1163,11 +1163,7 @@ BOOL WINAPI GetPrivateObjectSecurity( } *ReturnLength = DescriptorLength; - if (!MakeSelfRelativeSD(&desc, ResultantDescriptor, ReturnLength)) - return FALSE; - GetSecurityDescriptorOwner(ResultantDescriptor, &psid, &defaulted); - FIXME("%p, sid=%p\n", &desc, psid); - return TRUE; + return MakeSelfRelativeSD(&desc, ResultantDescriptor, ReturnLength); } /******************************************************************************
[View Less]
1
0
0
0
← Newer
1
...
82
83
84
85
86
87
88
...
100
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
Results per page:
10
25
50
100
200