April 2011 - Wine-Commits - list.winehq.org

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DTexture9 iface.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 31bea55ef4ca0f283de31357b0674c6f6baee9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31bea55ef4ca0f283de31357b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 20 10:58:44 2011 +0200 d3d9: COM cleanup for the IDirect3DTexture9 iface. --- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 2 +- dlls/d3d9/texture.c | 112 ++++++++++++++++++++++++++++------------------ 3 files changed, 72 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31bea55ef4ca0f283de31…

1 0

André Hentschel : winedbg: Fix PC adjustment for ARM.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 894f892b9356ba4295d86914d1e81e36da5bdc6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=894f892b9356ba4295d86914d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 19 21:55:00 2011 +0200 winedbg: Fix PC adjustment for ARM. --- programs/winedbg/be_arm.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 8f07251..732b581 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -3,7 +3,7 @@ * * Copyright 2000-2003 Marcus Meissner * 2004 Eric Pouech - * 2010 André Hentschel + * 2010, 2011 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -164,11 +164,11 @@ static int be_arm_adjust_pc_for_break(CONTEXT* ctx, BOOL way) { if (way) { - ctx->Pc--; - return -1; + ctx->Pc-=4; + return -4; } - ctx->Pc++; - return 1; + ctx->Pc+=4; + return 4; } static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size,

1 0

Matteo Bruni : wined3d: Fallback to our private window when context activation fails otherwise.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: a3c12c5be426ac9ac19b7760eeeec1f2c1dbe551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c12c5be426ac9ac19b7760e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 12 22:27:54 2011 +0200 wined3d: Fallback to our private window when context activation fails otherwise. --- dlls/wined3d/context.c | 51 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/swapchain.c | 8 ++++++ dlls/wined3d/wined3d_private.h | 3 ++ 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 544d662..18c9438 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -795,15 +795,62 @@ static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC static BOOL context_set_gl_context(struct wined3d_context *ctx) { + struct wined3d_swapchain *swapchain = ctx->swapchain; + if (!pwglMakeCurrent(ctx->hdc, ctx->glCtx)) { WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", ctx->glCtx, ctx->hdc, GetLastError()); ctx->valid = 0; - context_set_current(NULL); - return FALSE; + WARN("Trying fallback to the backup window.\n"); + + if (!swapchain->backup_dc) + { + TRACE("Creating the backup window for swapchain %p.\n", swapchain); + swapchain->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", + WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); + if (!swapchain->backup_wnd) + { + ERR("Failed to create a window.\n"); + goto fail; + } + swapchain->backup_dc = GetDC(swapchain->backup_wnd); + if (!swapchain->backup_dc) + { + ERR("Failed to get a DC.\n"); + goto fail; + } + if (!context_set_pixel_format(ctx->gl_info, swapchain->backup_dc, ctx->pixel_format)) + { + ERR("Failed to set pixel format %d on device context %p.\n", + ctx->pixel_format, swapchain->backup_dc); + goto fail; + } + } + + if (!pwglMakeCurrent(swapchain->backup_dc, ctx->glCtx)) + { + ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", + swapchain->backup_dc, GetLastError()); + context_set_current(NULL); + return FALSE; + } } return TRUE; + +fail: + if (swapchain->backup_dc) + { + ReleaseDC(swapchain->backup_wnd, swapchain->backup_dc); + swapchain->backup_dc = NULL; + } + if (swapchain->backup_wnd) + { + DestroyWindow(swapchain->backup_wnd); + swapchain->backup_wnd = NULL; + } + context_set_current(NULL); + return FALSE; } static void context_restore_gl_context(HDC dc, HGLRC gl_ctx) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 21d518f..275084b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -80,6 +80,14 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) mode.Format = swapchain->orig_fmt; IWineD3DDevice_SetDisplayMode((IWineD3DDevice *)swapchain->device, 0, &mode); } + + if (swapchain->backup_dc) + { + TRACE("Destroying backup wined3d window %p, dc %p.\n", swapchain->backup_wnd, swapchain->backup_dc); + + ReleaseDC(swapchain->backup_wnd, swapchain->backup_dc); + DestroyWindow(swapchain->backup_wnd); + } } ULONG CDECL wined3d_swapchain_incref(struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8c90464..1b1fcec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2543,6 +2543,9 @@ struct wined3d_swapchain HWND win_handle; HWND device_window; + + HDC backup_dc; + HWND backup_wnd; }; void x11_copy_to_screen(struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN;

1 0

Gerald Pfeifer : winecfg: Fix use of uninitialized variable in some cases.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: cf5435656f809fa348e086a2732c7e2f8d4edf85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5435656f809fa348e086a27… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Apr 20 01:27:51 2011 +0200 winecfg: Fix use of uninitialized variable in some cases. --- programs/winecfg/appdefaults.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 8f431c2..f90607e 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -75,7 +75,7 @@ static const char szKeyProdNT[] = "System\\CurrentControlSet\\Control\\ProductOp static int get_registry_version(void) { int i, best = -1, platform, major, minor = 0, build = 0; - char *p, *ver, *type; + char *p, *ver, *type = NULL; if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL ))) {

1 0

Rico Schüller : d3dx9: Fix ID3DXEffect*:: GetVectorArray() forward.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 8afc8dc0c70da2a0d162b1d054782c370ef3c52a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afc8dc0c70da2a0d162b1d05… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 20 07:58:22 2011 +0200 d3dx9: Fix ID3DXEffect*::GetVectorArray() forward. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index fefb3b4..ce2ed82 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1479,7 +1479,7 @@ static HRESULT WINAPI ID3DXEffectImpl_GetVectorArray(ID3DXEffect *iface, D3DXHAN TRACE("Forward iface %p, base %p\n", This, base); - return ID3DXBaseEffectImpl_SetVectorArray(base, parameter, vector, count); + return ID3DXBaseEffectImpl_GetVectorArray(base, parameter, vector, count); } static HRESULT WINAPI ID3DXEffectImpl_SetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix) @@ -2382,7 +2382,7 @@ static HRESULT WINAPI ID3DXEffectCompilerImpl_GetVectorArray(ID3DXEffectCompiler TRACE("Forward iface %p, base %p\n", This, base); - return ID3DXBaseEffectImpl_SetVectorArray(base, parameter, vector, count); + return ID3DXBaseEffectImpl_GetVectorArray(base, parameter, vector, count); } static HRESULT WINAPI ID3DXEffectCompilerImpl_SetMatrix(ID3DXEffectCompiler *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix)

1 0

Dmitry Timoshkov : winex11.drv: Use dialog window type again for owned popup windows.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: fd043c56443430ee993c7d7281845b9b726b48d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd043c56443430ee993c7d728… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 20 01:16:25 2011 +0900 winex11.drv: Use dialog window type again for owned popup windows. --- dlls/winex11.drv/window.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 15ee1c2..acbafde 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1173,7 +1173,13 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) /* size hints */ set_size_hints( display, data, style ); - window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + /* Only use dialog type for owned popups. Metacity allows making fullscreen + * only normal windows, and doesn't handle correctly TRANSIENT_FOR hint for + * dialogs owned by fullscreen windows. + */ + if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); + else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1);

1 0

Dylan Smith : include: Add d3dx9mesh.h X template extensions.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 8f33a4d32d8383f9616297f973f3a5e7539688e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f33a4d32d8383f9616297f97… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Apr 19 13:59:46 2011 -0400 include: Add d3dx9mesh.h X template extensions. --- include/d3dx9mesh.h | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 166 insertions(+), 0 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 4c45528..b4fad7d 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -788,4 +788,170 @@ DEFINE_GUID(DXFILEOBJ_EffectInstance, 0xe331f7e4, 0x0559, 0x4cc2, 0x8e DEFINE_GUID(DXFILEOBJ_AnimTicksPerSecond, 0x9e415a43, 0x7ba6, 0x4a73, 0x87, 0x43, 0xb7, 0x3d, 0x47, 0xe8, 0x84, 0x76); DEFINE_GUID(DXFILEOBJ_CompressedAnimationSet, 0x7f9b00b3, 0xf125, 0x4890, 0x87, 0x6e, 0x1c, 0x42, 0xbf, 0x69, 0x7c, 0x4d); +#define XSKINEXP_TEMPLATES \ + "xof 0303txt 0032\ + template XSkinMeshHeader \ + { \ + <3CF169CE-FF7C-44ab-93C0-F78F62D172E2> \ + WORD nMaxSkinWeightsPerVertex; \ + WORD nMaxSkinWeightsPerFace; \ + WORD nBones; \ + } \ + template VertexDuplicationIndices \ + { \ + <B8D65549-D7C9-4995-89CF-53A9A8B031E3> \ + DWORD nIndices; \ + DWORD nOriginalVertices; \ + array DWORD indices[nIndices]; \ + } \ + template FaceAdjacency \ + { \ + <A64C844A-E282-4756-8B80-250CDE04398C> \ + DWORD nIndices; \ + array DWORD indices[nIndices]; \ + } \ + template SkinWeights \ + { \ + <6F0D123B-BAD2-4167-A0D0-80224F25FABB> \ + STRING transformNodeName; \ + DWORD nWeights; \ + array DWORD vertexIndices[nWeights]; \ + array float weights[nWeights]; \ + Matrix4x4 matrixOffset; \ + } \ + template Patch \ + { \ + <A3EB5D44-FC22-429D-9AFB-3221CB9719A6> \ + DWORD nControlIndices; \ + array DWORD controlIndices[nControlIndices]; \ + } \ + template PatchMesh \ + { \ + <D02C95CC-EDBA-4305-9B5D-1820D7704BBF> \ + DWORD nVertices; \ + array Vector vertices[nVertices]; \ + DWORD nPatches; \ + array Patch patches[nPatches]; \ + [ ... ] \ + } \ + template PatchMesh9 \ + { \ + <B9EC94E1-B9A6-4251-BA18-94893F02C0EA> \ + DWORD Type; \ + DWORD Degree; \ + DWORD Basis; \ + DWORD nVertices; \ + array Vector vertices[nVertices]; \ + DWORD nPatches; \ + array Patch patches[nPatches]; \ + [ ... ] \ + } template EffectFloats \ + { \ + <F1CFE2B3-0DE3-4e28-AFA1-155A750A282D> \ + DWORD nFloats; \ + array float Floats[nFloats]; \ + } \ + template EffectString \ + { \ + <D55B097E-BDB6-4c52-B03D-6051C89D0E42> \ + STRING Value; \ + } \ + template EffectDWord \ + { \ + <622C0ED0-956E-4da9-908A-2AF94F3CE716> \ + DWORD Value; \ + } template EffectParamFloats \ + { \ + <3014B9A0-62F5-478c-9B86-E4AC9F4E418B> \ + STRING ParamName; \ + DWORD nFloats; \ + array float Floats[nFloats]; \ + } template EffectParamString \ + { \ + <1DBC4C88-94C1-46ee-9076-2C28818C9481> \ + STRING ParamName; \ + STRING Value; \ + } \ + template EffectParamDWord \ + { \ + <E13963BC-AE51-4c5d-B00F-CFA3A9D97CE5> \ + STRING ParamName; \ + DWORD Value; \ + } \ + template EffectInstance \ + { \ + <E331F7E4-0559-4cc2-8E99-1CEC1657928F> \ + STRING EffectFilename; \ + [ ... ] \ + } template AnimTicksPerSecond \ + { \ + <9E415A43-7BA6-4a73-8743-B73D47E88476> \ + DWORD AnimTicksPerSecond; \ + } \ + template CompressedAnimationSet \ + { \ + <7F9B00B3-F125-4890-876E-1C42BF697C4D> \ + DWORD CompressedBlockSize; \ + FLOAT TicksPerSec; \ + DWORD PlaybackType; \ + DWORD BufferLength; \ + array DWORD CompressedData[BufferLength]; \ + } " + +#define XEXTENSIONS_TEMPLATES \ + "xof 0303txt 0032\ + template FVFData \ + { \ + <B6E70A0E-8EF9-4e83-94AD-ECC8B0C04897> \ + DWORD dwFVF; \ + DWORD nDWords; \ + array DWORD data[nDWords]; \ + } \ + template VertexElement \ + { \ + <F752461C-1E23-48f6-B9F8-8350850F336F> \ + DWORD Type; \ + DWORD Method; \ + DWORD Usage; \ + DWORD UsageIndex; \ + } \ + template DeclData \ + { \ + <BF22E553-292C-4781-9FEA-62BD554BDD93> \ + DWORD nElements; \ + array VertexElement Elements[nElements]; \ + DWORD nDWords; \ + array DWORD data[nDWords]; \ + } \ + template PMAttributeRange \ + { \ + <917E0427-C61E-4a14-9C64-AFE65F9E9844> \ + DWORD iFaceOffset; \ + DWORD nFacesMin; \ + DWORD nFacesMax; \ + DWORD iVertexOffset; \ + DWORD nVerticesMin; \ + DWORD nVerticesMax; \ + } \ + template PMVSplitRecord \ + { \ + <574CCC14-F0B3-4333-822D-93E8A8A08E4C> \ + DWORD iFaceCLW; \ + DWORD iVlrOffset; \ + DWORD iCode; \ + } \ + template PMInfo \ + { \ + <B6C3E656-EC8B-4b92-9B62-681659522947> \ + DWORD nAttributes; \ + array PMAttributeRange attributeRanges[nAttributes]; \ + DWORD nMaxValence; \ + DWORD nMinLogicalVertices; \ + DWORD nMaxLogicalVertices; \ + DWORD nVSplits; \ + array PMVSplitRecord splitRecords[nVSplits]; \ + DWORD nAttributeMispredicts; \ + array DWORD attributeMispredicts[nAttributeMispredicts]; \ + } " + #endif /* __WINE_D3DX9MESH_H */

1 0

Dylan Smith : include: Create header file d3dx9anim.h.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 5cccad1311745117628b9a5f10652b5211151b51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cccad1311745117628b9a5f1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Apr 19 13:59:54 2011 -0400 include: Create header file d3dx9anim.h. --- include/Makefile.in | 1 + include/d3dx9.h | 1 + include/d3dx9anim.h | 391 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 393 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5cccad1311745117628b9…

1 0

André Hentschel : configure: Add ARM check.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 50ada0ff8e6871a6f17552a9955bad2278245e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ada0ff8e6871a6f17552a99… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 19 19:37:05 2011 +0200 configure: Add ARM check. --- configure | 26 ++++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 12783b3..ad73d52 100755 --- a/configure +++ b/configure @@ -14474,6 +14474,32 @@ if test $ac_cv_cpp_def___powerpc__ = yes; then : CFLAGS="$CFLAGS -D__powerpc__" LINTFLAGS="$LINTFLAGS -D__powerpc__" fi ;; + *arm*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __arm__" >&5 +$as_echo_n "checking whether we need to define __arm__... " >&6; } +if test "${ac_cv_cpp_def___arm__+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __arm__ +yes +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + ac_cv_cpp_def___arm__=yes +else + ac_cv_cpp_def___arm__=no +fi +rm -f conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___arm__" >&5 +$as_echo "$ac_cv_cpp_def___arm__" >&6; } +if test $ac_cv_cpp_def___arm__ = yes; then : + CFLAGS="$CFLAGS -D__arm__" + LINTFLAGS="$LINTFLAGS -D__arm__" +fi ;; esac case $host_vendor in diff --git a/configure.ac b/configure.ac index 2b92883..c22fcc8 100644 --- a/configure.ac +++ b/configure.ac @@ -2334,6 +2334,7 @@ case $host_cpu in *x86_64*) WINE_CHECK_DEFINE([__x86_64__]) ;; *sparc*) WINE_CHECK_DEFINE([__sparc__]) ;; *powerpc*) WINE_CHECK_DEFINE([__powerpc__]) ;; + *arm*) WINE_CHECK_DEFINE([__arm__]) ;; esac case $host_vendor in

1 0

Matteo Bruni : wined3d: Add two functions for GL context activation/restore .
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: edebabc2ec018908cae3b127012d83b1071fd2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=edebabc2ec018908cae3b1270… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 12 22:26:21 2011 +0200 wined3d: Add two functions for GL context activation/restore. --- dlls/wined3d/context.c | 66 +++++++++++++++++++++--------------------------- 1 files changed, 29 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c965095..544d662 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -793,6 +793,29 @@ static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC return TRUE; } +static BOOL context_set_gl_context(struct wined3d_context *ctx) +{ + if (!pwglMakeCurrent(ctx->hdc, ctx->glCtx)) + { + WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", + ctx->glCtx, ctx->hdc, GetLastError()); + ctx->valid = 0; + context_set_current(NULL); + return FALSE; + } + return TRUE; +} + +static void context_restore_gl_context(HDC dc, HGLRC gl_ctx) +{ + if (!pwglMakeCurrent(dc, gl_ctx)) + { + ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", + gl_ctx, dc, GetLastError()); + context_set_current(NULL); + } +} + static void context_update_window(struct wined3d_context *context) { if (context->win_handle == context->swapchain->win_handle) @@ -826,12 +849,7 @@ static void context_update_window(struct wined3d_context *context) goto err; } - if (!pwglMakeCurrent(context->hdc, context->glCtx)) - { - ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", - context->glCtx, context->hdc, GetLastError()); - goto err; - } + context_set_gl_context(context); return; @@ -855,7 +873,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) context_update_window(context); if (context->valid && restore_ctx != context->glCtx) - context->valid = !!pwglMakeCurrent(context->hdc, context->glCtx); + context_set_gl_context(context); else restore_ctx = NULL; ENTER_GL(); @@ -937,12 +955,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) if (restore_ctx) { - if (!pwglMakeCurrent(restore_dc, restore_ctx)) - { - DWORD err = GetLastError(); - ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", - restore_ctx, restore_dc, err); - } + context_restore_gl_context(restore_dc, restore_ctx); } else if (pwglGetCurrentContext() && !pwglMakeCurrent(NULL, NULL)) { @@ -1007,16 +1020,8 @@ BOOL context_set_current(struct wined3d_context *ctx) } TRACE("Switching to D3D context %p, GL context %p, device context %p.\n", ctx, ctx->glCtx, ctx->hdc); - if (!pwglMakeCurrent(ctx->hdc, ctx->glCtx)) - { - DWORD err = GetLastError(); - ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", - ctx->glCtx, ctx->hdc, err); - ctx->valid = 0; - pwglMakeCurrent(NULL, NULL); - TlsSetValue(wined3d_context_tls_idx, NULL); + if (!context_set_gl_context(ctx)) return FALSE; - } ctx->current = 1; } else if(pwglGetCurrentContext()) @@ -1049,13 +1054,7 @@ void context_release(struct wined3d_context *context) if (!--context->level && context->restore_ctx) { TRACE("Restoring GL context %p on device context %p.\n", context->restore_ctx, context->restore_dc); - if (!pwglMakeCurrent(context->restore_dc, context->restore_ctx)) - { - DWORD err = GetLastError(); - ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", - context->restore_ctx, context->restore_dc, err); - context_set_current(NULL); - } + context_restore_gl_context(context->restore_dc, context->restore_ctx); context->restore_ctx = NULL; context->restore_dc = NULL; } @@ -2324,14 +2323,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf } else if (context->restore_ctx) { - if (!pwglMakeCurrent(context->hdc, context->glCtx)) - { - DWORD err = GetLastError(); - ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", - context->glCtx, context->hdc, err); - context->valid = 0; - pwglMakeCurrent(NULL, NULL); - } + context_set_gl_context(context); } return context;

1 0