wine-commits September 2007

wine-commits@winehq.org

7 participants
787 discussions

Juan Lang : setupapi: Correct type to match PSDK.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: ae6f5616cb3dabaf47e3b48602db976d5ba6b0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6f5616cb3dabaf47e3b4860… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 18 09:47:21 2007 -0700 setupapi: Correct type to match PSDK. --- include/setupapi.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index 60a794b..8bb2c3f 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -213,10 +213,10 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DEVINSTALL_PARAMS) of a device information set) */ typedef struct _SP_DEVINFO_DATA { - DWORD cbSize; - GUID ClassGuid; - DWORD DevInst; /* DEVINST handle */ - DWORD Reserved; + DWORD cbSize; + GUID ClassGuid; + DWORD DevInst; /* DEVINST handle */ + ULONG_PTR Reserved; } SP_DEVINFO_DATA, *PSP_DEVINFO_DATA; typedef struct _SP_DEVICE_INTERFACE_DATA

1 0

Tijl Coosemans : ws2_32/tests: Don' t wait for FD_CONNECT event when non-blocking connect() was successful.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 1233b4b27b7b9b0b3b2bbfb6a541e7f5f36659fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1233b4b27b7b9b0b3b2bbfb6a… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Tue Sep 18 20:03:47 2007 +0200 ws2_32/tests: Don't wait for FD_CONNECT event when non-blocking connect() was successful. --- dlls/ws2_32/tests/sock.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7eb6d38..d04552e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -650,17 +650,17 @@ static void WINAPI event_client ( client_params *par ) event = WSACreateEvent (); WSAEventSelect ( mem->s, event, FD_CONNECT ); tmp = connect ( mem->s, (struct sockaddr*) &mem->addr, sizeof ( mem->addr ) ); - if ( tmp != 0 && ( err = WSAGetLastError () ) != WSAEWOULDBLOCK ) - ok ( 0, "event_client (%x): connect error: %d\n", id, err ); - - tmp = WaitForSingleObject ( event, INFINITE ); - ok ( tmp == WAIT_OBJECT_0, "event_client (%x): wait for connect event failed: %d\n", id, tmp ); - err = WSAEnumNetworkEvents ( mem->s, event, &wsa_events ); - wsa_ok ( err, 0 ==, "event_client (%x): WSAEnumNetworkEvents error: %d\n" ); - - err = wsa_events.iErrorCode[ FD_CONNECT_BIT ]; - ok ( err == 0, "event_client (%x): connect error: %d\n", id, err ); - if ( err ) goto out; + if ( tmp != 0 ) { + err = WSAGetLastError (); + ok ( err == WSAEWOULDBLOCK, "event_client (%x): connect error: %d\n", id, err ); + tmp = WaitForSingleObject ( event, INFINITE ); + ok ( tmp == WAIT_OBJECT_0, "event_client (%x): wait for connect event failed: %d\n", id, tmp ); + err = WSAEnumNetworkEvents ( mem->s, event, &wsa_events ); + wsa_ok ( err, 0 ==, "event_client (%x): WSAEnumNetworkEvents error: %d\n" ); + err = wsa_events.iErrorCode[ FD_CONNECT_BIT ]; + ok ( err == 0, "event_client (%x): connect error: %d\n", id, err ); + if ( err ) goto out; + } trace ( "event_client (%x) connected\n", id );

1 0

Juan Lang : crypt32: Fix alignment for 64-bit systems.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 91f2a4d687dcbab4539aa4f9db5d8982cfd95ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f2a4d687dcbab4539aa4f9d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 18 09:21:39 2007 -0700 crypt32: Fix alignment for 64-bit systems. --- dlls/crypt32/msg.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 1a96205..14dbb50 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1756,8 +1756,8 @@ static inline void CRYPT_CopyAttributes(CRYPT_ATTRIBUTES *out, { DWORD i; - if ((*nextData - (LPBYTE)0) % sizeof(DWORD)) - *nextData += (*nextData - (LPBYTE)0) % sizeof(DWORD); + if ((*nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) + *nextData += (*nextData - (LPBYTE)0) % sizeof(DWORD_PTR); out->rgAttr = (CRYPT_ATTRIBUTE *)*nextData; *nextData += in->cAttr * sizeof(CRYPT_ATTRIBUTE); for (i = 0; i < in->cAttr; i++) @@ -1773,8 +1773,8 @@ static inline void CRYPT_CopyAttributes(CRYPT_ATTRIBUTES *out, DWORD j; out->rgAttr[i].cValue = in->rgAttr[i].cValue; - if ((*nextData - (LPBYTE)0) % sizeof(DWORD)) - *nextData += (*nextData - (LPBYTE)0) % sizeof(DWORD); + if ((*nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) + *nextData += (*nextData - (LPBYTE)0) % sizeof(DWORD_PTR); out->rgAttr[i].rgValue = (PCRYPT_DATA_BLOB)*nextData; for (j = 0; j < in->rgAttr[i].cValue; j++) CRYPT_CopyBlob(&out->rgAttr[i].rgValue[j], @@ -1793,8 +1793,8 @@ static DWORD CRYPT_SizeOfAttributes(const CRYPT_ATTRIBUTES *attr) if (attr->rgAttr[i].pszObjId) size += strlen(attr->rgAttr[i].pszObjId) + 1; /* align pointer */ - if (size % sizeof(DWORD)) - size += size % sizeof(DWORD); + if (size % sizeof(DWORD_PTR)) + size += size % sizeof(DWORD_PTR); size += attr->rgAttr[i].cValue * sizeof(CRYPT_DATA_BLOB); for (j = 0; j < attr->rgAttr[i].cValue; j++) size += attr->rgAttr[i].rgValue[j].cbData; @@ -1818,8 +1818,8 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, size += in->HashEncryptionAlgorithm.Parameters.cbData; size += in->EncryptedHash.cbData; /* align pointer */ - if (size % sizeof(DWORD)) - size += size % sizeof(DWORD); + if (size % sizeof(DWORD_PTR)) + size += size % sizeof(DWORD_PTR); size += CRYPT_SizeOfAttributes(&in->AuthAttrs); size += CRYPT_SizeOfAttributes(&in->UnauthAttrs); if (!pvData) @@ -1847,8 +1847,8 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, &in->HashEncryptionAlgorithm, &nextData); CRYPT_CopyBlob(&out->EncryptedHash, &in->EncryptedHash, &nextData); /* align pointer */ - if ((nextData - (LPBYTE)0) % sizeof(DWORD)) - nextData += (nextData - (LPBYTE)0) % sizeof(DWORD); + if ((nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) + nextData += (nextData - (LPBYTE)0) % sizeof(DWORD_PTR); CRYPT_CopyAttributes(&out->AuthAttrs, &in->AuthAttrs, &nextData); CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); ret = TRUE;

1 0

Juan Lang : crypt32: Implement streamed encoding of an indefinite-length data message.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 71b5ba03362dfaf3dc3ebda43a51e7f223ae2f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b5ba03362dfaf3dc3ebda43… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 18 09:21:08 2007 -0700 crypt32: Implement streamed encoding of an indefinite-length data message. --- dlls/crypt32/msg.c | 35 +++++++++++++++++++++++++++++++---- dlls/crypt32/tests/msg.c | 1 - 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index baa6a29..1a96205 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -146,10 +146,18 @@ static BOOL CRYPT_EncodeDataContentInfoHeader(CDataEncodeMsg *msg, if (msg->base.streamed && msg->base.stream_info.cbContent == 0xffffffff) { - FIXME("unimplemented for indefinite-length encoding\n"); - header->cbData = 0; - header->pbData = NULL; - ret = TRUE; + static const BYTE headerValue[] = { 0x30,0x80,0x06,0x09,0x2a,0x86,0x48, + 0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x80,0x24,0x80 }; + + header->pbData = LocalAlloc(0, sizeof(headerValue)); + if (header->pbData) + { + header->cbData = sizeof(headerValue); + memcpy(header->pbData, headerValue, sizeof(headerValue)); + ret = TRUE; + } + else + ret = FALSE; } else { @@ -197,6 +205,25 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, LocalFree(header.pbData); } } + /* Curiously, every indefinite-length streamed update appears to + * get its own tag and length, regardless of fFinal. + */ + if (msg->base.stream_info.cbContent == 0xffffffff) + { + BYTE *header; + DWORD headerLen; + + ret = CRYPT_EncodeContentLength(X509_ASN_ENCODING, NULL, + &cbData, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&header, + &headerLen); + if (ret) + { + ret = msg->base.stream_info.pfnStreamOutput( + msg->base.stream_info.pvArg, header, headerLen, + FALSE); + LocalFree(header); + } + } if (!fFinal) ret = msg->base.stream_info.pfnStreamOutput( msg->base.stream_info.pvArg, (BYTE *)pbData, cbData, diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 68487a5..711677b 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -659,7 +659,6 @@ static void test_data_msg_encoding(void) CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); CryptMsgClose(msg); - todo_wine check_updates("data message with indefinite length", &a3, &accum); free_updates(&accum); }

1 0

Juan Lang : crypt32: Pass length rather than entire message to CRYPT_EncodeContentLength.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 19956d6e97a57962cde6a063cbc2ca571b58589a URL: http://source.winehq.org/git/wine.git/?a=commit;h=19956d6e97a57962cde6a063c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 18 09:20:17 2007 -0700 crypt32: Pass length rather than entire message to CRYPT_EncodeContentLength. --- dlls/crypt32/msg.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 40d8390..baa6a29 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -113,7 +113,7 @@ static WINAPI BOOL CRYPT_EncodeContentLength(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - const CDataEncodeMsg *msg = (const CDataEncodeMsg *)pvStructInfo; + DWORD dataLen = *(DWORD *)pvStructInfo; DWORD lenBytes; BOOL ret = TRUE; @@ -121,9 +121,9 @@ static WINAPI BOOL CRYPT_EncodeContentLength(DWORD dwCertEncodingType, * the message isn't available yet. The caller will use the length * reported here to encode its length. */ - CRYPT_EncodeLen(msg->base.stream_info.cbContent, NULL, &lenBytes); + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); if (!pbEncoded) - *pcbEncoded = 1 + lenBytes + msg->base.stream_info.cbContent; + *pcbEncoded = 1 + lenBytes + dataLen; else { if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, @@ -132,7 +132,7 @@ static WINAPI BOOL CRYPT_EncodeContentLength(DWORD dwCertEncodingType, if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) pbEncoded = *(BYTE **)pbEncoded; *pbEncoded++ = ASN_OCTETSTRING; - CRYPT_EncodeLen(msg->base.stream_info.cbContent, pbEncoded, + CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); } } @@ -153,8 +153,8 @@ static BOOL CRYPT_EncodeDataContentInfoHeader(CDataEncodeMsg *msg, } else { - struct AsnConstructedItem constructed = { 0, msg, - CRYPT_EncodeContentLength }; + struct AsnConstructedItem constructed = { 0, + &msg->base.stream_info.cbContent, CRYPT_EncodeContentLength }; struct AsnEncodeSequenceItem items[2] = { { szOID_RSA_data, CRYPT_AsnEncodeOid, 0 }, { &constructed, CRYPT_AsnEncodeConstructed, 0 },

1 0

Stefan Dösinger : wined3d: Disable two sided stencil if it is supported, but not enabled.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 145d56847bcdea75669d541ea79931cc023293a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=145d56847bcdea75669d541ea… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 14 12:02:56 2007 +0200 wined3d: Disable two sided stencil if it is supported, but not enabled. --- dlls/wined3d/state.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ce8b07d..77b728e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -694,18 +694,21 @@ state_stencil(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *c renderstate_stencil_twosided(stateblock, GL_FRONT, func, ref, mask, stencilFail, depthFail, stencilPass); renderstate_stencil_twosided(stateblock, GL_BACK, func_ccw, ref, mask, stencilFail_ccw, depthFail_ccw, stencilPass_ccw); - } else { - if (onesided_enable) { - glEnable(GL_STENCIL_TEST); - checkGLcall("glEnable GL_STENCIL_TEST"); - glStencilFunc(func, ref, mask); - checkGLcall("glStencilFunc(...)"); - glStencilOp(stencilFail, depthFail, stencilPass); - checkGLcall("glStencilOp(...)"); - } else { - glDisable(GL_STENCIL_TEST); - checkGLcall("glDisable GL_STENCIL_TEST"); + } else if(onesided_enable) { + if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { + glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); + checkGLcall("glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); } + + glEnable(GL_STENCIL_TEST); + checkGLcall("glEnable GL_STENCIL_TEST"); + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); + } else { + glDisable(GL_STENCIL_TEST); + checkGLcall("glDisable GL_STENCIL_TEST"); } }

1 0

Stefan Dösinger : wined3d: Enable the stencil test if two sided stencil is used.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: ad3fe8562b1b4e71b18d0c69a77caad8189c3d28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad3fe8562b1b4e71b18d0c69a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 14 12:00:46 2007 +0200 wined3d: Enable the stencil test if two sided stencil is used. --- dlls/wined3d/state.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1fdceaa..ce8b07d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -688,7 +688,10 @@ state_stencil(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *c func, stencilFail, depthFail, stencilPass, func_ccw, stencilFail_ccw, depthFail_ccw, stencilPass_ccw); - if (twosided_enable) { + if (twosided_enable && onesided_enable) { + glEnable(GL_STENCIL_TEST); + checkGLcall("glEnable GL_STENCIL_TEST"); + renderstate_stencil_twosided(stateblock, GL_FRONT, func, ref, mask, stencilFail, depthFail, stencilPass); renderstate_stencil_twosided(stateblock, GL_BACK, func_ccw, ref, mask, stencilFail_ccw, depthFail_ccw, stencilPass_ccw); } else {

1 0

Stefan Dösinger : wined3d: Fix a copypaste error.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: e62a4b03526382b365651211c9e1883b58420f8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62a4b03526382b365651211c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 14 11:57:42 2007 +0200 wined3d: Fix a copypaste error. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0900243..1fdceaa 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -671,7 +671,7 @@ state_stencil(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *c if( !( func = CompareFunc(stateblock->renderState[WINED3DRS_STENCILFUNC]) ) ) func = GL_ALWAYS; if( !( func_ccw = CompareFunc(stateblock->renderState[WINED3DRS_CCW_STENCILFUNC]) ) ) - func = GL_ALWAYS; + func_ccw = GL_ALWAYS; ref = stateblock->renderState[WINED3DRS_STENCILREF]; mask = stateblock->renderState[WINED3DRS_STENCILMASK]; stencilFail = StencilOp(stateblock->renderState[WINED3DRS_STENCILFAIL]);

1 0

Stefan Dösinger : wined3d: Set the stencil mask for both faces.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 703ec4cbc4ac7542ff06f778e05c42aed909e2e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=703ec4cbc4ac7542ff06f778e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 14 11:57:07 2007 +0200 wined3d: Set the stencil mask for both faces. --- dlls/wined3d/state.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b248d00..0900243 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -707,10 +707,24 @@ state_stencil(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *c } static void state_stencilwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + DWORD mask; + if(stateblock->wineD3DDevice->stencilBufferTarget) { - glStencilMask(stateblock->renderState[WINED3DRS_STENCILWRITEMASK]); + mask = stateblock->renderState[WINED3DRS_STENCILWRITEMASK]; + } else { + mask = 0; + } + + if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { + GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); + checkGLcall("glActiveStencilFaceEXT(GL_BACK)"); + glStencilMask(mask); + checkGLcall("glStencilMask"); + GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); + checkGLcall("glActiveStencilFaceEXT(GL_FRONT)"); + glStencilMask(mask); } else { - glStencilMask(0); + glStencilMask(mask); } checkGLcall("glStencilMask"); }

1 0

Stefan Dösinger : wined3d: Untie culling and offscreen rendering.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 5a63b79a66434e8f56de27cd1616036e9f29fd8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a63b79a66434e8f56de27cd1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 18 11:43:09 2007 +0200 wined3d: Untie culling and offscreen rendering. --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/state.c | 37 +++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 4 +++- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c7622cb..403acdf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -706,11 +706,11 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf IWineD3DSwapChain_Release(swapchain); if(oldRenderOffscreen) { - Context_MarkStateDirty(context, WINED3DRS_CULLMODE); Context_MarkStateDirty(context, WINED3DTS_PROJECTION); Context_MarkStateDirty(context, STATE_VDECL); Context_MarkStateDirty(context, STATE_VIEWPORT); Context_MarkStateDirty(context, STATE_SCISSORRECT); + Context_MarkStateDirty(context, STATE_FRONTFACE); } } else { @@ -794,11 +794,11 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf } if(!oldRenderOffscreen) { - Context_MarkStateDirty(context, WINED3DRS_CULLMODE); Context_MarkStateDirty(context, WINED3DTS_PROJECTION); Context_MarkStateDirty(context, STATE_VDECL); Context_MarkStateDirty(context, STATE_VIEWPORT); Context_MarkStateDirty(context, STATE_SCISSORRECT); + Context_MarkStateDirty(context, STATE_FRONTFACE); } } if (readTexture) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index da2fb3c..b248d00 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -132,11 +132,9 @@ static void state_zenable(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD } static void state_cullmode(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - /* TODO: Put this into the offscreen / onscreen rendering block due to device->render_offscreen */ - - /* If we are culling "back faces with clockwise vertices" then - set front faces to be counter clockwise and enable culling - of back faces */ + /* glFrontFace() is set in context.c at context init and on an offscreen / onscreen rendering + * switch + */ switch ((WINED3DCULL) stateblock->renderState[WINED3DRS_CULLMODE]) { case WINED3DCULL_NONE: glDisable(GL_CULL_FACE); @@ -145,26 +143,14 @@ static void state_cullmode(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine case WINED3DCULL_CW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); - if (stateblock->wineD3DDevice->render_offscreen) { - glFrontFace(GL_CW); - checkGLcall("glFrontFace GL_CW"); - } else { - glFrontFace(GL_CCW); - checkGLcall("glFrontFace GL_CCW"); - } - glCullFace(GL_BACK); + glCullFace(GL_FRONT); + checkGLcall("glCullFace(GL_FRONT)"); break; case WINED3DCULL_CCW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); - if (stateblock->wineD3DDevice->render_offscreen) { - glFrontFace(GL_CCW); - checkGLcall("glFrontFace GL_CCW"); - } else { - glFrontFace(GL_CW); - checkGLcall("glFrontFace GL_CW"); - } glCullFace(GL_BACK); + checkGLcall("glCullFace(GL_BACK)"); break; default: FIXME("Unrecognized/Unhandled WINED3DCULL value %d\n", stateblock->renderState[WINED3DRS_CULLMODE]); @@ -3605,6 +3591,16 @@ static void indexbuffer(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D } } +static void frontface(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + if(stateblock->wineD3DDevice->render_offscreen) { + glFrontFace(GL_CCW); + checkGLcall("glFrontFace(GL_CCW)"); + } else { + glFrontFace(GL_CW); + checkGLcall("glFrontFace(GL_CW)"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -4676,4 +4672,5 @@ const struct StateEntry StateTable[] = { /* STATE_CLIPPLANE(31) */ STATE_CLIPPLANE(31), clipplane }, { /* STATE_MATERIAL */ STATE_RENDER(WINED3DRS_SPECULARENABLE), state_specularenable}, + { /* STATE_FRONTFACE */ STATE_FRONTFACE, frontface }, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b71e03..b7e08fc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -481,7 +481,9 @@ typedef void (*APPLYSTATEFUNC)(DWORD state, IWineD3DStateBlockImpl *stateblock, #define STATE_MATERIAL (STATE_CLIPPLANE(MAX_CLIPPLANES)) -#define STATE_HIGHEST (STATE_MATERIAL) +#define STATE_FRONTFACE (STATE_MATERIAL + 1) + +#define STATE_HIGHEST (STATE_FRONTFACE) struct StateEntry {

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2007