February 2006 - Wine-Commits

Eric Kohl : widl: The 'string' attribute can also be used with unsigned characters.
by Alexandre Julliard Feb. 3, 2006

Feb. 3, 2006

Module: wine Branch: refs/heads/master Commit: dd57b45aaabcb840f031e1c3aa31619f986aa504 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd57b45aaabcb840f031e1c… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Fri Feb 3 18:47:06 2006 +0100 widl: The 'string' attribute can also be used with unsigned characters. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 546e693..1c1002e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -577,7 +577,7 @@ static size_t write_string_tfs(FILE *fil int has_size = size_is && (size_is->type != EXPR_VOID); size_t start_offset = *typestring_offset; - if ((type->type != RPC_FC_CHAR) && (type->type != RPC_FC_WCHAR)) + if ((type->type != RPC_FC_BYTE) && (type->type != RPC_FC_CHAR) && (type->type != RPC_FC_WCHAR)) { error("write_string_tfs: Unimplemented for type 0x%x of name: %s\n", type->type, name); return start_offset;

1 0

Robert Shearman : rpcrt4: Restrict stubless FC types to the range of the type function table.
by Alexandre Julliard Feb. 3, 2006

Feb. 3, 2006

Module: wine Branch: refs/heads/master Commit: 4d25edc2981b4c2d6be6b1f0cb921e731552b5ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d25edc2981b4c2d6be6b1f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 3 18:46:40 2006 +0100 rpcrt4: Restrict stubless FC types to the range of the type function table. --- dlls/rpcrt4/ndr_stubless.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 7c10621..1a45275 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -47,9 +47,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(rpc); +#define NDR_TABLE_MASK 127 + static inline void call_buffer_sizer(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { - NDR_BUFFERSIZE m = NdrBufferSizer[pFormat[0]]; + NDR_BUFFERSIZE m = NdrBufferSizer[pFormat[0] & NDR_TABLE_MASK]; if (m) m(pStubMsg, pMemory, pFormat); else { @@ -60,7 +62,7 @@ static inline void call_buffer_sizer(PMI static inline unsigned char *call_marshaller(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { - NDR_MARSHALL m = NdrMarshaller[pFormat[0]]; + NDR_MARSHALL m = NdrMarshaller[pFormat[0] & NDR_TABLE_MASK]; if (m) return m(pStubMsg, pMemory, pFormat); else { @@ -72,7 +74,7 @@ static inline unsigned char *call_marsha static inline unsigned char *call_unmarshaller(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - NDR_UNMARSHALL m = NdrUnmarshaller[pFormat[0]]; + NDR_UNMARSHALL m = NdrUnmarshaller[pFormat[0] & NDR_TABLE_MASK]; if (m) return m(pStubMsg, ppMemory, pFormat, fMustAlloc); else { @@ -84,7 +86,7 @@ static inline unsigned char *call_unmars static inline void call_freer(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { - NDR_FREE m = NdrFreer[pFormat[0]]; + NDR_FREE m = NdrFreer[pFormat[0] & NDR_TABLE_MASK]; if (m) m(pStubMsg, pMemory, pFormat); else { @@ -95,7 +97,7 @@ static inline void call_freer(PMIDL_STUB static inline unsigned long call_memory_sizer(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - NDR_MEMORYSIZE m = NdrMemorySizer[pFormat[0]]; + NDR_MEMORYSIZE m = NdrMemorySizer[pFormat[0] & NDR_TABLE_MASK]; if (m) return m(pStubMsg, pFormat); else {

1 0

Robert Shearman : rpcrt4: Raise exceptions in NdrSendReceive if I_RpcSendReceive failed.
by Alexandre Julliard Feb. 3, 2006

Feb. 3, 2006

Module: wine Branch: refs/heads/master Commit: 666baea161348f34dc60b5491d0d8b2214df870c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=666baea161348f34dc60b54… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 3 18:46:32 2006 +0100 rpcrt4: Raise exceptions in NdrSendReceive if I_RpcSendReceive failed. --- dlls/rpcrt4/ndr_midl.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_midl.c b/dlls/rpcrt4/ndr_midl.c index 723c3c1..cc43817 100644 --- a/dlls/rpcrt4/ndr_midl.c +++ b/dlls/rpcrt4/ndr_midl.c @@ -269,6 +269,8 @@ void WINAPI NdrFreeBuffer(MIDL_STUB_MESS */ unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer ) { + RPC_STATUS status; + TRACE("(stubmsg == ^%p, buffer == ^%p)\n", stubmsg, buffer); /* FIXME: how to handle errors? (raise exception?) */ @@ -281,10 +283,9 @@ unsigned char *WINAPI NdrSendReceive( MI return NULL; } - if (I_RpcSendReceive(stubmsg->RpcMsg) != RPC_S_OK) { - WARN("I_RpcSendReceive did not return success.\n"); - /* FIXME: raise exception? */ - } + status = I_RpcSendReceive(stubmsg->RpcMsg); + if (status != RPC_S_OK) + RpcRaiseException(status); stubmsg->BufferLength = stubmsg->RpcMsg->BufferLength; stubmsg->BufferStart = stubmsg->RpcMsg->Buffer;

1 0

Robert Shearman : include: Move all of the contiguous FC types together so we can see
by Alexandre Julliard Feb. 3, 2006

Feb. 3, 2006

Module: wine Branch: refs/heads/master Commit: 7dcc55f4ccd5e44bb29040796aa6b509d829d919 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7dcc55f4ccd5e44bb290407… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 3 18:46:12 2006 +0100 include: Move all of the contiguous FC types together so we can see possible missing constants better. --- include/wine/rpcfc.h | 85 ++++++++++++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 41 deletions(-) diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h index 7a124d4..0180a27 100644 --- a/include/wine/rpcfc.h +++ b/include/wine/rpcfc.h @@ -29,12 +29,6 @@ #define RPC_FC_UP 0x12 /* unique pointer */ #define RPC_FC_OP 0x13 /* unique pointer in object ? */ #define RPC_FC_FP 0x14 /* full pointer */ -/* FC_RP/UP/OP/FP: flags, NdrFcShort(typeofs)/basetype */ -#define RPC_FC_P_ALLOCALLNODES 0x01 -#define RPC_FC_P_DONTFREE 0x02 -#define RPC_FC_P_ONSTACK 0x04 /* [alloced_on_stack] */ -#define RPC_FC_P_SIMPLEPOINTER 0x08 /* [simple_pointer] */ -#define RPC_FC_P_DEREF 0x10 #define RPC_FC_STRUCT 0x15 /* simple structure */ /* FC_STRUCT: align-1, NdrFcShort(size), fields */ @@ -82,47 +76,12 @@ /* FC_IP: FC_CONSTANT_IID iid */ /* FC_IP: FC_PAD correlation */ -#define RPC_FC_BIND_EXPLICIT 0x00 #define RPC_FC_BIND_CONTEXT 0x30 #define RPC_FC_BIND_GENERIC 0x31 #define RPC_FC_BIND_PRIMITIVE 0x32 #define RPC_FC_AUTO_HANDLE 0x33 #define RPC_FC_CALLBACK_HANDLE 0x34 -/* proc header: oiflags, NdrFcLong(rpcflags), NdrFcShort(procnum), NdrFcShort(stacksiz), - * oi2 header: NdrFcShort(clientbuf), NdrFcShort(servbuf), oi2flags, parmcount - * oi2 parameters: NdrFcShort(flags), NdrFcShort(stackofs), NdrFcShort(typeofs)/basetype */ -#define RPC_FC_PROC_OIF_FULLPTR 0x01 -#define RPC_FC_PROC_OIF_RPCSSALLOC 0x02 -#define RPC_FC_PROC_OIF_OBJECT 0x04 -#define RPC_FC_PROC_OIF_RPCFLAGS 0x08 -#define RPC_FC_PROC_OIF_OBJ_V2 0x20 -#define RPC_FC_PROC_OIF_NEWINIT 0x40 - -#define RPC_FC_PROC_OI2F_SRVMUSTSIZE 0x01 -#define RPC_FC_PROC_OI2F_CLTMUSTSIZE 0x02 -#define RPC_FC_PROC_OI2F_HASRETURN 0x04 -#define RPC_FC_PROC_OI2F_HASPIPES 0x08 -#define RPC_FC_PROC_OI2F_HASASYNCUUID 0x20 -#define RPC_FC_PROC_OI2F_HASEXTS 0x40 -#define RPC_FC_PROC_OI2F_HASASYNCHND 0x80 -#define RPC_FC_PROC_PF_MUSTSIZE 0x0001 -#define RPC_FC_PROC_PF_MUSTFREE 0x0002 -#define RPC_FC_PROC_PF_PIPE 0x0004 -#define RPC_FC_PROC_PF_IN 0x0008 -#define RPC_FC_PROC_PF_OUT 0x0010 -#define RPC_FC_PROC_PF_RETURN 0x0020 -#define RPC_FC_PROC_PF_BASETYPE 0x0040 -#define RPC_FC_PROC_PF_BYVAL 0x0080 -#define RPC_FC_PROC_PF_SIMPLEREF 0x0100 -#define RPC_FC_PROC_PF_DONTFREEINST 0x0200 -#define RPC_FC_PROC_PF_SAVEASYNC 0x0400 -#define RPC_FC_PROC_PF_SRVALLOCSIZE 0xe000 /* in 8 byte units */ -#define RPC_FC_PROC_EXT_NEWCORRDESC 0x01 -#define RPC_FC_PROC_EXT_CLIENTCORRCHECK 0x02 -#define RPC_FC_PROC_EXT_SERVERCORRCHECK 0x04 -#define RPC_FC_PROC_EXT_HASNOTIFY 0x08 -#define RPC_FC_PROC_EXT_HASNOTIFY2 0x10 #define RPC_FC_POINTER 0x36 @@ -182,6 +141,50 @@ #define RPC_FC_INT3264 0xb8 #define RPC_FC_UINT3264 0xb9 +/* FC_RP/UP/OP/FP: flags, NdrFcShort(typeofs)/basetype */ +#define RPC_FC_P_ALLOCALLNODES 0x01 +#define RPC_FC_P_DONTFREE 0x02 +#define RPC_FC_P_ONSTACK 0x04 /* [alloced_on_stack] */ +#define RPC_FC_P_SIMPLEPOINTER 0x08 /* [simple_pointer] */ +#define RPC_FC_P_DEREF 0x10 + +#define RPC_FC_BIND_EXPLICIT 0x00 + +/* proc header: oiflags, NdrFcLong(rpcflags), NdrFcShort(procnum), NdrFcShort(stacksiz), + * oi2 header: NdrFcShort(clientbuf), NdrFcShort(servbuf), oi2flags, parmcount + * oi2 parameters: NdrFcShort(flags), NdrFcShort(stackofs), NdrFcShort(typeofs)/basetype */ +#define RPC_FC_PROC_OIF_FULLPTR 0x01 +#define RPC_FC_PROC_OIF_RPCSSALLOC 0x02 +#define RPC_FC_PROC_OIF_OBJECT 0x04 +#define RPC_FC_PROC_OIF_RPCFLAGS 0x08 +#define RPC_FC_PROC_OIF_OBJ_V2 0x20 +#define RPC_FC_PROC_OIF_NEWINIT 0x40 + +#define RPC_FC_PROC_OI2F_SRVMUSTSIZE 0x01 +#define RPC_FC_PROC_OI2F_CLTMUSTSIZE 0x02 +#define RPC_FC_PROC_OI2F_HASRETURN 0x04 +#define RPC_FC_PROC_OI2F_HASPIPES 0x08 +#define RPC_FC_PROC_OI2F_HASASYNCUUID 0x20 +#define RPC_FC_PROC_OI2F_HASEXTS 0x40 +#define RPC_FC_PROC_OI2F_HASASYNCHND 0x80 +#define RPC_FC_PROC_PF_MUSTSIZE 0x0001 +#define RPC_FC_PROC_PF_MUSTFREE 0x0002 +#define RPC_FC_PROC_PF_PIPE 0x0004 +#define RPC_FC_PROC_PF_IN 0x0008 +#define RPC_FC_PROC_PF_OUT 0x0010 +#define RPC_FC_PROC_PF_RETURN 0x0020 +#define RPC_FC_PROC_PF_BASETYPE 0x0040 +#define RPC_FC_PROC_PF_BYVAL 0x0080 +#define RPC_FC_PROC_PF_SIMPLEREF 0x0100 +#define RPC_FC_PROC_PF_DONTFREEINST 0x0200 +#define RPC_FC_PROC_PF_SAVEASYNC 0x0400 +#define RPC_FC_PROC_PF_SRVALLOCSIZE 0xe000 /* in 8 byte units */ +#define RPC_FC_PROC_EXT_NEWCORRDESC 0x01 +#define RPC_FC_PROC_EXT_CLIENTCORRCHECK 0x02 +#define RPC_FC_PROC_EXT_SERVERCORRCHECK 0x04 +#define RPC_FC_PROC_EXT_HASNOTIFY 0x08 +#define RPC_FC_PROC_EXT_HASNOTIFY2 0x10 + /* correlation types */ #define RPC_FC_NORMAL_CONFORMANCE 0x00 #define RPC_FC_POINTER_CONFORMANCE 0x10

1 0

Robert Shearman : include: Add function declarations for the Range type.
by Alexandre Julliard Feb. 3, 2006

Feb. 3, 2006

Module: wine Branch: refs/heads/master Commit: f9e245fe54667fd015790b70445ba4c6629d9dd9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9e245fe54667fd015790b7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Feb 3 18:45:59 2006 +0100 include: Add function declarations for the Range type. --- include/rpcndr.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 87d5b51..eca899a 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -537,6 +537,7 @@ TYPE_MARSHAL(ByteCountPointer) TYPE_MARSHAL(XmitOrRepAs) TYPE_MARSHAL(UserMarshal) TYPE_MARSHAL(InterfacePointer) +TYPE_MARSHAL(Range) SIMPLE_TYPE_MARSHAL(ConformantString) SIMPLE_TYPE_MARSHAL(NonConformantString)

1 0

Mike McCormack : ntdll: Add FILE_ACTION and FILE_NOTIFY_CHANGE_ defines for streams.
by Alexandre Julliard Feb. 3, 2006

Feb. 3, 2006

Module: wine Branch: refs/heads/master Commit: 39f711ae6ec107c4a12ac900df574e79c161873b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39f711ae6ec107c4a12ac90… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Feb 3 18:45:51 2006 +0100 ntdll: Add FILE_ACTION and FILE_NOTIFY_CHANGE_ defines for streams. --- include/winnt.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 428a682..b795972 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3568,14 +3568,20 @@ typedef enum tagSID_NAME_USE { #define FILE_NOTIFY_CHANGE_LAST_WRITE 0x00000010 #define FILE_NOTIFY_CHANGE_LAST_ACCESS 0x00000020 #define FILE_NOTIFY_CHANGE_CREATION 0x00000040 +#define FILE_NOTIFY_CHANGE_EA 0x00000080 #define FILE_NOTIFY_CHANGE_SECURITY 0x00000100 +#define FILE_NOTIFY_CHANGE_STREAM_NAME 0x00000200 +#define FILE_NOTIFY_CHANGE_STREAM_SIZE 0x00000400 +#define FILE_NOTIFY_CHANGE_STREAM_WRITE 0x00000800 #define FILE_ACTION_ADDED 0x00000001 #define FILE_ACTION_REMOVED 0x00000002 #define FILE_ACTION_MODIFIED 0x00000003 #define FILE_ACTION_RENAMED_OLD_NAME 0x00000004 #define FILE_ACTION_RENAMED_NEW_NAME 0x00000005 - +#define FILE_ACTION_ADDED_STREAM 0x00000006 +#define FILE_ACTION_REMOVED_STREAM 0x00000007 +#define FILE_ACTION_MODIFIED_STREAM 0x00000008 #define FILE_CASE_SENSITIVE_SEARCH 0x00000001 #define FILE_CASE_PRESERVED_NAMES 0x00000002

1 0

Vitaly Budovski : wined3d: Fixed WINED3DRS_POINTSPRITEENABLE.
by Alexandre Julliard Feb. 3, 2006

Feb. 3, 2006

Module: wine Branch: refs/heads/master Commit: 8f3c98fdfd44165aebcdc75215c835af475d6360 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f3c98fdfd44165aebcdc75… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Fri Feb 3 12:37:46 2006 +0100 wined3d: Fixed WINED3DRS_POINTSPRITEENABLE. --- dlls/wined3d/device.c | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a491343..c5c4c47 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3576,29 +3576,30 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen return D3DERR_INVALIDCALL; } case WINED3DRS_POINTSPRITEENABLE : + { /* TODO: NV_POINT_SPRITE */ - if (GL_SUPPORT(ARB_POINT_SPRITE)) { - if (Value != FALSE) { - /* Doesn't work with GL_POINT_SMOOTH on on my ATI 9600, but then ATI drivers are buggered! */ - glDisable(GL_POINT_SMOOTH); - /* Centre the texture on the vertex */ - VTRACE("glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)\n"); - glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); - - VTRACE("glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)\n"); - glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); - checkGLcall("glTexEnvf(...)"); - VTRACE("glEnable( GL_POINT_SPRITE_ARB )\n"); - glEnable( GL_POINT_SPRITE_ARB ); - checkGLcall("glEnable(...)"); - } else { - VTRACE("glDisable( GL_POINT_SPRITE_ARB )\n"); - glDisable( GL_POINT_SPRITE_ARB ); - checkGLcall("glEnable(...)"); - } + if (!GL_SUPPORT(ARB_POINT_SPRITE)) { + TRACE("Point sprites not supported\n"); + break; } - break; - /* Unhandled yet...! */ + + /* + * Point sprites are always enabled. Value controls texture coordinate + * replacement mode. Must be set true for point sprites to use + * textures. + */ + glEnable(GL_POINT_SPRITE_ARB); + checkGLcall("glEnable(GL_POINT_SPRITE_ARB)"); + + if (Value) { + glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, TRUE); + checkGLcall("glTexEnvf(GL_POINT_SPRITE, GL_COORD_REPLACE, TRUE)"); + } else { + glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, FALSE); + checkGLcall("glTexEnvf(GL_POINT_SPRITE, GL_COORD_REPLACE, FALSE)"); + } + break; + } case WINED3DRS_EDGEANTIALIAS : { if(Value) {

1 0

Vitaly Budovski : wined3d: Corrected implementation of WINED3DRS_POINTSCALEENABLE.
by Alexandre Julliard Feb. 3, 2006

Feb. 3, 2006

Module: wine Branch: refs/heads/master Commit: dbff6d59e8e857aec21deff8e7185372905a4a67 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dbff6d59e8e857aec21deff… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Fri Feb 3 12:34:44 2006 +0100 wined3d: Corrected implementation of WINED3DRS_POINTSCALEENABLE. --- dlls/wined3d/device.c | 58 +++++++++++++++++++++++++------------------------ 1 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 09343fa..a491343 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3495,35 +3495,37 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen case WINED3DRS_POINTSCALE_B : case WINED3DRS_POINTSCALE_C : case WINED3DRS_POINTSCALEENABLE : - { - /* If enabled, supply the parameters, otherwise fall back to defaults */ - if (This->stateBlock->renderState[WINED3DRS_POINTSCALEENABLE]) { - GLfloat att[3] = {1.0f, 0.0f, 0.0f}; - /* TODO: Correct the scaling (this hack seems to be good enough for every demo that uses point sprites!) */ - att[0] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_A])/ This->stateBlock->viewport.Width; - att[1] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_B])/ This->stateBlock->viewport.Height; - att[2] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_C]) * - 2.0f /(This->stateBlock->viewport.Width * This->stateBlock->viewport.Height); - - if (GL_SUPPORT(EXT_POINT_PARAMETERS)) { - TRACE("glPointParameterfvARB %f %f %f\n", att[0], att[1], att[2]); - GL_EXTCALL(glPointParameterfvEXT)(GL_DISTANCE_ATTENUATION_EXT, att); - checkGLcall("glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, ...);"); - } else { - TRACE("WINED3DRS_POINTSCALEENABLE not supported on this opengl\n"); - } - } else { - GLfloat att[3] = {1.0f, 0.0f, 0.0f}; - if (GL_SUPPORT(EXT_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfvEXT)(GL_DISTANCE_ATTENUATION_EXT, att); - checkGLcall("glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, ...);"); - } else { - TRACE("WINED3DRS_POINTSCALEENABLE not supported, but not on either\n"); - } - } - break; + { + /* + * POINTSCALEENABLE controls how point size value is treated. If set to + * true, the point size is scaled with repsect to height of viewport. + * When set to false point size is in pixels. + * + * http://msdn.microsoft.com/library/en-us/directx9_c/point_sprites.asp + */ + + /* Default values */ + GLfloat att[3] = {1.0f, 0.0f, 0.0f}; + if(This->stateBlock->renderState[WINED3DRS_POINTSCALEENABLE]) { + att[0] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_A]) / + (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height); + att[1] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_B]) / + (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height); + att[2] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_C]) / + (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height); + } + + if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { + glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, att); + checkGLcall("glPointParameterfvARB(GL_DISTANCE_ATTENUATION_ARB, ..."); + } + else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { + GL_EXTCALL(glPointParameterfvEXT)(GL_DISTANCE_ATTENUATION_EXT, att); + checkGLcall("glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, ..."); + } else { + TRACE("POINT_PARAMETERS not supported in this version of opengl\n"); } - + } case WINED3DRS_COLORWRITEENABLE : { TRACE("Color mask: r(%d) g(%d) b(%d) a(%d)\n",

1 0

Vitaly Budovski : wined3d: Implemented WINED3DRS_EDGEANTIALIAS.
by Alexandre Julliard Feb. 3, 2006

Feb. 3, 2006

Module: wine Branch: refs/heads/master Commit: 4279bcc5a8b0a533ccb5393aec5b974e2d0b5679 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4279bcc5a8b0a533ccb5393… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Fri Feb 3 12:33:26 2006 +0100 wined3d: Implemented WINED3DRS_EDGEANTIALIAS. --- dlls/wined3d/device.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab3cc6b..09343fa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3598,6 +3598,21 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen break; /* Unhandled yet...! */ case WINED3DRS_EDGEANTIALIAS : + { + if(Value) { + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glEnable(GL_BLEND); + checkGLcall("glEnable(GL_BLEND)"); + glEnable(GL_LINE_SMOOTH); + checkGLcall("glEnable(GL_LINE_SMOOTH)"); + } else { + glDisable(GL_BLEND); + checkGLcall("glDisable(GL_BLEND)"); + glDisable(GL_LINE_SMOOTH); + checkGLcall("glDisable(GL_LINE_SMOOTH)"); + } + break; + } case WINED3DRS_WRAP0 : case WINED3DRS_WRAP1 : case WINED3DRS_WRAP2 :

1 0

Vitaly Budovski : wined3d: Implemented WINED3DRS_MULTISAMPLEANTIALIAS.
by Alexandre Julliard Feb. 3, 2006

Feb. 3, 2006

Module: wine Branch: refs/heads/master Commit: 6de3620a9cf29bb36060975af2751d779bed6c5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6de3620a9cf29bb36060975… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Fri Feb 3 12:31:02 2006 +0100 wined3d: Implemented WINED3DRS_MULTISAMPLEANTIALIAS. --- dlls/wined3d/device.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2ffeb1a..ab3cc6b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3618,6 +3618,21 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen TRACE("(%p)->(%d,%ld) Texture wraping not yet supported\n",This, State, Value); break; case WINED3DRS_MULTISAMPLEANTIALIAS : + { + if (!GL_SUPPORT(ARB_MULTISAMPLE)) { + TRACE("Multisample antialiasing not supported\n"); + break; + } + + if(Value) { + glEnable(GL_MULTISAMPLE_ARB); + checkGLcall("glEnable(GL_MULTISAMPLE_ARB)"); + } else { + glDisable(GL_MULTISAMPLE_ARB); + checkGLcall("glDisable(GL_MULTISAMPLE_ARB)"); + } + break; + } case WINED3DRS_MULTISAMPLEMASK : case WINED3DRS_PATCHEDGESTYLE : case WINED3DRS_PATCHSEGMENTS :

1 0