December 2009 - Wine-Commits

Henri Verbeet : wined3d: Mark the draw buffer as dirty in context_create().
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: cd623036fc1b01517e789fe675675a9f94428dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd623036fc1b01517e789fe67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 15 17:51:37 2009 +0100 wined3d: Mark the draw buffer as dirty in context_create(). Currently callers of this function are responsible for setting the draw buffer correctly, but they don't do a very good job: - swapchain_init() sets the draw buffer to GL_BACK if there's a back buffer, even though the context's target is always the front buffer. - swapchain_create_context_for_thread() depends on (eventually) being called by FindContext(). - create_primary_opengl_context() and IWineD3DSwapChainImpl_SetDestWindowOverride() don't bother setting a draw buffer at all. Just marking the draw buffer dirty lets the context management sort it all out, and is much simpler. --- dlls/wined3d/context.c | 1 + dlls/wined3d/swapchain.c | 22 +--------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2f27997..30590af 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1349,6 +1349,7 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface ret->surface = (IWineD3DSurface *) target; ret->current_rt = (IWineD3DSurface *)target; ret->render_offscreen = surface_is_offscreen((IWineD3DSurface *) target); + ret->draw_buffer_dirty = TRUE; ret->tid = GetCurrentThreadId(); if(This->shader_backend->shader_dirtifyable_constants((IWineD3DDevice *) This)) { /* Create the dirty constants array and initialize them to dirty */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index fb902ea..7e6c71e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -809,6 +809,7 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface hr = WINED3DERR_NOTAVAILABLE; goto err; } + context_release(swapchain->context[0]); } else { @@ -841,30 +842,9 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface IWineD3DSurface_SetContainer(swapchain->backBuffer[i], (IWineD3DBase *)swapchain); ((IWineD3DSurfaceImpl *)swapchain->backBuffer[i])->Flags |= SFLAG_SWAPCHAIN; - - if (surface_type == SURFACE_OPENGL) - { - ENTER_GL(); - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer(GL_BACK)"); - LEAVE_GL(); - } - } - } - else - { - /* Single buffering - draw to front buffer */ - if (surface_type == SURFACE_OPENGL) - { - ENTER_GL(); - glDrawBuffer(GL_FRONT); - checkGLcall("glDrawBuffer(GL_FRONT)"); - LEAVE_GL(); } } - if (swapchain->context[0]) context_release(swapchain->context[0]); - /* Swapchains share the depth/stencil buffer, so only create a single depthstencil surface. */ if (present_parameters->EnableAutoDepthStencil && surface_type == SURFACE_OPENGL) {

1 0

Henri Verbeet : wined3d: Use surface_is_offscreen() in read_from_framebuffer_texture().
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: bf113bd284a8b4d83d58d2f2d39f8d7640c8c83d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf113bd284a8b4d83d58d2f2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 15 17:51:34 2009 +0100 wined3d: Use surface_is_offscreen() in read_from_framebuffer_texture(). --- dlls/wined3d/surface.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5a0da0e..00051ed 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1172,7 +1172,6 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, const RECT *rect, v static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) { IWineD3DDeviceImpl *device = This->resource.device; - IWineD3DSwapChainImpl *swapchain; struct wined3d_context *context; int bpp; GLenum format, internal, type; @@ -1197,18 +1196,18 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) * There is no need to keep track of the current read buffer or reset it, every part of the code * that reads sets the read buffer as desired. */ - if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)This, &IID_IWineD3DSwapChain, (void **)&swapchain))) + if (!surface_is_offscreen((IWineD3DSurface *)This)) { - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *) This, (IWineD3DSwapChain *)swapchain); + GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This, (IWineD3DSwapChain *)This->container); TRACE("Locking %#x buffer\n", buffer); ENTER_GL(); glReadBuffer(buffer); checkGLcall("glReadBuffer"); LEAVE_GL(); - - IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); - } else { + } + else + { /* Locking the primary render target which is not on a swapchain(=offscreen render target). * Read from the back buffer */

1 0

Nicolas Le Cam : winedbg: Fix Norwegian translation warning by adding UTF-8 pragma.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 7692d926e867594d7fd6ebf82a081808ec14e641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7692d926e867594d7fd6ebf82… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Dec 15 18:52:48 2009 +0100 winedbg: Fix Norwegian translation warning by adding UTF-8 pragma. --- programs/winedbg/rsrc_No.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc_No.rc b/programs/winedbg/rsrc_No.rc index 795aec3..2826801 100644 --- a/programs/winedbg/rsrc_No.rc +++ b/programs/winedbg/rsrc_No.rc @@ -20,6 +20,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDM_DEBUG_POPUP MENU

1 0

Henri Verbeet : wined3d: Use surface_is_offscreen() in fb_copy_to_texture_hwstretch().
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 51438eec461346f350ce3f67161faaa40b2e4f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51438eec461346f350ce3f671… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 15 17:51:33 2009 +0100 wined3d: Use surface_is_offscreen() in fb_copy_to_texture_hwstretch(). --- dlls/wined3d/surface.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1c5f012..5a0da0e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3210,13 +3210,15 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine GLenum drawBuffer = GL_BACK; GLenum texture_target; BOOL noBackBufferBackup; + BOOL src_offscreen; TRACE("Using hwstretch blit\n"); /* Activate the Proper context for reading from the source surface, set it up for blitting */ context = context_acquire(myDevice, SrcSurface, CTXUSAGE_BLIT); surface_internal_preload((IWineD3DSurface *) This, SRGB_RGB); - noBackBufferBackup = !swapchain && wined3d_settings.offscreen_rendering_mode == ORM_FBO; + src_offscreen = surface_is_offscreen(SrcSurface); + noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !Src->texture_name) { /* Get it a description */ @@ -3232,7 +3234,7 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine /* Got more than one aux buffer? Use the 2nd aux buffer */ drawBuffer = GL_AUX1; } - else if ((swapchain || myDevice->offscreenBuffer == GL_BACK) && context->aux_buffers >= 1) + else if ((!src_offscreen || myDevice->offscreenBuffer == GL_BACK) && context->aux_buffers >= 1) { /* Only one aux buffer, but it isn't used (Onscreen rendering, or non-aux orm)? Use it! */ drawBuffer = GL_AUX0; @@ -3258,7 +3260,8 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine Src->Flags &= ~SFLAG_INTEXTURE; } - if(surface_is_offscreen(SrcSurface)) { + if (src_offscreen) + { TRACE("Reading from an offscreen target\n"); upsidedown = !upsidedown; glReadBuffer(myDevice->offscreenBuffer);

1 0

Huw Davies : dbghelp: Fix compilation on OSX.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 34a961d3af02319e3707e1f692d157310f31049e URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a961d3af02319e3707e1f69… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 17:27:53 2009 +0000 dbghelp: Fix compilation on OSX. --- dlls/dbghelp/macho_module.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4210d1f..4cc220e 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -777,7 +777,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt sym = symt_find_nearest(module, ste->addr); if (sym) - symt_get_info(&sym->symt, TI_GET_ADDRESS, &addr); + symt_get_info(module, &sym->symt, TI_GET_ADDRESS, &addr); if (sym && ste->addr == addr) { ULONG64 size = 0; @@ -791,8 +791,8 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt * Also, we check that we don't have two symbols, one local, the other * global, which is legal. */ - symt_get_info(&sym->symt, TI_GET_LENGTH, &size); - symt_get_info(&sym->symt, TI_GET_DATAKIND, &kind); + symt_get_info(module, &sym->symt, TI_GET_LENGTH, &size); + symt_get_info(module, &sym->symt, TI_GET_DATAKIND, &kind); if (size && kind == (ste->is_global ? DataIsGlobal : DataIsFileStatic)) FIXME("Duplicate in %s: %s<%08lx> %s<%s-%s>\n", debugstr_w(module->module.ModuleName),

1 0

Juan Lang : wininet: Set error and fail if a secure connection' s certificate couldn't be verified.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 09246aa1a73f039bc6676a890781a06f351a3e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=09246aa1a73f039bc6676a890… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 14 16:02:33 2009 -0800 wininet: Set error and fail if a secure connection's certificate couldn't be verified. --- dlls/wininet/netconnection.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index f897570..db57e1d 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -116,6 +116,7 @@ static void *OpenSSL_crypto_handle; static SSL_METHOD *meth; static SSL_CTX *ctx; static int hostname_idx; +static int error_idx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -321,7 +322,7 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) if (err) { - INTERNET_SetLastError(err); + pSSL_set_ex_data(ssl, error_idx, (void *)err); ret = FALSE; } } @@ -445,6 +446,15 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) LeaveCriticalSection(&init_ssl_cs); return ERROR_OUTOFMEMORY; } + error_idx = pSSL_get_ex_new_index(0, (void *)"error index", + NULL, NULL, NULL); + if (error_idx == -1) + { + ERR("SSL_get_ex_new_index failed; %s\n", + pERR_error_string(pERR_get_error(), 0)); + LeaveCriticalSection(&init_ssl_cs); + return ERROR_OUTOFMEMORY; + } pSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, netconn_secure_verify); pCRYPTO_set_id_callback(ssl_thread_id); @@ -650,9 +660,10 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) if (pSSL_connect(connection->ssl_s) <= 0) { - ERR("SSL_connect failed: %s\n", - pERR_error_string(pERR_get_error(), 0)); - res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + res = (DWORD)pSSL_get_ex_data(connection->ssl_s, error_idx); + if (!res) + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + ERR("SSL_connect failed: %d\n", res); goto fail; } pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname);

1 0

Alexandre Julliard : user32: Move more 16-bit winproc functions inside the i386 ifdef.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 73c93466a24ef0757142a01eee713fff8757d3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73c93466a24ef0757142a01ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 20:09:04 2009 +0100 user32: Move more 16-bit winproc functions inside the i386 ifdef. --- dlls/user32/winproc.c | 367 ++++++++++++++++++++++++------------------------- 1 files changed, 181 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73c93466a24ef0757142a…

1 0

Juan Lang : wininet: Return error directly from netconn_verify_cert.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: bd5c5953f35ff9a164c93cfbfe77603b199a0b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5c5953f35ff9a164c93cfbf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 14 15:58:44 2009 -0800 wininet: Return error directly from netconn_verify_cert. --- dlls/wininet/netconnection.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 39ef464..f897570 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -210,7 +210,7 @@ static PCCERT_CONTEXT X509_to_cert_context(X509 *cert) return ret; } -static BOOL netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, +static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, WCHAR *server) { BOOL ret; @@ -218,7 +218,7 @@ static BOOL netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, PCCERT_CHAIN_CONTEXT chain; char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH; char *server_auth[] = { oid_server_auth }; - DWORD err; + DWORD err = ERROR_SUCCESS; TRACE("verifying %s\n", debugstr_w(server)); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; @@ -245,8 +245,6 @@ static BOOL netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, err = ERROR_INTERNET_SEC_INVALID_CERT; else err = ERROR_INTERNET_SEC_INVALID_CERT; - INTERNET_SetLastError(err); - ret = FALSE; } else { @@ -271,14 +269,12 @@ static BOOL netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, err = ERROR_INTERNET_SEC_CERT_CN_INVALID; else err = ERROR_INTERNET_SEC_INVALID_CERT; - INTERNET_SetLastError(err); - ret = FALSE; } } CertFreeCertificateChain(chain); } - TRACE("returning %d\n", ret); - return ret; + TRACE("returning %08x\n", err); + return err; } static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) @@ -320,7 +316,15 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) } if (!endCert) ret = FALSE; if (ret) - ret = netconn_verify_cert(endCert, store, server); + { + DWORD err = netconn_verify_cert(endCert, store, server); + + if (err) + { + INTERNET_SetLastError(err); + ret = FALSE; + } + } CertFreeCertificateContext(endCert); CertCloseStore(store, 0); }

1 0

Amine Khaldi : crypt32: Remove unneeded assignments.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: 483d2415599e0c0c039caed270a17fb68dcfe222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483d2415599e0c0c039caed27… Author: Amine Khaldi <amine48rz(a)gmail.com> Date: Tue Dec 15 17:23:10 2009 +0100 crypt32: Remove unneeded assignments. --- dlls/crypt32/cert.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index a247570..c25e612 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2854,7 +2854,7 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, { info.pwszContainerName = CryptMemAlloc(len * sizeof(WCHAR)); - len = MultiByteToWideChar(CP_ACP, 0, szContainer, -1, + MultiByteToWideChar(CP_ACP, 0, szContainer, -1, info.pwszContainerName, len); } } @@ -2878,7 +2878,7 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, { info.pwszProvName = CryptMemAlloc(len * sizeof(WCHAR)); - len = MultiByteToWideChar(CP_ACP, 0, szProvider, -1, + MultiByteToWideChar(CP_ACP, 0, szProvider, -1, info.pwszProvName, len); } } @@ -2898,7 +2898,7 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, pInfo = &info; } - ret = CertSetCertificateContextProperty(context, CERT_KEY_PROV_INFO_PROP_ID, + CertSetCertificateContextProperty(context, CERT_KEY_PROV_INFO_PROP_ID, 0, pInfo); if (pInfo == &info)

1 0

Alexandre Julliard : user32: Move the 16-bit message mapping functions to msg16.c.
by Alexandre Julliard Dec. 16, 2009

Dec. 16, 2009

Module: wine Branch: master Commit: fb97908119a62d9ce05ac7dd8d414dd0bcb9ef31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb97908119a62d9ce05ac7dd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 20:18:47 2009 +0100 user32: Move the 16-bit message mapping functions to msg16.c. --- dlls/user32/msg16.c | 1055 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/winproc.c | 1045 ------------------------------------------------ 2 files changed, 1055 insertions(+), 1045 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb97908119a62d9ce05ac…

1 0