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

Hans Leidekker : msi: Fix building the message string in MSI_ProcessMessage .
by Alexandre Julliard March 31, 2011

March 31, 2011

Module: wine Branch: master Commit: 31291ec2050a642ce67dd8c2f224d701f55050a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31291ec2050a642ce67dd8c2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 31 11:57:47 2011 +0200 msi: Fix building the message string in MSI_ProcessMessage. --- dlls/msi/package.c | 62 ++++++++++++++++++++++++++------------------------- 1 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7317af2..49acdb7 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1703,8 +1703,7 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) return handle; } -INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, - MSIRECORD *record) +INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIRECORD *record ) { static const WCHAR szActionData[] = {'A','c','t','i','o','n','D','a','t','a',0}; @@ -1713,10 +1712,9 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, static const WCHAR szActionText[] = {'A','c','t','i','o','n','T','e','x','t',0}; LPWSTR message; - DWORD sz, total_size = 0, log_type = 0; - INT i, rc = 0; + DWORD i, len, total_len, log_type = 0; + INT rc = 0; char *msg; - int len; TRACE("%x\n", eMessageType); @@ -1769,35 +1767,39 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, } else { - INT msg_field=1; - message = msi_alloc(1*sizeof (WCHAR)); - message[0]=0; - msg_field = MSI_RecordGetFieldCount(record); - for (i = 1; i <= msg_field; i++) + static const WCHAR format[] = {'%','u',':',' ',0}; + UINT count = MSI_RecordGetFieldCount( record ); + WCHAR *p; + + total_len = 1; + for (i = 1; i <= count; i++) + { + len = 0; + MSI_RecordGetStringW( record, i, NULL, &len ); + total_len += len + 13; + } + p = message = msi_alloc( total_len * sizeof(WCHAR) ); + if (!p) return ERROR_OUTOFMEMORY; + + for (i = 1; i <= count; i++) { - LPWSTR tmp; - WCHAR number[3]; - static const WCHAR format[] = { '%','i',':',' ',0}; - sz = 0; - MSI_RecordGetStringW(record,i,NULL,&sz); - sz+=4; - total_size+=sz*sizeof(WCHAR); - tmp = msi_alloc(sz*sizeof(WCHAR)); - message = msi_realloc(message,total_size*sizeof (WCHAR)); - - MSI_RecordGetStringW(record,i,tmp,&sz); - - if (msg_field > 1) + if (count > 1) { - sprintfW(number,format,i); - strcatW(message,number); + len = sprintfW( p, format, i ); + total_len -= len; + p += len; + } + len = total_len; + MSI_RecordGetStringW( record, i, p, &len ); + total_len -= len; + p += len; + if (count > 1 && total_len) + { + *p++ = ' '; + total_len--; } - strcatW(message,tmp); - if (msg_field > 1) - strcatW(message, szSpace); - - msi_free(tmp); } + p[0] = 0; } TRACE("%p %p %p %x %x %s\n", gUIHandlerA, gUIHandlerW, gUIHandlerRecord,

1 0

David Hedberg : comdlg32: Implement Show and Close for the Item Dialog.
by Alexandre Julliard March 31, 2011

March 31, 2011

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

Hans Leidekker : msi: Fix buffer size calculation in get_keypath.
by Alexandre Julliard March 31, 2011

March 31, 2011

Module: wine Branch: master Commit: 0aaf17c0d8c35de836540f83b573e1329b991e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aaf17c0d8c35de836540f83b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 31 11:57:25 2011 +0200 msi: Fix buffer size calculation in get_keypath. --- dlls/msi/action.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a5a1e33..73d6d1b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2879,14 +2879,11 @@ static WCHAR *get_keypath( MSIPACKAGE *package, HKEY root, const WCHAR *path ) UINT size; WCHAR *path_32node; - size = (strlenW( path ) + strlenW( szWow6432Node ) + 1) * sizeof(WCHAR); - path_32node = msi_alloc( size ); - if (!path_32node) - return NULL; + size = (strlenW( path ) + strlenW( szWow6432Node ) + 2) * sizeof(WCHAR); + if (!(path_32node = msi_alloc( size ))) return NULL; memcpy( path_32node, path, len * sizeof(WCHAR) ); - path_32node[len] = 0; - strcatW( path_32node, szWow6432Node ); + strcpyW( path_32node + len, szWow6432Node ); strcatW( path_32node, szBackSlash ); strcatW( path_32node, path + len ); return path_32node;

1 0

Bart Van Assche : ntdll: Avoid examining uninitialized data.
by Alexandre Julliard March 31, 2011

March 31, 2011

Module: wine Branch: master Commit: e5fe510720ba3d8a247a91e17d1b09bde5f268c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5fe510720ba3d8a247a91e17… Author: Bart Van Assche <bvanassche(a)acm.org> Date: Wed Mar 30 20:50:12 2011 +0200 ntdll: Avoid examining uninitialized data. --- dlls/ntdll/directory.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 66572da..b57741a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -923,7 +923,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) struct statfs stfs; - statfs( dir, &stfs ); + if (statfs( dir, &stfs ) == -1) return FALSE; /* Assume these file systems are always case insensitive on Mac OS. * For FreeBSD, only assume CIOPFS is case insensitive (AFAIK, Mac OS * is the only UNIX that supports case-insensitive lookup). @@ -960,7 +960,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #elif defined(__NetBSD__) struct statvfs stfs; - statvfs( dir, &stfs ); + if (statvfs( dir, &stfs ) == -1) return FALSE; /* Only assume CIOPFS is case insensitive. */ if (strcmp( stfs.f_fstypename, "fusefs" ) || strncmp( stfs.f_mntfromname, "ciopfs", 5 )) @@ -973,7 +973,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) char *cifile; /* Only assume CIOPFS is case insensitive. */ - statfs( dir, &stfs ); + if (statfs( dir, &stfs ) == -1) return FALSE; if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) return TRUE; /* Normally, we'd have to parse the mtab to find out exactly what @@ -2175,7 +2175,6 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i } } closedir( dir ); - goto not_found; /* avoid warning */ not_found: unix_name[pos - 1] = 0;

1 0

David Hedberg : comdlg32: Add NEWFILEOPENV3ORD resource.
by Alexandre Julliard March 31, 2011

March 31, 2011

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

Matteo Bruni : winex11.drv: Don' t modify state if glXMakeContextCurrent fails.
by Alexandre Julliard March 31, 2011

March 31, 2011

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 : opengl32/tests: Add a test for window destroy with wglMakeContextCurrentARB.
by Alexandre Julliard March 31, 2011

March 31, 2011

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 call glXSwapBuffers if the context or the drawable are invalid.
by Alexandre Julliard March 31, 2011

March 31, 2011

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

Matteo Bruni : winex11.drv: Fix wglMakeContextCurrent with an invalid drawable.
by Alexandre Julliard March 31, 2011

March 31, 2011

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

Piotr Caban : mshtml/tests: Ignore calls missing in IE6.
by Alexandre Julliard March 31, 2011

March 31, 2011

Module: wine Branch: master Commit: 454da235ea30fae25bb6d12c8661565301dc2830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454da235ea30fae25bb6d12c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 22:28:27 2011 +0200 mshtml/tests: Ignore calls missing in IE6. --- dlls/mshtml/tests/htmldoc.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 2df4e74..b0ceea0 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -74,6 +74,12 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_CALLED_BROKEN(func) \ + do { \ + ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + static IOleDocumentView *view = NULL; static HWND container_hwnd = NULL, hwnd = NULL, last_hwnd = NULL; @@ -1213,7 +1219,7 @@ static void continue_binding(IBindStatusCallback *callback) BINDSTATUS_BEGINDOWNLOADDATA, doc_url); ok(hres == S_OK, "OnProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); if(status_code != HTTP_STATUS_OK) { - CHECK_CALLED(IsErrorUrl); + CHECK_CALLED_BROKEN(IsErrorUrl); SET_EXPECT(IsErrorUrl); } @@ -3928,7 +3934,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_37); - todo_wine CHECK_CALLED(IsErrorUrl); + todo_wine CHECK_CALLED_BROKEN(IsErrorUrl); } else todo_wine CHECK_CALLED(GetTravelLog); @@ -4068,18 +4074,18 @@ static void test_download(DWORD flags) CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_HTTPEQUIV_DONE); SET_CALLED(SetStatusText); - if(nav_url) { /* avoiding race, FIXME: fund better way */ + if(nav_url) { /* avoiding race, FIXME: find better way */ SET_CALLED(UpdateUI); SET_CALLED(Exec_UPDATECOMMANDS); SET_CALLED(Exec_SETTITLE); - todo_wine CHECK_CALLED(UpdateBackForwardState); + todo_wine CHECK_CALLED_BROKEN(UpdateBackForwardState); } if(!editmode && !(flags & DWL_EMPTY)) todo_wine CHECK_CALLED(FireNavigateComplete2); if(!editmode) CHECK_CALLED(FireDocumentComplete); todo_wine CHECK_CALLED(ActiveElementChanged); - todo_wine CHECK_CALLED(IsErrorUrl); + todo_wine CHECK_CALLED_BROKEN(IsErrorUrl); load_state = LD_COMPLETE;

1 0