November 2006 - Wine-commits

Roderick Colenbrander : opengl32: Use HKCU instead of HKLM.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 6c4267a1cfeea87b90b3f04791fe666a4745825d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4267a1cfeea87b90b3f0479… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Nov 4 22:28:41 2006 +0100 opengl32: Use HKCU instead of HKLM. --- dlls/opengl32/wgl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9baf3a3..9fa6ab1 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -641,7 +641,7 @@ static BOOL process_attach(void) wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); internal_gl_disabled_extensions[0] = 0; - if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\OpenGL", &hkey)) { + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\OpenGL", &hkey)) { if (!RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, (LPBYTE)internal_gl_disabled_extensions, &size)) { TRACE("found DisabledExtensions=\"%s\"\n", internal_gl_disabled_extensions); }

1 0

Mike McCormack : comctl32: Fix a regression.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 83149b1d2c566bd1c32da61f7c0af931363ab42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=83149b1d2c566bd1c32da61f7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 11:52:42 2006 +0900 comctl32: Fix a regression. --- dlls/comctl32/imagelist.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a9f829d..5113054 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2124,17 +2124,17 @@ ImageList_Remove (HIMAGELIST himl, INT i /* copy all images and masks prior to the "removed" image */ if (i > 0) { - POINT pt; + SIZE sz; TRACE("Pre image copy: Copy %d images\n", i); SelectObject (hdcBmp, hbmNewImage); - imagelist_point_from_index(himl, i, &pt); - BitBlt (hdcBmp, 0, 0, pt.x, pt.y, himl->hdcImage, 0, 0, SRCCOPY); + imagelist_get_bitmap_size( himl, i, himl->cy, &sz ); + BitBlt (hdcBmp, 0, 0, sz.cx, sz.cy, himl->hdcImage, 0, 0, SRCCOPY); if (himl->hbmMask) { SelectObject (hdcBmp, hbmNewMask); - BitBlt (hdcBmp, 0, 0, pt.x, pt.y, himl->hdcMask, 0, 0, SRCCOPY); + BitBlt (hdcBmp, 0, 0, sz.cx, sz.cy, himl->hdcMask, 0, 0, SRCCOPY); } }

1 0

Mike McCormack : comctl32: Create a helper function to copy a block of images.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 7370fc0e700740bdbf2add987fdfc3150c7b00c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7370fc0e700740bdbf2add987… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 14:04:50 2006 +0900 comctl32: Create a helper function to copy a block of images. --- dlls/comctl32/imagelist.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 5113054..58eac98 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -96,6 +96,18 @@ static inline void imagelist_get_bitmap_ sz->cy = cy; } +static inline void imagelist_copy_images( HIMAGELIST himl, HDC hdcSrc, HDC hdcDest, + UINT src, UINT count, UINT dest ) +{ + POINT ptSrc, ptDest; + SIZE sz; + + imagelist_point_from_index( himl, src, &ptSrc ); + imagelist_point_from_index( himl, dest, &ptDest ); + imagelist_get_bitmap_size( himl, count, himl->cy, &sz ); + BitBlt (hdcDest, ptSrc.x, ptSrc.y, sz.cx, sz.cy, hdcSrc, ptDest.x, ptDest.y, SRCCOPY); +} + /************************************************************************* * IMAGELIST_InternalExpandBitmaps [Internal] * @@ -2124,32 +2136,29 @@ ImageList_Remove (HIMAGELIST himl, INT i /* copy all images and masks prior to the "removed" image */ if (i > 0) { - SIZE sz; - TRACE("Pre image copy: Copy %d images\n", i); SelectObject (hdcBmp, hbmNewImage); - imagelist_get_bitmap_size( himl, i, himl->cy, &sz ); - BitBlt (hdcBmp, 0, 0, sz.cx, sz.cy, himl->hdcImage, 0, 0, SRCCOPY); + imagelist_copy_images( himl, himl->hdcImage, hdcBmp, 0, i, 0 ); if (himl->hbmMask) { SelectObject (hdcBmp, hbmNewMask); - BitBlt (hdcBmp, 0, 0, sz.cx, sz.cy, himl->hdcMask, 0, 0, SRCCOPY); + imagelist_copy_images( himl, himl->hdcMask, hdcBmp, 0, i, 0 ); } } /* copy all images and masks behind the removed image */ if (i < himl->cCurImage - 1) { TRACE("Post image copy!\n"); + SelectObject (hdcBmp, hbmNewImage); - BitBlt (hdcBmp, i * himl->cx, 0, (himl->cCurImage - i - 1) * himl->cx, - himl->cy, himl->hdcImage, (i + 1) * himl->cx, 0, SRCCOPY); + imagelist_copy_images( himl, himl->hdcImage, hdcBmp, i, + (himl->cCurImage - i - 1), i + 1 ); if (himl->hbmMask) { SelectObject (hdcBmp, hbmNewMask); - BitBlt (hdcBmp, i * himl->cx, 0, - (himl->cCurImage - i - 1) * himl->cx, - himl->cy, himl->hdcMask, (i + 1) * himl->cx, 0, SRCCOPY); + imagelist_copy_images( himl, himl->hdcMask, hdcBmp, i, + (himl->cCurImage - i - 1), i + 1 ); } }

1 0

Alexandre Julliard : kernel32/tests: Don' t wait for overlapped result if the previous test failed.
by Alexandre Julliard 04 Nov '06

04 Nov '06

Module: wine Branch: master Commit: 1f50b7f7eb291e7af76843e37ab6efb75f49db9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f50b7f7eb291e7af76843e37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 4 12:07:10 2006 +0100 kernel32/tests: Don't wait for overlapped result if the previous test failed. --- dlls/kernel32/tests/change.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 04bbbc4..bf7cdc1 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -457,9 +457,12 @@ static void test_readdirectorychanges(vo ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); - r = GetOverlappedResult( hdir, &ov, &dwCount, TRUE ); - ok( r == TRUE, "getoverlappedresult failed\n"); - ok( dwCount == 0x12, "count wrong\n"); + if (ov.Internal == STATUS_SUCCESS) + { + r = GetOverlappedResult( hdir, &ov, &dwCount, TRUE ); + ok( r == TRUE, "getoverlappedresult failed\n"); + ok( dwCount == 0x12, "count wrong\n"); + } pfni = (PFILE_NOTIFY_INFORMATION) buffer; ok( pfni->NextEntryOffset == 0, "offset wrong\n" );

1 0

Alexandre Julliard : preloader: Clear %gs again before calling the interpreter entry point.
by Alexandre Julliard 04 Nov '06

04 Nov '06

Module: wine Branch: master Commit: 4c4094e86e663b0d7fbbe0e57eca1221e6734006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4094e86e663b0d7fbbe0e57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 4 20:25:06 2006 +0100 preloader: Clear %gs again before calling the interpreter entry point. --- loader/preloader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index bd303da..381b8e4 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -213,6 +213,7 @@ __ASM_GLOBAL_FUNC(_start, "\txor %eax,%eax\n" "\txor %ecx,%ecx\n" "\txor %edx,%edx\n" + "\tmov %ax,%gs\n" /* clear %gs again */ "\tret\n") /* wrappers for Linux system calls */

1 0

Kai Blin : secur32: Avoid double HeapFree() of password and session key.
by Alexandre Julliard 04 Nov '06

04 Nov '06

Module: wine Branch: master Commit: 0c3f45eda0341ab03eb6cebb8e9a3e8813c90b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c3f45eda0341ab03eb6cebb8… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Nov 4 02:50:31 2006 +0100 secur32: Avoid double HeapFree() of password and session key. --- dlls/secur32/dispatcher.c | 1 - dlls/secur32/ntlm.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 7b5d6af..b7b9f9d 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -257,7 +257,6 @@ void cleanup_helper(PNegoHelper helper) if( (helper == NULL) || (helper->helper_pid == 0)) return; - HeapFree(GetProcessHeap(), 0, helper->password); HeapFree(GetProcessHeap(), 0, helper->com_buf); HeapFree(GetProcessHeap(), 0, helper->session_key); diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 6c340d2..8f124d7 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1373,7 +1373,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Fr PNegoHelper helper = (PNegoHelper) phCredential->dwLower; phCredential->dwUpper = 0; phCredential->dwLower = 0; - HeapFree(GetProcessHeap(), 0, helper->session_key); cleanup_helper(helper); ret = SEC_E_OK; }

1 0

Kai Blin : secur32: Get rid of some HeapAlloc() calls to make code more readable.
by Alexandre Julliard 04 Nov '06

04 Nov '06

Module: wine Branch: master Commit: e1bfe4c18a403c7b2834f2be89ff8dbfc07368a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1bfe4c18a403c7b2834f2be8… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Nov 4 02:51:38 2006 +0100 secur32: Get rid of some HeapAlloc() calls to make code more readable. --- dlls/secur32/tests/ntlm.c | 78 +++++++++++++++------------------------------ 1 files changed, 26 insertions(+), 52 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 8d18d70..b189685 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -673,8 +673,8 @@ static void testSignSeal() SspiData client, server; SEC_WINNT_AUTH_IDENTITY id; static char sec_pkg_name[] = "NTLM"; - PSecBufferDesc crypt = NULL; - PSecBuffer data = NULL, fake_data = NULL; + SecBufferDesc crypt; + SecBuffer data[2], fake_data[2]; ULONG qop = 0; SecPkgContext_Sizes ctxt_sizes; @@ -731,22 +731,10 @@ static void testSignSeal() goto end; } - if((crypt = HeapAlloc(GetProcessHeap(), 0, sizeof(SecBufferDesc))) == NULL) - { - trace("Failed to allocate the crypto buffer, aborting test.\n"); - goto end; - } + crypt.ulVersion = SECBUFFER_VERSION; + crypt.cBuffers = 2; - crypt->ulVersion = SECBUFFER_VERSION; - crypt->cBuffers = 2; - - if((fake_data = HeapAlloc(GetProcessHeap(), 0, sizeof(SecBuffer) * 2)) == NULL) - { - trace("Failed to allocate the fake crypto buffer, aborting test.\n"); - goto end; - } - - crypt->pBuffers = fake_data; + crypt.pBuffers = fake_data; fake_data[0].BufferType = SECBUFFER_DATA; fake_data[0].cbBuffer = ctxt_sizes.cbSecurityTrailer; @@ -756,19 +744,12 @@ static void testSignSeal() fake_data[1].cbBuffer = lstrlen(message); fake_data[1].pvBuffer = HeapAlloc(GetProcessHeap(), 0, fake_data[1].cbBuffer); - sec_status = pMakeSignature(client.ctxt, 0, crypt, 0); - ok(sec_status == SEC_E_INVALID_TOKEN, + sec_status = pMakeSignature(client.ctxt, 0, &crypt, 0); + ok(sec_status == SEC_E_INVALID_TOKEN, "MakeSignature returned %s, not SEC_E_INVALID_TOKEN.\n", getSecError(sec_status)); - - if((data = HeapAlloc(GetProcessHeap(), 0, sizeof(SecBuffer) * 2)) == NULL) - { - trace("Failed to allocate the crypto buffer, aborting test.\n"); - goto end; - } - - crypt->pBuffers = data; + crypt.pBuffers = data; data[0].BufferType = SECBUFFER_TOKEN; data[0].cbBuffer = ctxt_sizes.cbSecurityTrailer; @@ -783,47 +764,47 @@ static void testSignSeal() * we should get the same signature for our data, no matter if * it is sent by the client or the server */ - sec_status = pMakeSignature(client.ctxt, 0, crypt, 0); + sec_status = pMakeSignature(client.ctxt, 0, &crypt, 0); ok(sec_status == SEC_E_OK, "MakeSignature returned %s, not SEC_E_OK.\n", getSecError(sec_status)); - ok(!memcmp(crypt->pBuffers[0].pvBuffer, message_signature, - crypt->pBuffers[0].cbBuffer), "Signature is not as expected.\n"); + ok(!memcmp(crypt.pBuffers[0].pvBuffer, message_signature, + crypt.pBuffers[0].cbBuffer), "Signature is not as expected.\n"); data[0].cbBuffer = sizeof(message_signature); memcpy(data[0].pvBuffer, crypt_trailer_client, data[0].cbBuffer); - sec_status = pVerifySignature(client.ctxt, crypt, 0, &qop); + sec_status = pVerifySignature(client.ctxt, &crypt, 0, &qop); ok(sec_status == SEC_E_MESSAGE_ALTERED, "VerifySignature returned %s, not SEC_E_MESSAGE_ALTERED.\n", getSecError(sec_status)); memcpy(data[0].pvBuffer, message_signature, data[0].cbBuffer); - sec_status = pVerifySignature(client.ctxt, crypt, 0, &qop); + sec_status = pVerifySignature(client.ctxt, &crypt, 0, &qop); ok(sec_status == SEC_E_OK, "VerifySignature returned %s, not SEC_E_OK.\n", getSecError(sec_status)); - sec_status = pEncryptMessage(client.ctxt, 0, crypt, 0); + sec_status = pEncryptMessage(client.ctxt, 0, &crypt, 0); ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); - ok(!memcmp(crypt->pBuffers[0].pvBuffer, crypt_trailer_client, - crypt->pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); - ok(!memcmp(crypt->pBuffers[1].pvBuffer, crypt_message_client, - crypt->pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); + ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, + crypt.pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); + ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); data[0].cbBuffer = sizeof(crypt_trailer_server); data[1].cbBuffer = sizeof(crypt_message_server); memcpy(data[0].pvBuffer, crypt_trailer_server, data[0].cbBuffer); memcpy(data[1].pvBuffer, crypt_message_server, data[1].cbBuffer); - sec_status = pDecryptMessage(client.ctxt, crypt, 0, &qop); + sec_status = pDecryptMessage(client.ctxt, &crypt, 0, &qop); ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); - ok(!memcmp(crypt->pBuffers[1].pvBuffer, message_binary, - crypt->pBuffers[1].cbBuffer), + ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary, + crypt.pBuffers[1].cbBuffer), "Failed to decrypt message correctly.\n"); end: @@ -832,18 +813,11 @@ end: pDeleteSecurityContext(client.ctxt); pFreeCredentialsHandle(client.cred); - if(fake_data) - { - HeapFree(GetProcessHeap(), 0, fake_data[0].pvBuffer); - HeapFree(GetProcessHeap(), 0, fake_data[1].pvBuffer); - } - if(data) - { - HeapFree(GetProcessHeap(), 0, data[0].pvBuffer); - HeapFree(GetProcessHeap(), 0, data[1].pvBuffer); - } - HeapFree(GetProcessHeap(), 0, data); - HeapFree(GetProcessHeap(), 0, crypt); + + HeapFree(GetProcessHeap(), 0, fake_data[0].pvBuffer); + HeapFree(GetProcessHeap(), 0, fake_data[1].pvBuffer); + HeapFree(GetProcessHeap(), 0, data[0].pvBuffer); + HeapFree(GetProcessHeap(), 0, data[1].pvBuffer); } else {

1 0

Kai Blin : secur32: Fix handling of buffers that don' t have the SECBUFFER_TOKEN as the first buffer.
by Alexandre Julliard 04 Nov '06

04 Nov '06

Module: wine Branch: master Commit: cd8332ae1cf471376f3fb9fef6dd54362afd3059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8332ae1cf471376f3fb9fef… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Nov 4 02:52:18 2006 +0100 secur32: Fix handling of buffers that don't have the SECBUFFER_TOKEN as the first buffer. Thanks to Robert Shearman for catching this one and providing some of the test code. --- dlls/secur32/ntlm.c | 118 +++++++++++++++++++++++++++++++++---------- dlls/secur32/secur32_priv.h | 2 +- dlls/secur32/tests/ntlm.c | 51 ++++++++++++++++++- dlls/secur32/util.c | 4 +- 4 files changed, 144 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd8332ae1cf471376f3fb…

1 0

Stefan Dösinger : d3d9/tests: Add refcount test for binding objects.
by Alexandre Julliard 04 Nov '06

04 Nov '06

Module: wine Branch: master Commit: 9b74d7621428304c0b258c619409c0e0756f97d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b74d7621428304c0b258c619… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 3 19:38:46 2006 +0100 d3d9/tests: Add refcount test for binding objects. --- dlls/d3d9/tests/device.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index be1dba2..2ed0926 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -315,8 +315,27 @@ static void test_refcount(void) /* Buffers */ hr = IDirect3DDevice9_CreateIndexBuffer( pDevice, 16, 0, D3DFMT_INDEX32, D3DPOOL_DEFAULT, &pIndexBuffer, NULL ); CHECK_CALL( hr, "CreateIndexBuffer", pDevice, ++refcount ); + if(pIndexBuffer) + { + tmp = get_refcount( (IUnknown *)pIndexBuffer ); + + hr = IDirect3DDevice9_SetIndices(pDevice, pIndexBuffer); + CHECK_CALL( hr, "SetIndices", pIndexBuffer, tmp); + hr = IDirect3DDevice9_SetIndices(pDevice, NULL); + CHECK_CALL( hr, "SetIndices", pIndexBuffer, tmp); + } + hr = IDirect3DDevice9_CreateVertexBuffer( pDevice, 16, 0, D3DFVF_XYZ, D3DPOOL_DEFAULT, &pVertexBuffer, NULL ); CHECK_CALL( hr, "CreateVertexBuffer", pDevice, ++refcount ); + if(pVertexBuffer) + { + tmp = get_refcount( (IUnknown *)pVertexBuffer ); + + hr = IDirect3DDevice9_SetStreamSource(pDevice, 0, pVertexBuffer, 0, 3 * sizeof(float)); + CHECK_CALL( hr, "SetStreamSource", pVertexBuffer, tmp); + hr = IDirect3DDevice9_SetStreamSource(pDevice, 0, NULL, 0, 0); + CHECK_CALL( hr, "SetStreamSource", pVertexBuffer, tmp); + } /* Shaders */ hr = IDirect3DDevice9_CreateVertexDeclaration( pDevice, decl, &pVertexDeclaration ); CHECK_CALL( hr, "CreateVertexDeclaration", pDevice, ++refcount ); @@ -330,6 +349,13 @@ static void test_refcount(void) if (pTexture) { tmp = get_refcount( (IUnknown *)pTexture ); + + /* SetTexture should not increase refcounts */ + hr = IDirect3DDevice9_SetTexture(pDevice, 0, (IDirect3DBaseTexture9 *) pTexture); + CHECK_CALL( hr, "SetTexture", pTexture, tmp); + hr = IDirect3DDevice9_SetTexture(pDevice, 0, NULL); + CHECK_CALL( hr, "SetTexture", pTexture, tmp); + /* This should not increment device refcount */ hr = IDirect3DTexture9_GetSurfaceLevel( pTexture, 1, &pTextureLevel ); CHECK_CALL( hr, "GetSurfaceLevel", pDevice, refcount );

1 0

Roderick Colenbrander : opengl32: Remove glx context.
by Alexandre Julliard 04 Nov '06

04 Nov '06

Module: wine Branch: master Commit: 1ef0d0a61a3759041e949ebf9bbae143f3ddd714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef0d0a61a3759041e949ebf9… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Nov 3 21:55:36 2006 +0100 opengl32: Remove glx context. --- dlls/opengl32/wgl.c | 62 +-------------------------------------------------- 1 files changed, 1 insertions(+), 61 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 72100a4..9baf3a3 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -74,9 +74,6 @@ enum x11drv_escape_codes void (*wine_tsx11_lock_ptr)(void) = NULL; void (*wine_tsx11_unlock_ptr)(void) = NULL; -static GLXContext default_cx = NULL; -static Display *default_display; /* display to use for default context */ - static HMODULE opengl32_handle; static char internal_gl_disabled_extensions[512]; @@ -107,17 +104,6 @@ void enter_gl(void) return; } -/* retrieve the X display to use on a given DC */ -inline static Display *get_display( HDC hdc ) -{ - Display *display; - enum x11drv_escape_codes escape = X11DRV_GET_DISPLAY; - - if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, - sizeof(display), (LPSTR)&display )) display = NULL; - return display; -} - /*********************************************************************** * wglCreateLayerContext (OPENGL32.@) */ @@ -635,19 +621,12 @@ #endif creating a rendering context.... */ static BOOL process_attach(void) { - XWindowAttributes win_attr; - Visual *rootVisual; - int num; - XVisualInfo template; - HDC hdc; - XVisualInfo *vis = NULL; - Window root = (Window)GetPropA( GetDesktopWindow(), "__wine_x11_whole_window" ); HMODULE mod = GetModuleHandleA( "winex11.drv" ); HMODULE mod_gdi32 = GetModuleHandleA( "gdi32.dll" ); DWORD size = sizeof(internal_gl_disabled_extensions); HKEY hkey = 0; - if (!root || !mod || !mod_gdi32) + if (!mod || !mod_gdi32) { ERR("X11DRV or GDI32 not loaded. Cannot create default context.\n"); return FALSE; @@ -661,40 +640,6 @@ static BOOL process_attach(void) /* Interal WGL function */ wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); - hdc = GetDC(0); - default_display = get_display( hdc ); - ReleaseDC( 0, hdc ); - if (!default_display) - { - ERR("X11DRV not loaded. Cannot get display for screen DC.\n"); - return FALSE; - } - - ENTER_GL(); - - /* Try to get the visual from the Root Window. We can't use the standard (presumably - double buffered) X11DRV visual with the Root Window, since we don't know if the Root - Window was created using the standard X11DRV visual, and glXMakeCurrent can't deal - with mismatched visuals. Note that the Root Window visual may not be double - buffered, so apps actually attempting to render this way may flicker */ - if (XGetWindowAttributes( default_display, root, &win_attr )) - { - rootVisual = win_attr.visual; - } - else - { - /* Get the default visual, since we can't seem to get the attributes from the - Root Window. Let's hope that the Root Window Visual matches the DefaultVisual */ - rootVisual = DefaultVisual( default_display, DefaultScreen(default_display) ); - } - - template.visualid = XVisualIDFromVisual(rootVisual); - vis = XGetVisualInfo(default_display, VisualIDMask, &template, &num); - if (vis != NULL) default_cx = glXCreateContext(default_display, vis, 0, GL_TRUE); - if (default_cx != NULL) glXMakeCurrent(default_display, root, default_cx); - XFree(vis); - LEAVE_GL(); - internal_gl_disabled_extensions[0] = 0; if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\OpenGL", &hkey)) { if (!RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, (LPBYTE)internal_gl_disabled_extensions, &size)) { @@ -703,9 +648,6 @@ static BOOL process_attach(void) RegCloseKey(hkey); } - if (default_cx == NULL) { - ERR("Could not create default context.\n"); - } return TRUE; } @@ -714,8 +656,6 @@ static BOOL process_attach(void) static void process_detach(void) { - glXDestroyContext(default_display, default_cx); - HeapFree(GetProcessHeap(), 0, internal_gl_extensions); }

1 0