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

Hans Leidekker : winhttp: Add a stub implementation for WinHttpSetTimeouts.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: fcb0e3a9d11c074bce9c98a45fa08cbf366e6df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb0e3a9d11c074bce9c98a45… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 20 11:35:15 2008 +0200 winhttp: Add a stub implementation for WinHttpSetTimeouts. --- dlls/winhttp/session.c | 9 +++++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8cbcb5d..39f9be1 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -394,6 +394,15 @@ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback( HINTERNET handle, WINHT return ret; } +/*********************************************************************** + * WinHttpSetTimeouts (winhttp.@) + */ +BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int send, int receive ) +{ + FIXME("%p, %d, %d, %d, %d\n", handle, resolve, connect, send, receive); + return TRUE; +} + static const WCHAR wkday[7][4] = {{'S','u','n', 0}, {'M','o','n', 0}, {'T','u','e', 0}, {'W','e','d', 0}, {'T','h','u', 0}, {'F','r','i', 0}, {'S','a','t', 0}}; diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 08e4d93..eadc07e 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -25,7 +25,7 @@ @ stdcall WinHttpSetDefaultProxyConfiguration(ptr long long wstr ptr ptr) @ stdcall WinHttpSetOption(ptr long ptr long) @ stdcall WinHttpSetStatusCallback(ptr ptr long ptr) -@ stub WinHttpSetTimeouts +@ stdcall WinHttpSetTimeouts(ptr long long long long) @ stdcall WinHttpTimeFromSystemTime(ptr ptr) @ stdcall WinHttpTimeToSystemTime(wstr ptr) @ stdcall WinHttpWriteData(ptr ptr long ptr)

1 0

Vincent Povirk : user32: Implement TPM_*ALIGN flags.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 743b5730f561f07b97edda0f3fa5cdb51a5398c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743b5730f561f07b97edda0f3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 18 12:16:48 2008 -0500 user32: Implement TPM_*ALIGN flags. --- dlls/user32/menu.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index b4c1955..058cf0f 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1767,7 +1767,7 @@ UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd, * * Display a popup menu. */ -static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, +static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, INT x, INT y, INT xanchor, INT yanchor ) { POPUPMENU *menu; @@ -1803,6 +1803,13 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, monitor = MonitorFromPoint( pt, MONITOR_DEFAULTTONEAREST ); info.cbSize = sizeof(info); GetMonitorInfoW( monitor, &info ); + + if( flags & TPM_RIGHTALIGN ) x -= width; + if( flags & TPM_CENTERALIGN ) x -= width / 2; + + if( flags & TPM_BOTTOMALIGN ) y -= height; + if( flags & TPM_VCENTERALIGN ) y -= height / 2; + if( x + width > info.rcWork.right) { if( xanchor && x >= width - xanchor ) @@ -2390,7 +2397,7 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu, } } - MENU_ShowPopup( hwndOwner, item->hSubMenu, menu->FocusedItem, + MENU_ShowPopup( hwndOwner, item->hSubMenu, menu->FocusedItem, 0, rect.left, rect.top, rect.right, rect.bottom ); if (selectFirst) MENU_MoveSelection( hwndOwner, item->hSubMenu, ITEM_NEXT ); @@ -3410,7 +3417,7 @@ BOOL WINAPI TrackPopupMenu( HMENU hMenu, UINT wFlags, INT x, INT y, if (!(wFlags & TPM_NONOTIFY)) SendMessageW( hWnd, WM_INITMENUPOPUP, (WPARAM)hMenu, 0); - if (MENU_ShowPopup( hWnd, hMenu, 0, x, y, 0, 0 )) + if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, lpRect ); MENU_ExitTracking(hWnd);

1 0

Hans Leidekker : winhttp: Implement WinHttpAddRequestHeaders.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 8f1d818bf3b48fa7f430e165706fc45a73b33f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1d818bf3b48fa7f430e1657… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 20 11:35:39 2008 +0200 winhttp: Implement WinHttpAddRequestHeaders. --- dlls/winhttp/Makefile.in | 1 + dlls/winhttp/main.c | 12 -- dlls/winhttp/request.c | 320 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/session.c | 2 +- dlls/winhttp/tests/winhttp.c | 15 +- dlls/winhttp/winhttp_private.h | 9 +- 6 files changed, 336 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f1d818bf3b48fa7f430e…

1 0

Hans Leidekker : winhttp: Deliver status notifications to the application.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 6b9f60da792141decb07c1c38de3e807f52901b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b9f60da792141decb07c1c38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 20 11:34:34 2008 +0200 winhttp: Deliver status notifications to the application. --- dlls/winhttp/session.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index eb2c71f..8cbcb5d 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -39,7 +39,9 @@ static void set_last_error( DWORD error ) void send_callback( object_header_t *hdr, DWORD status, LPVOID info, DWORD buflen ) { - FIXME("%p, %u, %p, %u\n", hdr, status, info, buflen); + TRACE("%p, %u, %p, %u\n", hdr, status, info, buflen); + + if (hdr->notify_mask & status) hdr->callback( hdr->handle, hdr->context, status, info, buflen ); } /***********************************************************************

1 0

Austin English : user32: Test what FindWindow does when window isn't found.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: f8cd30e9e1d05fcd7cad4600649848ea6d7ebc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8cd30e9e1d05fcd7cad46006… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 15 12:13:13 2008 -0500 user32: Test what FindWindow does when window isn't found. --- dlls/user32/tests/win.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 9ac29b8..1964e88 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4786,8 +4786,11 @@ static void test_hwnd_message(void) found = FindWindowExA( 0, 0, 0, "message window" ); ok( found == hwnd, "didn't find message window %p/%p\n", found, hwnd ); + SetLastError(0xdeadbeef); found = FindWindowExA( GetDesktopWindow(), 0, 0, "message window" ); ok( found == 0, "found message window %p/%p\n", found, hwnd ); + todo_wine + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); if (parent) { found = FindWindowExA( parent, 0, 0, "message window" );

1 0

Roy Shea : mstask/test: Conformance test for (Set|Get)ApplicationName.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 32354497f73703657de85f04532ea3093585ac68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32354497f73703657de85f045… Author: Roy Shea <royshea(a)gmail.com> Date: Tue Aug 19 14:58:53 2008 -0700 mstask/test: Conformance test for (Set|Get)ApplicationName. --- dlls/mstask/tests/Makefile.in | 1 + dlls/mstask/tests/task.c | 210 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 211 insertions(+), 0 deletions(-) diff --git a/dlls/mstask/tests/Makefile.in b/dlls/mstask/tests/Makefile.in index 9a261e7..c1206d9 100644 --- a/dlls/mstask/tests/Makefile.in +++ b/dlls/mstask/tests/Makefile.in @@ -6,6 +6,7 @@ TESTDLL = mstask.dll IMPORTS = ole32 kernel32 CTESTS = \ + task.c \ task_scheduler.c @MAKE_TEST_RULES@ diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c new file mode 100644 index 0000000..708c5a3 --- /dev/null +++ b/dlls/mstask/tests/task.c @@ -0,0 +1,210 @@ +/* + * Test suite for Task interface + * + * Copyright (C) 2008 Google (Roy Shea) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "corerror.h" +#include "mstask.h" +#include "wine/test.h" + +static ITaskScheduler *test_task_scheduler; +static ITask *test_task; +static const WCHAR empty[] = {0}; + +/* allocate some tmp string space */ +/* FIXME: this is not 100% thread-safe */ +static char *get_tmp_space(int size) +{ + static char *list[16]; + static long pos; + char *ret; + int idx; + + idx = ++pos % (sizeof(list)/sizeof(list[0])); + if ((ret = realloc(list[idx], size))) + list[idx] = ret; + return ret; +} + +static const char *dbgstr_w(LPCWSTR str) +{ + char *buf; + int len; + if(!str) + return "(null)"; + len = lstrlenW(str) + 1; + buf = get_tmp_space(len); + WideCharToMultiByte(CP_ACP, 0, str, -1, buf, len, NULL, NULL); + return buf; +} + +static BOOL setup_task(void) +{ + HRESULT hres; + const WCHAR task_name[] = {'T','e','s','t','i','n','g', 0}; + + hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **) &test_task_scheduler); + if(hres != S_OK) + return FALSE; + hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown**)&test_task); + if(hres != S_OK) + { + ITaskScheduler_Release(test_task_scheduler); + return FALSE; + } + return TRUE; +} + +static void cleanup_task(void) +{ + ITask_Release(test_task); + ITaskScheduler_Release(test_task_scheduler); +} + +static LPCWSTR path_resolve_name(LPCWSTR base_name) +{ + static WCHAR buffer[MAX_PATH]; + int len; + + len = SearchPathW(NULL, base_name, NULL, 0, NULL, NULL); + if (len == 0) + return base_name; + else if (len < MAX_PATH) + { + SearchPathW(NULL, base_name, NULL, MAX_PATH, buffer, NULL); + return buffer; + } + return NULL; +} + +static void test_SetApplicationName_GetApplicationName(void) +{ + BOOL setup; + HRESULT hres; + LPWSTR stored_name; + LPCWSTR full_name; + const WCHAR non_application_name[] = {'N','o','S','u','c','h', + 'A','p','p','l','i','c','a','t','i','o','n', 0}; + const WCHAR notepad_exe[] = { + 'n','o','t','e','p','a','d','.','e','x','e', 0}; + const WCHAR notepad[] = {'n','o','t','e','p','a','d', 0}; + + setup = setup_task(); + ok(setup, "Failed to setup test_task\n"); + if (!setup) + { + skip("Failed to create task. Skipping tests.\n"); + return; + } + + /* Attempt getting before setting application name */ + hres = ITask_GetApplicationName(test_task, &stored_name); + todo_wine ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(stored_name, empty), + "Got %s, expected empty string\n", dbgstr_w(stored_name)); + CoTaskMemFree(stored_name); + } + + /* Set application name to a non-existent application and then get + * the application name that is actually stored */ + hres = ITask_SetApplicationName(test_task, non_application_name); + todo_wine ok(hres == S_OK, "Failed setting name %s: %08x\n", + dbgstr_w(non_application_name), hres); + hres = ITask_GetApplicationName(test_task, &stored_name); + todo_wine ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + if (hres == S_OK) + { + full_name = path_resolve_name(non_application_name); + todo_wine ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + dbgstr_w(stored_name), dbgstr_w(full_name)); + CoTaskMemFree(stored_name); + } + + /* Set a valid application name with program type extension and then + * get the stored name */ + hres = ITask_SetApplicationName(test_task, notepad_exe); + todo_wine ok(hres == S_OK, "Failed setting name %s: %08x\n", + dbgstr_w(notepad_exe), hres); + hres = ITask_GetApplicationName(test_task, &stored_name); + todo_wine ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + if (hres == S_OK) + { + full_name = path_resolve_name(notepad_exe); + todo_wine ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + dbgstr_w(stored_name), dbgstr_w(full_name)); + CoTaskMemFree(stored_name); + } + + /* Set a valid application name without program type extension and + * then get the stored name */ + hres = ITask_SetApplicationName(test_task, notepad); + todo_wine ok(hres == S_OK, "Failed setting name %s: %08x\n", dbgstr_w(notepad), hres); + hres = ITask_GetApplicationName(test_task, &stored_name); + todo_wine ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + if (hres == S_OK) + { + full_name = path_resolve_name(notepad); + todo_wine ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + dbgstr_w(stored_name), dbgstr_w(full_name)); + CoTaskMemFree(stored_name); + } + + /* After having a valid application name set, set application name + * to a non-existant application and then get the name that is + * actually stored */ + hres = ITask_SetApplicationName(test_task, non_application_name); + todo_wine ok(hres == S_OK, "Failed setting name %s: %08x\n", + dbgstr_w(non_application_name), hres); + hres = ITask_GetApplicationName(test_task, &stored_name); + todo_wine ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + if (hres == S_OK) + { + full_name = path_resolve_name(non_application_name); + todo_wine ok(!lstrcmpW(stored_name, full_name), "Got %s, expected %s\n", + dbgstr_w(stored_name), dbgstr_w(full_name)); + CoTaskMemFree(stored_name); + } + + /* Clear application name */ + hres = ITask_SetApplicationName(test_task, empty); + todo_wine ok(hres == S_OK, "Failed setting name %s: %08x\n", dbgstr_w(empty), hres); + hres = ITask_GetApplicationName(test_task, &stored_name); + todo_wine ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(stored_name, empty), + "Got %s, expected empty string\n", dbgstr_w(stored_name)); + CoTaskMemFree(stored_name); + } + + cleanup_task(); + return; +} + +START_TEST(task) +{ + CoInitialize(NULL); + test_SetApplicationName_GetApplicationName(); + CoUninitialize(); +}

1 0

Stefan Dösinger : ddraw: Set the bitdepth on YUV formats.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: a950d3a10e8ab3ebef38fc801fe9af39d177fb70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a950d3a10e8ab3ebef38fc801… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 1 13:37:56 2008 -0500 ddraw: Set the bitdepth on YUV formats. --- dlls/ddraw/utils.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 2c08328..5d96b36 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -249,6 +249,11 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, case WINED3DFMT_UYVY: case WINED3DFMT_YUY2: + DDPixelFormat->u1.dwYUVBitCount = 16; + DDPixelFormat->dwFlags = DDPF_FOURCC; + DDPixelFormat->dwFourCC = WineD3DFormat; + break; + case WINED3DFMT_YV12: case WINED3DFMT_DXT1: case WINED3DFMT_DXT2:

1 0

Stefan Dösinger : wined3d: Fix the unused arg marker.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 8fe6bf0bad060ffe4e27c03ec51e0360221824b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe6bf0bad060ffe4e27c03ec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 5 14:50:56 2008 -0500 wined3d: Fix the unused arg marker. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/utils.c | 5 ++--- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 21eb815..40f33e1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2369,7 +2369,7 @@ static void set_bumpmat_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, W static const char *get_argreg(SHADER_BUFFER *buffer, DWORD argnum, unsigned int stage, DWORD arg) { const char *ret; - if(arg > WINED3DTOP_LERP) return "unused"; /* This is the marker for unused registers */ + if(arg == ARG_UNUSED) return "unused"; /* This is the marker for unused registers */ switch(arg & WINED3DTA_SELECTMASK) { case WINED3DTA_DIFFUSE: diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index d6c133c..8e3ed18 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -153,7 +153,7 @@ static GLuint register_for_arg(DWORD arg, WineD3D_GL_Info *gl_info, unsigned int GLenum ret; if(mod) *mod = GL_NONE; - if(arg == 0xFFFFFFFF) return -1; /* This is the marker for unused registers */ + if(arg == ARG_UNUSED) return -1; /* This is the marker for unused registers */ switch(arg & WINED3DTA_SELECTMASK) { case WINED3DTA_DIFFUSE: diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6f3a447..e56b4b9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1817,9 +1817,8 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting if(stateblock->textureState[i][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE) { settings->op[i].cop = WINED3DTOP_DISABLE; settings->op[i].aop = WINED3DTOP_DISABLE; - /* 0x3F: set all 6 bits of the args to 1 */ - settings->op[i].carg0 = settings->op[i].carg1 = settings->op[i].carg2 = 0x3F; - settings->op[i].aarg0 = settings->op[i].aarg1 = settings->op[i].aarg2 = 0x3F; + settings->op[i].carg0 = settings->op[i].carg1 = settings->op[i].carg2 = ARG_UNUSED; + settings->op[i].aarg0 = settings->op[i].aarg1 = settings->op[i].aarg2 = ARG_UNUSED; settings->op[i].color_correction = WINED3DFMT_UNKNOWN; settings->op[i].dst = resultreg; settings->op[i].tex_type = tex_1d; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e4c6a41..e2b1215 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -760,6 +760,7 @@ enum dst_arg struct texture_stage_op { unsigned cop : 5, aop : 5; +#define ARG_UNUSED 0x3f unsigned carg1 : 6, carg2 : 6, carg0 : 6; unsigned tex_type : 3; unsigned dst : 1; /* Total of 32 bits */

1 0

Stefan Dösinger : wined3d: Keep track of the last used device.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 5d75939b09538444b125d31cf618e8424059097f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d75939b09538444b125d31cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 31 13:29:50 2008 -0500 wined3d: Keep track of the last used device. --- dlls/wined3d/context.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4440848..68ec2a7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -29,6 +29,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION This->adapter->gl_info +/* The last used device. + * + * If the application creates multiple devices and switches between them, ActivateContext has to + * change the opengl context. This flag allows to keep track which device is active + */ +static IWineD3DDeviceImpl *last_device; + /***************************************************************************** * Context_MarkStateDirty * @@ -562,6 +569,8 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar */ if(oldDrawable && oldCtx) { pwglMakeCurrent(oldDrawable, oldCtx); + } else { + last_device = This; } This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); @@ -627,6 +636,8 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { TRACE("Destroying ctx %p\n", context); if(pwglGetCurrentContext() == context->glCtx){ pwglMakeCurrent(NULL, NULL); + } else { + last_device = NULL; } if(context->isPBuffer) { @@ -1125,7 +1136,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU } /* Activate the opengl context */ - if(context != This->activeContext) { + if(last_device != This || context != This->activeContext) { BOOL ret; /* Prevent an unneeded context switch as those are expensive */ @@ -1152,6 +1163,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU sizeof(*This->activeContext->pshader_const_dirty) * GL_LIMITS(pshader_constantsF)); } This->activeContext = context; + last_device = This; } /* We only need ENTER_GL for the gl calls made below and for the helper functions which make GL calls */

1 0

Stefan Dösinger : ddraw: Do not set the rendertarget flag just because of the backbuffer flag.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 90e2a676e80a76d2dfe34119a5733bbd6bbbe88a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e2a676e80a76d2dfe34119a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 31 17:17:27 2008 -0500 ddraw: Do not set the rendertarget flag just because of the backbuffer flag. There are also overlay backbuffers, which aren't render targets. The primarysurface and d3ddevice cap flags should be enough here. --- dlls/ddraw/ddraw.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8eac776..73982ed 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2022,7 +2022,6 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, } /* Get the correct wined3d usage */ if (pDDSD->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | - DDSCAPS_BACKBUFFER | DDSCAPS_3DDEVICE ) ) { Usage |= WINED3DUSAGE_RENDERTARGET;

1 0