March 2011 - Wine-commits - list.winehq.org

Marcus Meissner : winebuild: Mark up fallthrough switch cases (Coverity).
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 7a0797a6a8b343f9fff1fb08f18fd925b09672c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0797a6a8b343f9fff1fb08f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Mar 29 15:33:04 2011 +0200 winebuild: Mark up fallthrough switch cases (Coverity). --- tools/winebuild/spec32.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index e16260a..2429982 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -200,9 +200,13 @@ static void output_relay_debug( DLLSPEC *spec ) switch (args) { default: output( "\tmovq %%%s,72(%%rsp)\n", is_float_arg( odp, 3 ) ? "xmm3" : "r9" ); + /* fall through */ case 3: output( "\tmovq %%%s,64(%%rsp)\n", is_float_arg( odp, 2 ) ? "xmm2" : "r8" ); + /* fall through */ case 2: output( "\tmovq %%%s,56(%%rsp)\n", is_float_arg( odp, 1 ) ? "xmm1" : "rdx" ); + /* fall through */ case 1: output( "\tmovq %%%s,48(%%rsp)\n", is_float_arg( odp, 0 ) ? "xmm0" : "rcx" ); + /* fall through */ case 0: break; } output( "\tleaq 40(%%rsp),%%r8\n" );

1 0

Marcus Meissner : widl: Mark up a FALLTHROUGH case (Coverity).
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 0222ad7326e7454fa3d2f269430ef347bebbe538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0222ad7326e7454fa3d2f2694… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Mar 29 15:34:15 2011 +0200 widl: Mark up a FALLTHROUGH case (Coverity). --- tools/widl/expr.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index e1a5196..60e3a50 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -94,6 +94,7 @@ static int is_signed_integer_type(const type_t *type) case TYPE_BASIC_HANDLE: return FALSE; } + /* FALLTHROUGH */ default: return FALSE; }

1 0

David Hedberg : comdlg32: Add NEWFILEOPENV3ORD resource.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 9df020cd73a13f33f8e9f71ddad22af9b37c63bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df020cd73a13f33f8e9f71dd… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 31 05:55:22 2011 +0200 comdlg32: Add NEWFILEOPENV3ORD resource. --- dlls/comdlg32/cdlg_En.rc | 18 ++++++++++++++++++ include/dlgs.h | 1 + 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg_En.rc b/dlls/comdlg32/cdlg_En.rc index d4f215d..3a5197f 100644 --- a/dlls/comdlg32/cdlg_En.rc +++ b/dlls/comdlg32/cdlg_En.rc @@ -352,6 +352,24 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Help", pshHelp,222,145,50,14 } +NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN | + WS_THICKFRAME +CAPTION "Open" +FONT 8, "MS Shell Dlg" +{ + LTEXT "File name:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT + EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP + + LTEXT "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT + COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | + CBS_HASSTRINGS | CBS_DROPDOWNLIST + + DEFPUSHBUTTON "&Open", IDOK, 350, 240, 40, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 395, 240, 40, 14 + PUSHBUTTON "&Help", pshHelp, 350, 272, 40, 14 +} + /****************************************************************/ /* English neutral resources /****************************************************************/ diff --git a/include/dlgs.h b/include/dlgs.h index b5cace3..7315b11 100644 --- a/include/dlgs.h +++ b/include/dlgs.h @@ -209,5 +209,6 @@ #define PAGESETUPDLGORDMOTIF 1550 #define COLORMGMTDLGORD 1551 #define NEWFILEOPENV2ORD 1552 +#define NEWFILEOPENV3ORD 1553 #endif /* #ifdef __WINE_DLGS_H */

1 0

David Hedberg : comdlg32: Implement Show and Close for the Item Dialog.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 3db65935910ef9e0718752d3d033d9bb02f21c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db65935910ef9e0718752d3d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 31 05:55:23 2011 +0200 comdlg32: Implement Show and Close for the Item Dialog. --- dlls/comdlg32/itemdlg.c | 293 ++++++++++++++++++++++++++++++++++++++++- dlls/comdlg32/tests/itemdlg.c | 3 - 2 files changed, 289 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3db65935910ef9e071875…

1 0

David Hedberg : comdlg32: Add IExplorerBrowserEvents stub to Item Dialog.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 4bd2cc7ae8b26be367b31244ab8286745ffcec46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd2cc7ae8b26be367b31244a… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 31 05:55:24 2011 +0200 comdlg32: Add IExplorerBrowserEvents stub to Item Dialog. --- dlls/comdlg32/itemdlg.c | 79 +++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/tests/itemdlg.c | 4 +- 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 7343d70..dfd2d3a 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -58,6 +58,7 @@ typedef struct FileDialogImpl { IFileSaveDialog IFileSaveDialog_iface; } u; enum ITEMDLG_TYPE dlg_type; + IExplorerBrowserEvents IExplorerBrowserEvents_iface; LONG ref; FILEOPENDIALOGOPTIONS options; @@ -382,6 +383,10 @@ static HRESULT WINAPI IFileDialog2_fnQueryInterface(IFileDialog2 *iface, { *ppvObject = &This->u.IFileSaveDialog_iface; } + else if(IsEqualGUID(riid, &IID_IExplorerBrowserEvents)) + { + *ppvObject = &This->IExplorerBrowserEvents_iface; + } else FIXME("Unknown interface requested: %s.\n", debugstr_guid(riid)); @@ -1284,6 +1289,79 @@ static const IFileSaveDialogVtbl vt_IFileSaveDialog = { IFileSaveDialog_fnApplyProperties }; +/************************************************************************** + * IExplorerBrowserEvents implementation + */ +static inline FileDialogImpl *impl_from_IExplorerBrowserEvents(IExplorerBrowserEvents *iface) +{ + return CONTAINING_RECORD(iface, FileDialogImpl, IExplorerBrowserEvents_iface); +} + +static HRESULT WINAPI IExplorerBrowserEvents_fnQueryInterface(IExplorerBrowserEvents *iface, + REFIID riid, void **ppvObject) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p (%s, %p)\n", This, debugstr_guid(riid), ppvObject); + + return IFileDialog2_QueryInterface(&This->IFileDialog2_iface, riid, ppvObject); +} + +static ULONG WINAPI IExplorerBrowserEvents_fnAddRef(IExplorerBrowserEvents *iface) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p\n", This); + return IFileDialog2_AddRef(&This->IFileDialog2_iface); +} + +static ULONG WINAPI IExplorerBrowserEvents_fnRelease(IExplorerBrowserEvents *iface) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p\n", This); + return IFileDialog2_Release(&This->IFileDialog2_iface); +} + +static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationPending(IExplorerBrowserEvents *iface, + PCIDLIST_ABSOLUTE pidlFolder) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p (%p)\n", This, pidlFolder); + return S_OK; +} + +static HRESULT WINAPI IExplorerBrowserEvents_fnOnViewCreated(IExplorerBrowserEvents *iface, + IShellView *psv) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p (%p)\n", This, psv); + return S_OK; +} + +static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationComplete(IExplorerBrowserEvents *iface, + PCIDLIST_ABSOLUTE pidlFolder) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p (%p)\n", This, pidlFolder); + return S_OK; +} + +static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationFailed(IExplorerBrowserEvents *iface, + PCIDLIST_ABSOLUTE pidlFolder) +{ + FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + TRACE("%p (%p)\n", This, pidlFolder); + return S_OK; +} + +static const IExplorerBrowserEventsVtbl vt_IExplorerBrowserEvents = { + IExplorerBrowserEvents_fnQueryInterface, + IExplorerBrowserEvents_fnAddRef, + IExplorerBrowserEvents_fnRelease, + IExplorerBrowserEvents_fnOnNavigationPending, + IExplorerBrowserEvents_fnOnViewCreated, + IExplorerBrowserEvents_fnOnNavigationComplete, + IExplorerBrowserEvents_fnOnNavigationFailed +}; + static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv, enum ITEMDLG_TYPE type) { FileDialogImpl *fdimpl; @@ -1302,6 +1380,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->ref = 1; fdimpl->IFileDialog2_iface.lpVtbl = &vt_IFileDialog2; + fdimpl->IExplorerBrowserEvents_iface.lpVtbl = &vt_IExplorerBrowserEvents; if(type == ITEMDLG_TYPE_OPEN) { diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index b0661b4..8b998a6 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -212,7 +212,7 @@ static BOOL test_instantiation(void) if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = IFileOpenDialog_QueryInterface(pfod, &IID_IExplorerBrowserEvents, (void**)&punk); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = IFileOpenDialog_QueryInterface(pfod, &IID_IShellBrowser, (void**)&punk); @@ -252,7 +252,7 @@ static BOOL test_instantiation(void) if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IExplorerBrowserEvents, (void**)&punk); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IShellBrowser, (void**)&punk);

1 0

Matteo Bruni : opengl32/tests: Add a test for window destroy with wglMakeContextCurrentARB.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 8818c1d8b6712af5efa754a5145817a28d36a23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8818c1d8b6712af5efa754a51… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 18 14:16:58 2011 +0100 opengl32/tests: Add a test for window destroy with wglMakeContextCurrentARB. --- dlls/opengl32/tests/opengl.c | 158 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 157 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 9834c6d..7b6c911 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -24,8 +24,10 @@ void WINAPI glClearColor(float red, float green, float blue, float alpha); void WINAPI glClear(unsigned int mask); -void WINAPI glFinish(void); +#define GL_COLOR 0x1800 typedef unsigned int GLenum; +void WINAPI glCopyPixels(int x, int y, int width, int height, GLenum type); +void WINAPI glFinish(void); #define GL_NO_ERROR 0x0 #define GL_INVALID_OPERATION 0x502 GLenum WINAPI glGetError(void); @@ -1003,6 +1005,157 @@ static void test_destroy(HDC oldhdc) ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); } +static void test_destroy_read(HDC oldhdc) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND draw_window, read_window; + HGLRC ctx; + BOOL ret; + HDC read_dc, draw_dc; + GLenum glerr; + DWORD err; + HGLRC oldctx = wglGetCurrentContext(); + + ok(!!oldctx, "Expected to find a valid current context\n"); + + draw_window = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!draw_window, "Failed to create window, last error %#x.\n", GetLastError()); + + draw_dc = GetDC(draw_window); + ok(!!draw_dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(draw_dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(draw_window, draw_dc); + DestroyWindow(draw_window); + return; + } + + ret = SetPixelFormat(draw_dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + read_window = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!read_window, "Failed to create window, last error %#x.\n", GetLastError()); + + read_dc = GetDC(read_window); + ok(!!draw_dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(read_dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(read_window, read_dc); + DestroyWindow(read_window); + ReleaseDC(draw_window, draw_dc); + DestroyWindow(draw_window); + return; + } + + ret = SetPixelFormat(read_dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx = wglCreateContext(draw_dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + glCopyPixels(0, 0, 640, 480, GL_COLOR); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glCopyPixel, error %#x.\n", glerr); + + ret = DestroyWindow(read_window); + ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); + + ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); + + if (0) /* Crashes on AMD on Windows */ + { + glCopyPixels(0, 0, 640, 480, GL_COLOR); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glCopyPixel, error %#x.\n", glerr); + } + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + if (0) /* This crashes with Nvidia drivers on Windows. */ + { + SetLastError(0xdeadbeef); + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + } + + ret = DestroyWindow(draw_window); + ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + todo_wine ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); + + SetLastError(0xdeadbeef); + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + err = GetLastError(); + todo_wine ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + + todo_wine ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); + + wglMakeCurrent(NULL, NULL); + + wglMakeCurrent(oldhdc, oldctx); + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + SetLastError(0xdeadbeef); + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + err = GetLastError(); + todo_wine ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), + "Unexpected behavior when making context current, last error %#x.\n", err); + + todo_wine ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(read_window, read_dc); + ReleaseDC(draw_window, draw_dc); + + wglMakeCurrent(oldhdc, oldctx); +} + START_TEST(opengl) { HWND hwnd; @@ -1103,7 +1256,10 @@ START_TEST(opengl) test_opengl3(hdc); if(strstr(wgl_extensions, "WGL_ARB_make_current_read")) + { test_make_current_read(hdc); + test_destroy_read(hdc); + } else skip("WGL_ARB_make_current_read not supported, skipping test\n");

1 0

Matteo Bruni : winex11.drv: Don' t modify state if glXMakeContextCurrent fails.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 868974c61579fda8eabf84a3caf299346e069662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868974c61579fda8eabf84a3c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 11 21:47:32 2011 +0100 winex11.drv: Don't modify state if glXMakeContextCurrent fails. --- dlls/winex11.drv/opengl.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0a23e44..1d2eacf 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1977,22 +1977,27 @@ BOOL CDECL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEV if (NULL == pglXMakeContextCurrent) { ret = FALSE; } else { - Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; Wine_GLContext *ctx = (Wine_GLContext *) hglrc; Drawable d_draw = get_glxdrawable(pDrawDev); Drawable d_read = get_glxdrawable(pReadDev); - if (prev_ctx) prev_ctx->tid = 0; - - ctx->has_been_current = TRUE; - ctx->tid = GetCurrentThreadId(); - ctx->hdc = pDrawDev->hdc; - ctx->read_hdc = pReadDev->hdc; - ctx->drawables[0] = d_draw; - ctx->drawables[1] = d_read; - ctx->refresh_drawables = FALSE; ret = pglXMakeContextCurrent(gdi_display, d_draw, d_read, ctx->ctx); - NtCurrentTeb()->glContext = ctx; + if (ret) + { + Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; + if (prev_ctx) prev_ctx->tid = 0; + + ctx->has_been_current = TRUE; + ctx->tid = GetCurrentThreadId(); + ctx->hdc = pDrawDev->hdc; + ctx->read_hdc = pReadDev->hdc; + ctx->drawables[0] = d_draw; + ctx->drawables[1] = d_read; + ctx->refresh_drawables = FALSE; + NtCurrentTeb()->glContext = ctx; + } + else + SetLastError(ERROR_INVALID_HANDLE); } } wine_tsx11_unlock();

1 0

Matteo Bruni : winex11.drv: Fix wglMakeContextCurrent with an invalid drawable.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 1902e1cb9306b65ab903f02d855078545a1ddfa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1902e1cb9306b65ab903f02d8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 16 00:32:47 2011 +0100 winex11.drv: Fix wglMakeContextCurrent with an invalid drawable. --- dlls/opengl32/tests/opengl.c | 8 ++++---- dlls/winex11.drv/opengl.c | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 7b6c911..1669d73 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1129,10 +1129,10 @@ static void test_destroy_read(HDC oldhdc) SetLastError(0xdeadbeef); ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); err = GetLastError(); - todo_wine ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), + ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); - todo_wine ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); + ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); wglMakeCurrent(NULL, NULL); @@ -1142,10 +1142,10 @@ static void test_destroy_read(HDC oldhdc) SetLastError(0xdeadbeef); ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); err = GetLastError(); - todo_wine ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), + ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), "Unexpected behavior when making context current, last error %#x.\n", err); - todo_wine ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); ret = wglDeleteContext(ctx); ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 1d2eacf..81979ae 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1972,6 +1972,12 @@ BOOL CDECL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEV ret = pglXMakeCurrent(gdi_display, None, NULL); NtCurrentTeb()->glContext = NULL; } + else if (!pDrawDev->current_pf) + { + WARN("Trying to use an invalid drawable\n"); + SetLastError(ERROR_INVALID_HANDLE); + ret = FALSE; + } else { if (NULL == pglXMakeContextCurrent) {

1 0

Matteo Bruni : winex11.drv: Don' t call glXSwapBuffers if the context or the drawable are invalid.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 90608c8ce633cd79dffd45d02b32fe16e615f4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=90608c8ce633cd79dffd45d02… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 17 22:51:04 2011 +0100 winex11.drv: Don't call glXSwapBuffers if the context or the drawable are invalid. --- dlls/winex11.drv/opengl.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 81979ae..a7ec8c8 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3818,6 +3818,20 @@ BOOL CDECL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) TRACE("(%p)\n", physDev); + if (!ctx) + { + WARN("Using a NULL context, skipping\n"); + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!physDev->current_pf) + { + WARN("Using an invalid drawable, skipping\n"); + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + drawable = get_glxdrawable(physDev); wine_tsx11_lock();

1 0

Piotr Caban : msvcrt/tests: Fix memory leaks (valgrind).
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: d5e3e9301a5dca7a3d171d202f644d18fe8c8f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e3e9301a5dca7a3d171d202… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 20:31:33 2011 +0200 msvcrt/tests: Fix memory leaks (valgrind). --- dlls/msvcrt/tests/cpp.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index c3b7c3d..dfb2cd7 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -810,7 +810,8 @@ static void test_rtti(void) void *casted; if (bAncientVersion || - !p__RTCastToVoid || !p__RTtypeid || !pexception_ctor || !pbad_typeid_ctor || !p__RTDynamicCast) + !p__RTCastToVoid || !p__RTtypeid || !pexception_ctor || !pbad_typeid_ctor + || !p__RTDynamicCast || !pexception_dtor || !pbad_typeid_dtor) return; call_func2(pexception_ctor, &e, &e_name); @@ -834,6 +835,9 @@ static void test_rtti(void) /* dynamic_cast down */ casted = p__RTDynamicCast(&e, 0, NULL, bti, 0); ok (casted == NULL, "Cast succeeded\n"); + + call_func1(pexception_dtor, &e); + call_func1(pbad_typeid_dtor, &b); } struct _demangle { @@ -864,7 +868,8 @@ static void test_demangle_datatype(void) ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); else todo_wine ok(name != NULL && !strcmp(name,demangle[i].result), "Got name %s for %d\n", name, i); - + if(name) + pfree(name); } }

1 0