July 2007 - Wine-commits - list.winehq.org

Juan Lang : crypt32: Only destroy a decoded message's hash if it' s been created.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 6f2ae254410b36a841d2ca9908e6d4dbd37dc511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2ae254410b36a841d2ca990… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:58:52 2007 -0700 crypt32: Only destroy a decoded message's hash if it's been created. --- dlls/crypt32/msg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index bca4040..f554c78 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1255,7 +1255,8 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) switch (msg->type) { case CMSG_HASHED: - CryptDestroyHash(msg->u.hash); + if (msg->u.hash) + CryptDestroyHash(msg->u.hash); break; case CMSG_SIGNED: LocalFree(msg->u.signedInfo);

1 0

Juan Lang : crypt32: Store decoded signed content in message.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 299612378a9120340ffc8058ddba105bae192a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=299612378a9120340ffc8058d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:56:20 2007 -0700 crypt32: Store decoded signed content in message. --- dlls/crypt32/msg.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ee116bd..d1b2ec6 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1241,6 +1241,7 @@ typedef struct _CDecodeMsg HCRYPTPROV crypt_prov; union { HCRYPTHASH hash; + CRYPT_SIGNED_INFO *signedInfo; } u; CRYPT_DATA_BLOB msg_data; PCONTEXT_PROPERTY_LIST properties; @@ -1257,6 +1258,9 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) case CMSG_HASHED: CryptDestroyHash(msg->u.hash); break; + case CMSG_SIGNED: + LocalFree(msg->u.signedInfo); + break; } CryptMemFree(msg->msg_data.pbData); ContextPropertyList_Free(msg->properties); @@ -1390,10 +1394,7 @@ static BOOL CDecodeMsg_DecodeSignedContent(CDecodeMsg *msg, CRYPT_DECODE_ALLOC_FLAG, NULL, (CRYPT_SIGNED_INFO *)&signedInfo, &size); if (ret) - { - FIXME("store properties in message\n"); - LocalFree(signedInfo); - } + msg->u.signedInfo = signedInfo; return ret; } /* Decodes the content in blob as the type given, and updates the value

1 0

Juan Lang : crypt32: Test getting parameters from decoded signed messages.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: d187fcd172bb0b5583a93fef7b579cf5b1ce1210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d187fcd172bb0b5583a93fef7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:56:48 2007 -0700 crypt32: Test getting parameters from decoded signed messages. --- dlls/crypt32/tests/msg.c | 54 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8cfb72c..b7f9393 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1907,7 +1907,7 @@ static void test_decode_msg_get_param(void) { HCRYPTMSG msg; BOOL ret; - DWORD size = 0, version; + DWORD size = 0, value; LPBYTE buf; msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); @@ -1950,9 +1950,55 @@ static void test_decode_msg_get_param(void) } check_param("hash inner OID", msg, CMSG_INNER_CONTENT_TYPE_PARAM, (const BYTE *)szOID_RSA_data, strlen(szOID_RSA_data) + 1); - version = CMSG_HASHED_DATA_V0; - check_param("hash version", msg, CMSG_VERSION_PARAM, (const BYTE *)&version, - sizeof(version)); + value = CMSG_HASHED_DATA_V0; + check_param("hash version", msg, CMSG_VERSION_PARAM, (const BYTE *)&value, + sizeof(value)); + CryptMsgClose(msg); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + ret = CryptMsgUpdate(msg, signedContent, sizeof(signedContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + size = sizeof(value); + value = 2112; + ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 0, &value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 1, "Expected 1 signer, got %d\n", value); + } + /* index is ignored when getting signer count */ + ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 1, &value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 1, "Expected 1 signer, got %d\n", value); + } + ret = CryptMsgGetParam(msg, CMSG_CERT_COUNT_PARAM, 0, &value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 0, "Expected 0 certs, got %d\n", value); + } + ret = CryptMsgGetParam(msg, CMSG_CRL_COUNT_PARAM, 0, &value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 0, "Expected 0 CRLs, got %d\n", value); + } + CryptMsgClose(msg); + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, + NULL); + ret = CryptMsgUpdate(msg, signedWithCertAndCrlBareContent, + sizeof(signedWithCertAndCrlBareContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + ret = CryptMsgGetParam(msg, CMSG_CERT_COUNT_PARAM, 0, &value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 1, "Expected 1 cert, got %d\n", value); + check_param("cert", msg, CMSG_CERT_PARAM, cert, sizeof(cert)); + } + ret = CryptMsgGetParam(msg, CMSG_CRL_COUNT_PARAM, 0, &value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 1, "Expected 1 CRL, got %d\n", value); + check_param("crl", msg, CMSG_CRL_PARAM, crl, sizeof(crl)); + } CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Change type to avoid unnecessary casting.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 9c7c9e545e2518701e045ff9c47397c7a2ba50fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c7c9e545e2518701e045ff9c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:57:17 2007 -0700 crypt32: Change type to avoid unnecessary casting. --- dlls/crypt32/msg.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index d1b2ec6..042b1ef 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -241,7 +241,7 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, return ret; } -static BOOL CRYPT_CopyParam(void *pvData, DWORD *pcbData, const BYTE *src, +static BOOL CRYPT_CopyParam(void *pvData, DWORD *pcbData, const void *src, DWORD len) { BOOL ret = TRUE; @@ -444,8 +444,7 @@ static BOOL CHashEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, /* Since the data are always encoded as octets, the version is * always 0 (see rfc3852, section 7) */ - ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&version, - sizeof(version)); + ret = CRYPT_CopyParam(pvData, pcbData, &version, sizeof(version)); } break; default: @@ -887,7 +886,7 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, pvData, pcbData); break; case CMSG_VERSION_PARAM: - ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->info.version, + ret = CRYPT_CopyParam(pvData, pcbData, &msg->info.version, sizeof(msg->info.version)); break; default: @@ -1495,8 +1494,7 @@ static BOOL CDecodeHashMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, switch (dwParamType) { case CMSG_TYPE_PARAM: - ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->type, - sizeof(msg->type)); + ret = CRYPT_CopyParam(pvData, pcbData, &msg->type, sizeof(msg->type)); break; case CMSG_HASH_ALGORITHM_PARAM: { @@ -1577,7 +1575,7 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, switch (dwParamType) { case CMSG_TYPE_PARAM: - ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->type, + ret = CRYPT_CopyParam(pvData, pcbData, &msg->type, sizeof(msg->type)); break; default:

1 0

Juan Lang : crypt32: A decoded message' s parameters are dependent on its type.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: fd1e88ae61aa347e45f32e0770536f46f5e93369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1e88ae61aa347e45f32e077… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:55:15 2007 -0700 crypt32: A decoded message's parameters are dependent on its type. --- dlls/crypt32/msg.c | 61 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 52 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index d932815..f6cddbb 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1239,7 +1239,9 @@ typedef struct _CDecodeMsg CryptMsgBase base; DWORD type; HCRYPTPROV crypt_prov; - HCRYPTHASH hash; + union { + HCRYPTHASH hash; + } u; CRYPT_DATA_BLOB msg_data; PCONTEXT_PROPERTY_LIST properties; } CDecodeMsg; @@ -1250,7 +1252,12 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) if (msg->base.open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) CryptReleaseContext(msg->crypt_prov, 0); - CryptDestroyHash(msg->hash); + switch (msg->type) + { + case CMSG_HASHED: + CryptDestroyHash(msg->u.hash); + break; + } CryptMemFree(msg->msg_data.pbData); ContextPropertyList_Free(msg->properties); } @@ -1479,10 +1486,9 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, return ret; } -static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, +static BOOL CDecodeHashMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { - CDecodeMsg *msg = (CDecodeMsg *)hCryptMsg; BOOL ret = FALSE; switch (dwParamType) @@ -1508,7 +1514,7 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, break; } case CMSG_COMPUTED_HASH_PARAM: - if (!msg->hash) + if (!msg->u.hash) { CRYPT_ALGORITHM_IDENTIFIER *hashAlgoID = NULL; DWORD size = 0; @@ -1520,7 +1526,7 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, hashAlgoID, &size); if (ret) algID = CertOIDToAlgId(hashAlgoID->pszObjId); - ret = CryptCreateHash(msg->crypt_prov, algID, 0, 0, &msg->hash); + ret = CryptCreateHash(msg->crypt_prov, algID, 0, 0, &msg->u.hash); if (ret) { CRYPT_DATA_BLOB content; @@ -1528,7 +1534,7 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, ret = ContextPropertyList_FindProperty(msg->properties, CMSG_CONTENT_PARAM, &content); if (ret) - ret = CryptHashData(msg->hash, content.pbData, + ret = CryptHashData(msg->u.hash, content.pbData, content.cbData, 0); } CryptMemFree(hashAlgoID); @@ -1536,7 +1542,8 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, else ret = TRUE; if (ret) - ret = CryptGetHashParam(msg->hash, HP_HASHVAL, pvData, pcbData, 0); + ret = CryptGetHashParam(msg->u.hash, HP_HASHVAL, pvData, pcbData, + 0); break; default: { @@ -1553,6 +1560,42 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, return ret; } +static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, + DWORD dwIndex, void *pvData, DWORD *pcbData) +{ + CDecodeMsg *msg = (CDecodeMsg *)hCryptMsg; + BOOL ret = FALSE; + + switch (msg->type) + { + case CMSG_HASHED: + ret = CDecodeHashMsg_GetParam(msg, dwParamType, dwIndex, pvData, + pcbData); + break; + default: + switch (dwParamType) + { + case CMSG_TYPE_PARAM: + ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->type, + sizeof(msg->type)); + break; + default: + { + CRYPT_DATA_BLOB blob; + + ret = ContextPropertyList_FindProperty(msg->properties, dwParamType, + &blob); + if (ret) + ret = CRYPT_CopyParam(pvData, pcbData, blob.pbData, + blob.cbData); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + } + } + return ret; +} + HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, DWORD dwMsgType, HCRYPTPROV hCryptProv, PCERT_INFO pRecipientInfo, PCMSG_STREAM_INFO pStreamInfo) @@ -1580,7 +1623,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, msg->crypt_prov = CRYPT_GetDefaultProvider(); msg->base.open_flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } - msg->hash = 0; + memset(&msg->u, 0, sizeof(msg->u)); msg->msg_data.cbData = 0; msg->msg_data.pbData = NULL; msg->properties = ContextPropertyList_Create();

1 0

Juan Lang : crypt32: Correct type of a decoded signed message.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 211a8d324f0cdf4e2be1678c5bf8e603be45a2d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211a8d324f0cdf4e2be1678c5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:55:44 2007 -0700 crypt32: Correct type of a decoded signed message. --- dlls/crypt32/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f6cddbb..ee116bd 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1422,7 +1422,7 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, break; case CMSG_SIGNED: if ((ret = CDecodeMsg_DecodeSignedContent(msg, blob))) - msg->type = CMSG_HASHED; + msg->type = CMSG_SIGNED; break; default: {

1 0

Stefan Dösinger : d3d8: Only test pixel shaders for refcounting if they are supported.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 630d602631b07a2e4942b27d6f7a55ca6e1f31b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630d602631b07a2e4942b27d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 15:33:37 2007 +0200 d3d8: Only test pixel shaders for refcounting if they are supported. --- dlls/d3d8/tests/device.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 84b5f29..bc9c804 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -292,6 +292,7 @@ static void test_refcount(void) IDirect3DSurface8 *pBackBuffer = NULL; DWORD dStateBlock = -1; IDirect3DSwapChain8 *pSwapChain = NULL; + D3DCAPS8 caps; D3DPRESENT_PARAMETERS d3dpp; D3DDISPLAYMODE d3ddm; @@ -326,6 +327,7 @@ static void test_refcount(void) trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); goto cleanup; } + IDirect3DDevice8_GetDeviceCaps(pDevice, &caps); refcount = get_refcount( (IUnknown *)pDevice ); ok(refcount == 1, "Invalid device RefCount %d\n", refcount); @@ -435,8 +437,11 @@ static void test_refcount(void) /* Shaders */ hr = IDirect3DDevice8_CreateVertexShader( pDevice, decl, simple_vs, &dVertexShader, 0 ); CHECK_CALL( hr, "CreateVertexShader", pDevice, refcount ); - hr = IDirect3DDevice8_CreatePixelShader( pDevice, simple_ps, &dPixelShader ); - CHECK_CALL( hr, "CreatePixelShader", pDevice, refcount ); + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 0)) + { + hr = IDirect3DDevice8_CreatePixelShader( pDevice, simple_ps, &dPixelShader ); + CHECK_CALL( hr, "CreatePixelShader", pDevice, refcount ); + } /* Textures */ hr = IDirect3DDevice8_CreateTexture( pDevice, 32, 32, 3, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pTexture ); CHECK_CALL( hr, "CreateTexture", pDevice, ++refcount );

1 0

Roderick Colenbrander : wgl: Fix a BadMatch error resulting from ignoring that iPixelFormat stars counting from 1 .
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 7d8c31075b09a3c0fcb483cabc3b22f5fdf87290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8c31075b09a3c0fcb483cab… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Jul 27 14:59:01 2007 +0200 wgl: Fix a BadMatch error resulting from ignoring that iPixelFormat stars counting from 1. --- dlls/winex11.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d6202e5..05f322e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -919,8 +919,8 @@ static BOOL init_formats(Display *display, int screen, Visual *visual) /* We have found an offscreen rendering format :) */ if(tmp_vis_id == 0) { - TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", tmp_fmt_id, WineGLPixelFormatListSize, i); - WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize; + TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", tmp_fmt_id, WineGLPixelFormatListSize+1, i); + WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; WineGLPixelFormatList[WineGLPixelFormatListSize].fmt_id = tmp_fmt_id; WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = TRUE;

1 0

Roderick Colenbrander : wgl: Fix another BadMatch error by giving a pbuffer its own GLXContext.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: ae9119f8d02745ccecebf538150e0973e11d6875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9119f8d02745ccecebf5381… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Jul 27 15:19:46 2007 +0200 wgl: Fix another BadMatch error by giving a pbuffer its own GLXContext. --- dlls/winex11.drv/opengl.c | 47 +++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 05f322e..db9eb44 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -81,26 +81,6 @@ typedef struct wine_glcontext { struct wine_glcontext *prev; } Wine_GLContext; -typedef struct wine_glpbuffer { - Drawable drawable; - Display* display; - int pixelFormat; - int width; - int height; - int* attribList; - HDC hdc; - - int use_render_texture; - GLuint texture_target; - GLuint texture_bind_target; - GLuint texture; - int texture_level; - HDC prev_hdc; - HGLRC prev_ctx; - HDC render_hdc; - HGLRC render_ctx; -} Wine_GLPBuffer; - typedef struct wine_glextension { const char *extName; struct { @@ -134,6 +114,22 @@ typedef struct wine_glpixelformat { BOOL offscreenOnly; } WineGLPixelFormat; +typedef struct wine_glpbuffer { + Drawable drawable; + Display* display; + WineGLPixelFormat* fmt; + int width; + int height; + int* attribList; + HDC hdc; + + int use_render_texture; + GLuint texture_target; + GLuint texture_bind_target; + GLuint texture; + int texture_level; +} Wine_GLPBuffer; + static Wine_GLContext *context_list; static struct WineGLInfo WineGLInfo = { 0 }; static int use_render_texture_emulation = 1; @@ -1984,7 +1980,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, object->display = gdi_display; object->width = iWidth; object->height = iHeight; - object->pixelFormat = iPixelFormat; + object->fmt = fmt; nAttribs = ConvertAttribWGLtoGLX(piAttribList, attribs, object); if (-1 == nAttribs) { @@ -2163,7 +2159,7 @@ HDC X11DRV_wglGetPbufferDCARB(X11DRV_PDEVICE *physDev, HPBUFFERARB hPbuffer) /* The function wglGetPbufferDCARB returns a DC to which the pbuffer can be connected. * All formats in our pixelformat list are compatible with each other and the main drawable. */ - physDev->current_pf = object->pixelFormat; + physDev->current_pf = object->fmt->iPixelFormat; physDev->drawable = object->drawable; SetRect( &physDev->drawable_rect, 0, 0, object->width, object->height ); physDev->dc_rect = physDev->drawable_rect; @@ -2648,6 +2644,7 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf static int init = 0; GLXContext prev_context = pglXGetCurrentContext(); Drawable prev_drawable = pglXGetCurrentDrawable(); + GLXContext tmp_context; /* Our render_texture emulation is basic and lacks some features (1D/Cube support). This is mostly due to lack of demos/games using them. Further the use of glReadPixels @@ -2664,14 +2661,18 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf return GL_FALSE; } + TRACE("drawable=%p, context=%p\n", (void*)object->drawable, prev_context); + tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, GLX_RGBA_TYPE, NULL, True); + /* Switch to our pbuffer and readback its contents */ - pglXMakeCurrent(gdi_display, object->drawable, prev_context); + pglXMakeCurrent(gdi_display, object->drawable, tmp_context); pglReadPixels(0, 0, object->width, object->height, GL_RGBA, GL_UNSIGNED_BYTE, buf); /* Switch back to the original drawable and upload the pbuffer-texture */ pglXMakeCurrent(object->display, prev_drawable, prev_context); pglTexImage2D(object->texture_target, 0, GL_RGBA8, object->width, object->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buf); + pglXDestroyContext(gdi_display, tmp_context); HeapFree(GetProcessHeap(), 0, buf); }

1 0

Roderick Colenbrander : wgl: Add WGL_NV_float_buffer and WGL_NV_texture_rectangle support.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 8873478e052fb186c252de1b6e9cb84d8c72fadd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8873478e052fb186c252de1b6… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Jul 27 15:01:52 2007 +0200 wgl: Add WGL_NV_float_buffer and WGL_NV_texture_rectangle support. --- dlls/winex11.drv/opengl.c | 76 ++++++++++++++++++++++++++++++++++++++++++--- include/wine/wgl.h | 40 +++++++++++++++++++++++ 2 files changed, 111 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index db9eb44..89238ef 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -759,9 +759,17 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf } } break ; - + case WGL_FLOAT_COMPONENTS_NV: + pop = iWGLAttr[++cur]; + PUSH2(oGLXAttr, GLX_FLOAT_COMPONENTS_NV, pop); + TRACE("pAttr[%d] = GLX_FLOAT_COMPONENTS_NV: %x\n", cur, pop); + break ; case WGL_BIND_TO_TEXTURE_RGB_ARB: case WGL_BIND_TO_TEXTURE_RGBA_ARB: + case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV: + case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV: + case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV: + case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV: pop = iWGLAttr[++cur]; /** cannot be converted, see direct handling on * - wglGetPixelFormatAttribivARB @@ -2023,7 +2031,22 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, case WGL_TEXTURE_RGBA_ARB: object->use_render_texture = GL_RGBA; break; + + /* WGL_FLOAT_COMPONENTS_NV */ + case WGL_TEXTURE_FLOAT_R_NV: + object->use_render_texture = GL_FLOAT_R_NV; + break; + case WGL_TEXTURE_FLOAT_RG_NV: + object->use_render_texture = GL_FLOAT_RG_NV; + break; + case WGL_TEXTURE_FLOAT_RGB_NV: + object->use_render_texture = GL_FLOAT_RGB_NV; + break; + case WGL_TEXTURE_FLOAT_RGBA_NV: + object->use_render_texture = GL_FLOAT_RGBA_NV; + break; default: + ERR("Unknown texture format: %x\n", attr_v); SetLastError(ERROR_INVALID_DATA); goto create_failed; } @@ -2080,7 +2103,13 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, object->texture_bind_target = GL_TEXTURE_2D; break; } + case WGL_TEXTURE_RECTANGLE_NV: { + object->texture_target = GL_TEXTURE_RECTANGLE_NV; + object->texture_bind_target = GL_TEXTURE_BINDING_RECTANGLE_NV; + break; + } default: + ERR("Unknown texture target: %x\n", attr_v); SetLastError(ERROR_INVALID_DATA); goto create_failed; } @@ -2212,10 +2241,28 @@ static GLboolean WINAPI X11DRV_wglQueryPbufferARB(HPBUFFERARB hPbuffer, int iAtt SetLastError(ERROR_INVALID_HANDLE); return GL_FALSE; } - if (GL_RGBA == object->use_render_texture) { - *piValue = WGL_TEXTURE_RGBA_ARB; - } else { - *piValue = WGL_TEXTURE_RGB_ARB; + switch(object->use_render_texture) { + case GL_RGB: + *piValue = WGL_TEXTURE_RGB_ARB; + break; + case GL_RGBA: + *piValue = WGL_TEXTURE_RGBA_ARB; + break; + /* WGL_FLOAT_COMPONENTS_NV */ + case GL_FLOAT_R_NV: + *piValue = WGL_TEXTURE_FLOAT_R_NV; + break; + case GL_FLOAT_RG_NV: + *piValue = WGL_TEXTURE_FLOAT_RG_NV; + break; + case GL_FLOAT_RGB_NV: + *piValue = WGL_TEXTURE_FLOAT_RGB_NV; + break; + case GL_FLOAT_RGBA_NV: + *piValue = WGL_TEXTURE_FLOAT_RGBA_NV; + break; + default: + ERR("Unknown texture format: %x\n", object->use_render_texture); } } } @@ -2245,6 +2292,7 @@ static GLboolean WINAPI X11DRV_wglQueryPbufferARB(HPBUFFERARB hPbuffer, int iAtt case GL_TEXTURE_1D: *piValue = WGL_TEXTURE_1D_ARB; break; case GL_TEXTURE_2D: *piValue = WGL_TEXTURE_2D_ARB; break; case GL_TEXTURE_CUBE_MAP: *piValue = WGL_TEXTURE_CUBE_MAP_ARB; break; + case GL_TEXTURE_RECTANGLE_NV: *piValue = WGL_TEXTURE_RECTANGLE_NV; break; } } } @@ -2792,6 +2840,14 @@ static BOOL glxRequireExtension(const char *requiredExtension) return TRUE; } +static void register_extension_string(const char *ext) +{ + strcat(WineGLInfo.wglExtensions, " "); + strcat(WineGLInfo.wglExtensions, ext); + + TRACE("'%s'\n", ext); +} + static BOOL register_extension(const WineGLExtension * ext) { int i; @@ -2944,8 +3000,18 @@ static void X11DRV_WineGL_LoadExtensions(void) if (glxRequireExtension("GLX_ATI_render_texture") || glxRequireExtension("GLX_ARB_render_texture") || (glxRequireVersion(3) && glxRequireExtension("GLX_SGIX_pbuffer") && use_render_texture_emulation)) + { register_extension(&WGL_ARB_render_texture); + /* The WGL version of GLX_NV_float_buffer requires render_texture */ + if(glxRequireExtension("GLX_NV_float_buffer")) + register_extension_string("WGL_NV_float_buffer"); + + /* Again there's no GLX equivalent for this extension, so depend on the required GL extension */ + if(strstr(WineGLInfo.glExtensions, "GL_NV_texture_rectangle") != NULL) + register_extension_string("WGL_NV_texture_rectangle"); + } + /* EXT Extensions */ register_extension(&WGL_EXT_extensions_string); diff --git a/include/wine/wgl.h b/include/wine/wgl.h index e191407..14dfa42 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -139,6 +139,44 @@ #define WGL_AUX8_ARB 0x208F #define WGL_AUX9_ARB 0x2090 +/** WGL_NV_render_texture_rectangle */ +#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1 +#define WGL_TEXTURE_RECTANGLE_NV 0x20A2 +/** WGL_NV_render_depth_texture */ +#define WGL_BIND_TO_TEXTURE_DEPTH_NV 0x20A3 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4 +#define WGL_DEPTH_TEXTURE_FORMAT_NV 0x20A5 +#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6 +#define WGL_DEPTH_COMPONENT_NV 0x20A7 +/** WGL_NV_float_buffer */ +#define WGL_FLOAT_COMPONENTS_NV 0x20B0 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4 +#define WGL_TEXTURE_FLOAT_R_NV 0x20B5 +#define WGL_TEXTURE_FLOAT_RG_NV 0x20B6 +#define WGL_TEXTURE_FLOAT_RGB_NV 0x20B7 +#define WGL_TEXTURE_FLOAT_RGBA_NV 0x20B8 +/** GL_NV_float_buffer */ +#define GL_FLOAT_R_NV 0x8880 +#define GL_FLOAT_RG_NV 0x8881 +#define GL_FLOAT_RGB_NV 0x8882 +#define GL_FLOAT_RGBA_NV 0x8883 +#define GL_FLOAT_R16_NV 0x8884 +#define GL_FLOAT_R32_NV 0x8885 +#define GL_FLOAT_RG16_NV 0x8886 +#define GL_FLOAT_RG32_NV 0x8887 +#define GL_FLOAT_RGB16_NV 0x8888 +#define GL_FLOAT_RGB32_NV 0x8889 +#define GL_FLOAT_RGBA16_NV 0x888A +#define GL_FLOAT_RGBA32_NV 0x888B +#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C +#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D +#define GL_FLOAT_RGBA_MODE_NV 0x888E + + /** * WGL_ATI_pixel_format_float / WGL_ARB_color_buffer_float */ @@ -189,3 +227,5 @@ #define GLX_AUX9_ATI 0x9820 #define GLX_BIND_TO_TEXTURE_LUMINANCE_ATI 0x9821 #define GLX_BIND_TO_TEXTURE_INTENSITY_ATI 0x9822 +/** GLX_NV_float_buffer */ +#define GLX_FLOAT_COMPONENTS_NV 0x20B0

1 0