November 2015 - Wine-Commits

Sebastian Lackner : maintainers: Add section for timezone database.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 137ca91f47ba637952cf82ef2b33f858f414578b URL: http://source.winehq.org/git/wine.git/?a=commit;h=137ca91f47ba637952cf82ef2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 28 22:00:45 2015 +0100 maintainers: Add section for timezone database. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index b00ee7b..a32c686 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -200,6 +200,10 @@ Threadpool M: Sebastian Lackner <sebastian(a)fds-team.de> F: dlls/ntdll/threadpool.c +Timezone database +M: Sebastian Lackner <sebastian(a)fds-team.de> +F: loader/wine.inf.in + Uniscribe M: Aric Stewart <aric(a)codeweavers.com> F: dlls/usp10/

1 0

Gerald Pfeifer : user32: Avoid shift overflow in nulldrv_GetKeyboardLayoutList.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 1e803cb1df11a2750b2eac26df55907999ca226f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e803cb1df11a2750b2eac26d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Nov 28 22:54:52 2015 +0100 user32: Avoid shift overflow in nulldrv_GetKeyboardLayoutList. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index dbac3ef..201988c 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -216,7 +216,7 @@ static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts ) baselayout = GetUserDefaultLCID(); langid = PRIMARYLANGID(LANGIDFROMLCID(baselayout)); if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - baselayout |= 0xe001 << 16; /* IME */ + baselayout = MAKELONG( baselayout, 0xe001 ); /* IME */ else baselayout |= baselayout << 16;

1 0

Gerald Pfeifer : krnl386.exe16: Avoid shift overflows in DMA_ioport_out.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 99b83bf385cb7ea7ac7ecce756f3c3631e382e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=99b83bf385cb7ea7ac7ecce75… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Nov 28 22:51:18 2015 +0100 krnl386.exe16: Avoid shift overflows in DMA_ioport_out. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dma.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/krnl386.exe16/dma.c b/dlls/krnl386.exe16/dma.c index 6734a25..9a255ce 100644 --- a/dlls/krnl386.exe16/dma.c +++ b/dlls/krnl386.exe16/dma.c @@ -210,13 +210,13 @@ void DMA_ioport_out( WORD port, BYTE val ) case 0x8A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & (~0xFF << 16))|((val & 0xFF) << 16); break; /* Low Page Base Address (only 4 lower bits are significant) */ - case 0x487: DMA_BaseAddress[0]=(DMA_BaseAddress[0] & (~0xFF << 24))|((val & 0x0F) << 24); break; - case 0x483: DMA_BaseAddress[1]=(DMA_BaseAddress[1] & (~0xFF << 24))|((val & 0x0F) << 24); break; - case 0x481: DMA_BaseAddress[2]=(DMA_BaseAddress[2] & (~0xFF << 24))|((val & 0x0F) << 24); break; - case 0x482: DMA_BaseAddress[3]=(DMA_BaseAddress[3] & (~0xFF << 24))|((val & 0x0F) << 24); break; - case 0x48B: DMA_BaseAddress[5]=(DMA_BaseAddress[5] & (~0xFF << 24))|((val & 0x0F) << 24); break; - case 0x489: DMA_BaseAddress[6]=(DMA_BaseAddress[6] & (~0xFF << 24))|((val & 0x0F) << 24); break; - case 0x48A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & (~0xFF << 24))|((val & 0x0F) << 24); break; + case 0x487: DMA_BaseAddress[0]=(DMA_BaseAddress[0] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x483: DMA_BaseAddress[1]=(DMA_BaseAddress[1] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x481: DMA_BaseAddress[2]=(DMA_BaseAddress[2] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x482: DMA_BaseAddress[3]=(DMA_BaseAddress[3] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x48B: DMA_BaseAddress[5]=(DMA_BaseAddress[5] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x489: DMA_BaseAddress[6]=(DMA_BaseAddress[6] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x48A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & (~0xFFu << 24))|((val & 0x0F) << 24); break; case 0x08: case 0xD0:

1 0

Sebastian Lackner : wine.inf: Add information for delayed end of DST in Europe/Istanbul.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: be730c5de2e1cf9a3f0ac0ea880c954a6a51ee9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=be730c5de2e1cf9a3f0ac0ea8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 28 22:00:28 2015 +0100 wine.inf: Add information for delayed end of DST in Europe/Istanbul. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 7773377..58a8d1d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3084,6 +3084,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Display",,"Europe/Istan HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Dlt",,"Turkey Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Std",,"Turkey Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,df,07,0b,00,00,00,08,00,04,00,00,00,00,00,00,00,df,07,03,00,00,00,1d,00,03,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Display",,"Asia/Ulaanbaatar" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Dlt",,"Ulaanbaatar Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Std",,"Ulaanbaatar Standard Time"

1 0

Sebastian Lackner : ntdll: Commit new guard pages in virtual_handle_stack_fault.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 7b66f9f6b475f95aaabdc4c2a2d44fa755ddac06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b66f9f6b475f95aaabdc4c2a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 28 21:28:26 2015 +0100 ntdll: Commit new guard pages in virtual_handle_stack_fault. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 4d4bc3b..d6319d82 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1550,7 +1550,7 @@ BOOL virtual_handle_stack_fault( void *addr ) if ((char *)page >= (char *)NtCurrentTeb()->DeallocationStack + 2*page_size) { vprot = view->prot[((char *)page - page_size - (char *)view->base) >> page_shift]; - VIRTUAL_SetProt( view, (char *)page - page_size, page_size, vprot | VPROT_GUARD ); + VIRTUAL_SetProt( view, (char *)page - page_size, page_size, vprot | VPROT_COMMITTED | VPROT_GUARD ); } ret = TRUE; }

1 0

Hans Leidekker : ieframe: Don't release the advise sink in IOleObject:: SetClientSite.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 10f35222dc8e7184963076a7e8e58ad64651638e URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f35222dc8e7184963076a7e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 30 10:48:04 2015 +0100 ieframe: Don't release the advise sink in IOleObject::SetClientSite. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/oleobject.c | 5 ----- dlls/ieframe/tests/webbrowser.c | 30 ++++++++++++++++++++++++++++++ dlls/ieframe/webbrowser.c | 3 +++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 2d3cac6..1076afe 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -311,11 +311,6 @@ static void release_client_site(WebBrowser *This) IOleInPlaceUIWindow_Release(This->uiwindow); This->uiwindow = NULL; } - - if(This->sink) { - IAdviseSink_Release(This->sink); - This->sink = NULL; - } } typedef struct { diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index c8dfa5b..1617dcb 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -4003,6 +4003,7 @@ static void test_SetAdvise(void) IWebBrowser2 *browser; IViewObject2 *view; IAdviseSink *sink; + IOleObject *oleobj; DWORD aspects, flags; if (!(browser = create_webbrowser())) return; @@ -4031,9 +4032,38 @@ static void test_SetAdvise(void) ok(!flags, "got %08x\n", aspects); ok(sink == &test_sink, "got %p\n", sink); + hr = IWebBrowser2_QueryInterface(browser, &IID_IOleObject, (void **)&oleobj); + ok(hr == S_OK, "got %08x\n", hr); + + SET_EXPECT(GetContainer); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(Invoke_AMBIENT_SILENT); + hr = IOleObject_SetClientSite(oleobj, &ClientSite); + ok(hr == S_OK, "got %08x\n", hr); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_CALLED(Invoke_AMBIENT_SILENT); + + sink = (IAdviseSink *)0xdeadbeef; + hr = IViewObject2_GetAdvise(view, &aspects, &flags, &sink); + ok(hr == S_OK, "got %08x\n", hr); + ok(sink == &test_sink, "got %p\n", sink); + + hr = IOleObject_SetClientSite(oleobj, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + aspects = flags = 0xdeadbeef; + sink = (IAdviseSink *)0xdeadbeef; + hr = IViewObject2_GetAdvise(view, &aspects, &flags, &sink); + ok(hr == S_OK, "got %08x\n", hr); + ok(sink == &test_sink, "got %p\n", sink); + hr = IViewObject2_SetAdvise(view, 0, 0, NULL); ok(hr == S_OK, "got %08x\n", hr); + IOleObject_Release(oleobj); IViewObject2_Release(view); IWebBrowser2_Release(browser); } diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 0378d6b..03acf38 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -167,6 +167,9 @@ static ULONG WINAPI WebBrowser_Release(IWebBrowser2 *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->sink) + IAdviseSink_Release(This->sink); + if(This->doc_host.document) IUnknown_Release(This->doc_host.document);

1 0

Sebastian Lackner : kernel32/tests: Add tests for committing stack guard pages.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 03460408894899b7cb073c8d7e4d7b3a130d7d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=03460408894899b7cb073c8d7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 28 21:28:48 2015 +0100 kernel32/tests: Add tests for committing stack guard pages. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 76 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index e80ba38..e614bde 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2048,6 +2048,81 @@ static void test_guard_page(void) VirtualFree( base, 0, MEM_FREE ); } +static DWORD WINAPI stack_commit_func( void *arg ) +{ + volatile char *p = (char *)&p; + + /* trigger all guard pages, to ensure that the pages are committed */ + while (p >= (char *)pNtCurrentTeb()->DeallocationStack + 3 * 0x1000) + { + p[0] |= 0; + p -= 0x1000; + } + + ok( arg == (void *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", arg ); + return 42; +} + +static void test_stack_commit(void) +{ + static const char code_call_on_stack[] = { + 0x55, /* pushl %ebp */ + 0x56, /* pushl %esi */ + 0x89, 0xe6, /* movl %esp,%esi */ + 0x8b, 0x4c, 0x24, 0x0c, /* movl 12(%esp),%ecx - func */ + 0x8b, 0x54, 0x24, 0x10, /* movl 16(%esp),%edx - arg */ + 0x8b, 0x44, 0x24, 0x14, /* movl 20(%esp),%eax - stack */ + 0x83, 0xe0, 0xf0, /* andl $~15,%eax */ + 0x83, 0xe8, 0x0c, /* subl $12,%eax */ + 0x89, 0xc4, /* movl %eax,%esp */ + 0x52, /* pushl %edx */ + 0x31, 0xed, /* xorl %ebp,%ebp */ + 0xff, 0xd1, /* call *%ecx */ + 0x89, 0xf4, /* movl %esi,%esp */ + 0x5e, /* popl %esi */ + 0x5d, /* popl %ebp */ + 0xc2, 0x0c, 0x00 }; /* ret $12 */ + + DWORD (WINAPI *call_on_stack)( DWORD (WINAPI *func)(void *), void *arg, void *stack ); + void *old_stack, *old_stack_base, *old_stack_limit; + void *new_stack, *new_stack_base; + DWORD result; + + if (!pNtCurrentTeb) + { + win_skip( "NtCurrentTeb not supported\n" ); + return; + } + + call_on_stack = VirtualAlloc( 0, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + ok( call_on_stack != NULL, "VirtualAlloc failed %u\n", GetLastError() ); + memcpy( call_on_stack, code_call_on_stack, sizeof(code_call_on_stack) ); + + /* allocate a new stack, only the first guard page is committed */ + new_stack = VirtualAlloc( 0, 0x400000, MEM_RESERVE, PAGE_READWRITE ); + ok( new_stack != NULL, "VirtualAlloc failed %u\n", GetLastError() ); + new_stack_base = (char *)new_stack + 0x400000; + VirtualAlloc( (char *)new_stack_base - 0x1000, 0x1000, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); + + old_stack = pNtCurrentTeb()->DeallocationStack; + old_stack_base = pNtCurrentTeb()->Tib.StackBase; + old_stack_limit = pNtCurrentTeb()->Tib.StackLimit; + + pNtCurrentTeb()->DeallocationStack = new_stack; + pNtCurrentTeb()->Tib.StackBase = new_stack_base; + pNtCurrentTeb()->Tib.StackLimit = new_stack_base; + + result = call_on_stack( stack_commit_func, (void *)0xdeadbeef, new_stack_base ); + ok( result == 42, "expected 42, got %u\n", result ); + + pNtCurrentTeb()->DeallocationStack = old_stack; + pNtCurrentTeb()->Tib.StackBase = old_stack_base; + pNtCurrentTeb()->Tib.StackLimit = old_stack_limit; + + VirtualFree( new_stack, 0, MEM_FREE ); + VirtualFree( call_on_stack, 0, MEM_FREE ); +} + DWORD num_execute_fault_calls; static DWORD execute_fault_seh_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, @@ -3772,6 +3847,7 @@ START_TEST(virtual) test_write_watch(); #ifdef __i386__ test_guard_page(); + test_stack_commit(); /* The following tests should be executed as a last step, and in exactly this * order, since ATL thunk emulation cannot be enabled anymore on Windows. */ test_atl_thunk_emulation( MEM_EXECUTE_OPTION_ENABLE );

1 0

Dmitry Timoshkov : widl: Fixup the defaultvalue(BSTR) expression type like midl does.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: b53c5b30b2f2c2d8ad21bbb4097b1a63b43136b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53c5b30b2f2c2d8ad21bbb40… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 27 18:00:27 2015 +0800 widl: Fixup the defaultvalue(BSTR) expression type like midl does. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index cb4601e..7b97158 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -35,6 +35,7 @@ #include "header.h" #include "expr.h" #include "typetree.h" +#include "typelib.h" static int indentation = 0; static int is_object_interface = 0; @@ -1009,6 +1010,16 @@ void write_args(FILE *h, const var_list_t *args, const char *name, int method, i /* Output default value only if all following arguments also have default value. */ LIST_FOR_EACH_ENTRY_REV( tail_arg, args, const var_t, entry ) { if(tail_arg == arg) { + expr_t bstr; + + /* Fixup the expression type for a BSTR like midl does. */ + if (get_type_vt(arg->type) == VT_BSTR && expr->type == EXPR_STRLIT) + { + bstr = *expr; + bstr.type = EXPR_WSTRLIT; + expr = &bstr; + } + fprintf(h, " = "); write_expr( h, expr, 0, 1, NULL, NULL, "" ); break;

1 0

Alexandre Julliard : winoldapp: Grab the Win16 lock again before exiting.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 6e6a0e2a2c3df15f8f62216227e3f6f454ba7e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6a0e2a2c3df15f8f6221622… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 30 21:04:16 2015 +0900 winoldapp: Grab the Win16 lock again before exiting. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winoldap.mod16/winoldap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/winoldap.mod16/winoldap.c b/programs/winoldap.mod16/winoldap.c index 410a567..c6342d0 100644 --- a/programs/winoldap.mod16/winoldap.c +++ b/programs/winoldap.mod16/winoldap.c @@ -76,14 +76,13 @@ WORD WINAPI WinMain16( HINSTANCE16 inst, HINSTANCE16 prev, LPSTR cmdline, WORD s if (wait_input_idle( info.hProcess, 10000 ) == WAIT_FAILED) WINE_WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); ReleaseThunkLock( &count ); - WaitForSingleObject( info.hProcess, INFINITE ); + RestoreThunkLock( count ); + GetExitCodeProcess( info.hProcess, &exit_code ); CloseHandle( info.hThread ); CloseHandle( info.hProcess ); } - else - ReleaseThunkLock( &count ); HeapFree( GetProcessHeap(), 0, cmdline ); ExitThread( exit_code );

1 0

Matteo Bruni : wined3d: Flush the GL context before switching away from it.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 6dd054ca587b1d95c324c10383f1f81155ed9ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd054ca587b1d95c324c1038… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 27 20:39:31 2015 +0100 wined3d: Flush the GL context before switching away from it. We might end up not using the old context anymore after that and the GL implementation is allowed to delay executing commands indefinitely if we don't flush. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0e8b32b..5eeccab 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1129,6 +1129,11 @@ BOOL context_set_current(struct wined3d_context *ctx) } else { + if (wglGetCurrentContext()) + { + TRACE("Flushing context %p before switching to %p.\n", old, ctx); + glFlush(); + } old->current = 0; } }

1 0