July 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: Check for XKB extension on the GDI display too.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: stable Commit: 43c7ea247cf3b967e4c1b8e703c79c90d1ede98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c7ea247cf3b967e4c1b8e70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 2 12:03:52 2008 +0200 winex11: Check for XKB extension on the GDI display too. (cherry picked from commit 219ae804ba4de3e3dfb71c1822e1a8a0007b5971) --- dlls/winex11.drv/x11drv_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 4ca1bb6..4b9df5e 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -537,6 +537,9 @@ static BOOL process_attach(void) X11DRV_XComposite_Init(); #endif +#ifdef HAVE_XKB + if (use_xkb) use_xkb = XkbUseExtension( gdi_display, NULL, NULL ); +#endif X11DRV_InitKeyboard( gdi_display ); X11DRV_InitClipboard(); if (use_xim) use_xim = X11DRV_InitXIM( input_style );

1 0

Dmitry Timoshkov : gdi32: Use 0xffff as a default character as Vista does.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: stable Commit: 0c0083a2cedfa6ba72fd988dbd40851078844f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0083a2cedfa6ba72fd988db… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 18 12:35:58 2008 +0900 gdi32: Use 0xffff as a default character as Vista does. (cherry picked from commit ecd5048ea7e2d40c449ed29a3cd6831ddd433f1d) --- dlls/gdi32/freetype.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 459558d..2d614af 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5034,11 +5034,16 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, * symbol range to 0 - f0ff */ if (font->charset == SYMBOL_CHARSET) + { TM.tmFirstChar = 0; + TM.tmDefaultChar = pOS2->usDefaultChar ? pOS2->usDefaultChar : 0x1f; + } else + { TM.tmFirstChar = pOS2->usFirstCharIndex; + TM.tmDefaultChar = pOS2->usDefaultChar ? pOS2->usDefaultChar : 0xffff; + } TM.tmLastChar = pOS2->usLastCharIndex; - TM.tmDefaultChar = pOS2->usDefaultChar ? pOS2->usDefaultChar : 0x1f; TM.tmBreakChar = pOS2->usBreakChar ? pOS2->usBreakChar : ' '; TM.tmItalic = font->fake_italic ? 255 : ((ft_face->style_flags & FT_STYLE_FLAG_ITALIC) ? 255 : 0); TM.tmUnderlined = font->underline;

1 0

John Klehm : winex11: Cursor iteration is now done by checking ACTIVE cursors.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: stable Commit: 1c9af4c25987962b97a0b271e18f0ae538958704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c9af4c25987962b97a0b271e… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Sat May 31 16:16:23 2008 -0500 winex11: Cursor iteration is now done by checking ACTIVE cursors. (cherry picked from commit 8d70da9fa95507e970dd5927e90d4eea98ca83d9) --- dlls/winex11.drv/wintab.c | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 691b1bb..3165e58 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -307,7 +307,7 @@ static INT button_state[10]; static LOGCONTEXTW gSysContext; static WTI_DEVICES_INFO gSysDevice; static WTI_CURSORS_INFO gSysCursor[CURSORMAX]; -static INT gNumCursors; +static INT gNumCursors; /* do NOT use this to iterate through gSysCursor slots */ /* XInput stuff */ @@ -493,6 +493,18 @@ static BOOL is_eraser(const char *name, const char *type) return FALSE; } +static void disable_system_cursors(void) +{ + UINT i; + + for (i = 0; i < CURSORMAX; ++i) + { + gSysCursor[i].ACTIVE = 0; + } + + gNumCursors = 0; +} + /*********************************************************************** * X11DRV_LoadTabletInfo (X11DRV.@) @@ -552,6 +564,9 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) gSysContext.lcSysSensX= 65536; gSysContext.lcSysSensY= 65536; + /* initialize cursors */ + disable_system_cursors(); + /* Device Defaults */ gSysDevice.HARDWARE = HWC_HARDPROX|HWC_PHYSID_CURSORS; gSysDevice.FIRSTCSR= 0; @@ -856,8 +871,8 @@ static void set_button_state(int curnum, XID deviceid) static int cursor_from_device(DWORD deviceid, LPWTI_CURSORS_INFO *cursorp) { int i; - for (i = 0; i < gNumCursors; i++) - if (gSysCursor[i].PHYSID == deviceid) + for (i = 0; i < CURSORMAX; i++) + if (gSysCursor[i].ACTIVE && gSysCursor[i].PHYSID == deviceid) { *cursorp = &gSysCursor[i]; return i; @@ -997,11 +1012,13 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner) devices = pXListInputDevices(data->display, &num_devices); X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL); - for (cur_loop=0; cur_loop < gNumCursors; cur_loop++) + for (cur_loop=0; cur_loop < CURSORMAX; cur_loop++) { char cursorNameA[WT_MAX_NAME_LEN]; int event_number=0; + if (!gSysCursor[cur_loop].ACTIVE) continue; + /* the cursor name fits in the buffer because too long names are skipped */ WideCharToMultiByte(CP_UNIXCP, 0, gSysCursor[cur_loop].NAME, -1, cursorNameA, WT_MAX_NAME_LEN, NULL, NULL); for (loop=0; loop < num_devices; loop ++) @@ -1295,12 +1312,10 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) case WTI_CURSORS+7: case WTI_CURSORS+8: case WTI_CURSORS+9: - if (wCategory - WTI_CURSORS >= gNumCursors) - { + /* Apps will poll different slots to detect what cursors are available + * if there isn't a cursor for this slot return 0 */ + if (!gSysCursor[wCategory - WTI_CURSORS].ACTIVE) rc = 0; - WARN("Requested cursor information for nonexistent cursor %d; only %d cursors\n", - wCategory - WTI_CURSORS, gNumCursors); - } else { tgtcursor = &gSysCursor[wCategory - WTI_CURSORS];

1 0

John Klehm : winex11: Place tablet cursors in slots based on type.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: stable Commit: 727a754eaed9ba7da35bfda5825796a9f0169e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=727a754eaed9ba7da35bfda58… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Sat May 31 16:48:19 2008 -0500 winex11: Place tablet cursors in slots based on type. (cherry picked from commit 70cf762d31ac76c2b6b8cdd99eb33fb8a7856fac) --- dlls/winex11.drv/wintab.c | 159 ++++++++++++++++++-------------------------- 1 files changed, 65 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=727a754eaed9ba7da35bf…

1 0

John Klehm : winex11: Always assign a tablet cursor type.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: stable Commit: b50b4c4b5a07bb23f9dbdc7729affaa511b6a00b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b50b4c4b5a07bb23f9dbdc772… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Sat May 31 15:51:46 2008 -0500 winex11: Always assign a tablet cursor type. (cherry picked from commit 97b2dcb62cd7ca5c15c19d1fcb0cc2c96ab2e5bf) --- dlls/winex11.drv/wintab.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index be72a21..691b1bb 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -227,7 +227,11 @@ typedef struct tagWTI_DEVICES_INFO #define CSR_TYPE_ERASER 0x82a #define CSR_TYPE_MOUSE_2D 0x007 #define CSR_TYPE_MOUSE_4D 0x094 - +/* CSR_TYPE_OTHER is a special value! assumed no real world signifigance + * if a stylus type or eraser type eventually have this value + * it'll be a bug. As of 2008 05 21 we can be sure because + * linux wacom lists all the known values and this isn't one of them */ +#define CSR_TYPE_OTHER 0x000 typedef struct tagWTPACKET { HCTX pkContext; @@ -650,11 +654,14 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) cursor->NPBTNMARKS[0] = 0 ; cursor->NPBTNMARKS[1] = 1 ; cursor->CAPABILITIES = CRC_MULTIMODE; + + /* prefer finding TYPE_PEN(most capable) */ if (is_stylus(target->name, device_type)) cursor->TYPE = CSR_TYPE_PEN; - if (is_eraser(target->name, device_type)) + else if (is_eraser(target->name, device_type)) cursor->TYPE = CSR_TYPE_ERASER; - + else + cursor->TYPE = CSR_TYPE_OTHER; any = target->inputclassinfo;

1 0

John Klehm : winex11: Add comments explaining wintab cursor slotting, type, and clarify x11 config.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: stable Commit: 3881a512915cd493091a10a66e70c00acf6d315c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3881a512915cd493091a10a66… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Sat May 31 15:34:57 2008 -0500 winex11: Add comments explaining wintab cursor slotting, type, and clarify x11 config. (cherry picked from commit a629ece6040699cd33bf6b65a704427f7b5a37d4) --- dlls/winex11.drv/wintab.c | 50 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 5eecd26..be72a21 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -212,8 +212,17 @@ typedef struct tagWTI_DEVICES_INFO * the type here. (This is unfortunate, the kernel module has * the exact type, but we have no way of getting that module to * pass us that type). + * + * Reference linuxwacom driver project wcmCommon.c function + * idtotype for a much larger list of CSR_TYPE. + * + * http://linuxwacom.cvs.sourceforge.net/linuxwacom/linuxwacom-prod/src/xdrv/w… + * + * The WTI_CURSORS_INFO.TYPE data is supposed to be used like this: + * (cursor.TYPE & 0x0F06) == target_cursor_type + * Reference: Section Unique ID + * http://www.wacomeng.com/devsupport/ibmpc/gddevpc.html */ - #define CSR_TYPE_PEN 0x822 #define CSR_TYPE_ERASER 0x82a #define CSR_TYPE_MOUSE_2D 0x007 @@ -256,6 +265,39 @@ static WTPACKET gMsgPacket; static DWORD gSerial; static INT button_state[10]; +/* Reference: http://www.wacomeng.com/devsupport/ibmpc/gddevpc.html + * + * Cursors come in sets of 3 normally + * Cursor #0 = puck device 1 + * Cursor #1 = stylus device 1 + * Cursor #2 = eraser device 1 + * Cursor #3 = puck device 2 + * Cursor #4 = stylus device 2 + * Cursor #5 = eraser device 2 + * etc.... + * + * A dual tracking/multimode tablet is one + * that supports 2 independent cursors of the same or + * different types simultaneously on a single tablet. + * This makes our cursor layout potentially like this + * Cursor #0 = puck 1 device 1 + * Cursor #1 = stylus 1 device 1 + * Cursor #2 = eraser 1 device 1 + * Cursor #3 = puck 2 device 1 + * Cursor #4 = stylus 2 device 1 + * Cursor #5 = eraser 2 device 1 + * Cursor #6 = puck 1 device 2 + * etc..... + * + * So with multimode tablets we could potentially need + * 2 slots of the same type per tablet ie. + * you are usuing 2 styluses at once so they would + * get placed in Cursors #1 and Cursor #4 + * + * Now say someone has 2 multimode tablets with 2 erasers each + * now we would need Cursor #2, #5, #8, #11 + * So to support that we need CURSORMAX of 12 (0 to 11) + * FIXME: we dont support more than 4 regular tablets or 2 multimode tablets */ #define CURSORMAX 10 static LOGCONTEXTW gSysContext; @@ -386,6 +428,12 @@ BOOL match_token(const char *haystack, const char *needle) /* Determining if an X device is a Tablet style device is an imperfect science. ** We rely on common conventions around device names as well as the type reported ** by Wacom tablets. This code will likely need to be expanded for alternate tablet types +** +** Wintab refers to any device that interacts with the tablet as a cursor, +** (stylus, eraser, tablet mouse, airbrush, etc) +** this is not to be confused with wacom x11 configuration "cursor" device. +** Wacoms x11 config "cursor" refers to its device slot (which we mirror with +** our gSysCursors) for puck like devices (tablet mice essentially). */ static BOOL is_tablet_cursor(const char *name, const char *type)

1 0

Alexandre Julliard : ntdll: Add some sanity checks for invalid relocation blocks.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: stable Commit: c1a8456d426673a88cee47b5ac0dbaf25302295c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a8456d426673a88cee47b5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 30 12:51:35 2008 +0200 ntdll: Add some sanity checks for invalid relocation blocks. (cherry picked from commit 8e5f28127644344247056337a4eeca71f0e43322) --- dlls/ntdll/virtual.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f14085d..ef97eb2 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1107,8 +1107,14 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz rel = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress); end = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress + relocs->Size); - while (rel < end && rel->SizeOfBlock) + while (rel <= end - 1 && rel->SizeOfBlock) { + if (rel->VirtualAddress >= total_size) + { + WARN_(module)( "invalid address %p in relocation %p\n", ptr + rel->VirtualAddress, rel ); + status = STATUS_ACCESS_VIOLATION; + goto error; + } rel = LdrProcessRelocationBlock( ptr + rel->VirtualAddress, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta );

1 0

Mikołaj Zalewski : kernel32: Improve Esperanto locale definition.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: stable Commit: 3a17e32143d228dd1bf1a2f81fc467fba00f067a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a17e32143d228dd1bf1a2f81… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Jun 21 14:32:50 2008 +0200 kernel32: Improve Esperanto locale definition. (cherry picked from commit dfe4747b1e0dcbb8541c820f58daf73d846a2ade) --- dlls/kernel32/nls/eox.nls | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls index 4b263d8..cf4ec56 100644 --- a/dlls/kernel32/nls/eox.nls +++ b/dlls/kernel32/nls/eox.nls @@ -37,14 +37,15 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT { - LOCALE_FONTSIGNATURE L"" + /* FIXME: .NET 2.0 requires a font signature - English (US) signature added */ + LOCALE_FONTSIGNATURE L"\x00af\x8000\x38cb\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x8000\x01ff\x003f\x8000\xffff" LOCALE_ICALENDARTYPE L"1" LOCALE_ICENTURY L"0" - LOCALE_ICOUNTRY L"" + LOCALE_ICOUNTRY L"0" LOCALE_ICURRDIGITS L"2" LOCALE_ICURRENCY L"3" LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"" + LOCALE_IDAYLZERO L"0" LOCALE_IDEFAULTANSICODEPAGE L"0" LOCALE_IDEFAULTCODEPAGE L"1" LOCALE_IDEFAULTCOUNTRY L"" @@ -113,15 +114,15 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_SENGCOUNTRY L"" LOCALE_SENGCURRNAME L"Euro" LOCALE_SENGLANGUAGE L"Esperanto" - LOCALE_SGROUPING L"0;0" - LOCALE_SINTLSYMBOL L"EMU" + LOCALE_SGROUPING L"3;0" + LOCALE_SINTLSYMBOL L"EUR" LOCALE_SISO3166CTRYNAME L"" LOCALE_SISO639LANGNAME L"eo" LOCALE_SLANGUAGE L"Esperanto" LOCALE_SLIST L";" LOCALE_SLONGDATE L"ddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP L"," - LOCALE_SMONGROUPING L"" + LOCALE_SMONGROUPING L"3;0" LOCALE_SMONTHNAME1 L"januaro" LOCALE_SMONTHNAME2 L"februaro" LOCALE_SMONTHNAME3 L"marto"

1 0

Alexandre Julliard : ntdll: Force execute permission again on the stack after clearing it.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: stable Commit: 02a161cf782dd75ade150454313535e9508f7b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a161cf782dd75ade1504543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 26 21:10:57 2008 +0200 ntdll: Force execute permission again on the stack after clearing it. (cherry picked from commit 58d076b419c2b5ae01fd37ebcf95da9063103687) --- dlls/ntdll/loader.c | 6 +----- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/virtual.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c05e01f..5d47b19 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2423,11 +2423,7 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); if (status != STATUS_SUCCESS) goto error; - /* clear the stack contents before calling the main entry point, some broken apps need that */ - wine_anon_mmap( NtCurrentTeb()->Tib.StackLimit, - (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit, - PROT_READ | PROT_WRITE, MAP_FIXED ); - + virtual_clear_thread_stack(); if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) VIRTUAL_UseLargeAddressSpace(); return; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index cba9643..6f428e0 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -134,6 +134,7 @@ extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] /* virtual memory */ extern NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T stack_size ); +extern void virtual_clear_thread_stack(void); extern BOOL virtual_handle_stack_fault( void *addr ); extern NTSTATUS VIRTUAL_HandleFault(LPCVOID addr); extern void VIRTUAL_SetForceExec( BOOL enable ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5977300..f14085d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1243,6 +1243,21 @@ done: /*********************************************************************** + * virtual_clear_thread_stack + * + * Clear the stack contents before calling the main entry point, some broken apps need that. + */ +void virtual_clear_thread_stack(void) +{ + void *stack = NtCurrentTeb()->Tib.StackLimit; + size_t size = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + + wine_anon_mmap( stack, size, PROT_READ | PROT_WRITE, MAP_FIXED ); + if (force_exec_prot) mprotect( stack, size, PROT_READ | PROT_WRITE | PROT_EXEC ); +} + + +/*********************************************************************** * VIRTUAL_HandleFault */ NTSTATUS VIRTUAL_HandleFault( LPCVOID addr )

1 0

Alexandre Julliard : winex11: Check for matching pixel format in wglMakeCurrent.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: stable Commit: 8f82a3988d824af5d63937e94fa6b4bbafe36ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f82a3988d824af5d63937e94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 18 20:10:47 2008 +0200 winex11: Check for matching pixel format in wglMakeCurrent. (cherry picked from commit 815baba090b79cab4a3ceff5fa248bda1f7c8e8c) --- dlls/opengl32/tests/opengl.c | 28 ++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 46ded06..e72d1a0 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -265,6 +265,33 @@ static void test_setpixelformat(HDC winhdc) } } +static void test_makecurrent(HDC winhdc) +{ + BOOL ret; + HGLRC hglrc; + HDC hdc; + + hdc = GetDC(0); + ok( hdc != 0, "GetDC(0) failed\n" ); + + hglrc = wglCreateContext(winhdc); + ok( hglrc != 0, "wglCreateContext failed\n" ); + + ret = wglMakeCurrent( winhdc, hglrc ); + ok( ret, "wglMakeCurrent failed\n" ); + + ok( wglGetCurrentContext() == hglrc, "wrong context\n" ); + + SetLastError( 0xdeadbeef ); + ret = wglMakeCurrent( hdc, hglrc ); + ok( !ret, "wglMakeCurrent succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PIXEL_FORMAT, "last error %u\n", GetLastError() ); + + ok( wglGetCurrentContext() == hglrc, "wrong context\n" ); + + ReleaseDC( 0, hdc ); +} + static void test_colorbits(HDC hdc) { const int iAttribList[] = { WGL_COLOR_BITS_ARB, WGL_RED_BITS_ARB, WGL_GREEN_BITS_ARB, @@ -437,6 +464,7 @@ START_TEST(opengl) ok(res, "wglMakeCurrent failed!\n"); init_functions(); + test_makecurrent(hdc); test_setpixelformat(hdc); test_colorbits(hdc); test_gdi_dbuf(hdc); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 393c11a..b6e88ea 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1754,6 +1754,7 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { BOOL ret; HDC hdc = physDev->hdc; DWORD type = GetObjectType(hdc); + Wine_GLContext *ctx = (Wine_GLContext *) hglrc; TRACE("(%p,%p)\n", hdc, hglrc); @@ -1766,8 +1767,12 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { if (hglrc == NULL) { ret = pglXMakeCurrent(gdi_display, None, NULL); NtCurrentTeb()->glContext = NULL; + } else if (ctx->fmt->iPixelFormat != physDev->current_pf) { + WARN( "mismatched pixel format hdc %p %u ctx %p %u\n", + hdc, physDev->current_pf, ctx, ctx->fmt->iPixelFormat ); + SetLastError( ERROR_INVALID_PIXEL_FORMAT ); + ret = FALSE; } else { - Wine_GLContext *ctx = (Wine_GLContext *) hglrc; Drawable drawable = get_glxdrawable(physDev); if (ctx->ctx == NULL) { /* The describe lines below are for debugging purposes only */

1 0