wine-commits April 2006

wine-commits@winehq.org

4 participants
512 discussions

Antonio Codazzi : clock: Esperanto language support.
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: e5def1c39273afb4a8251c88e6e2c22f1449fca9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e5def1c39273afb4a8251c8… Author: Antonio Codazzi <f_sophia(a)libero.it> Date: Sat Apr 1 17:46:33 2006 +0200 clock: Esperanto language support. --- programs/clock/Eo.rc | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ programs/clock/rsrc.rc | 1 + 2 files changed, 49 insertions(+), 0 deletions(-) create mode 100644 programs/clock/Eo.rc diff --git a/programs/clock/Eo.rc b/programs/clock/Eo.rc new file mode 100644 index 0000000..d9b159f --- /dev/null +++ b/programs/clock/Eo.rc @@ -0,0 +1,48 @@ +/* + * Clock (Esperanto resources) + * + * Copyright 2006 Antonio Codazzi + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "&Ecoj" { + MENUITEM "Ana&loga", IDM_ANALOG + MENUITEM "Di�i&ta", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "Ti&paro", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "Se&n titolstango", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "&Sekundoj", IDM_SECONDS + MENUITEM "&Dato", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "&�iam supre", IDM_ONTOP + } + POPUP "Inf&o" { + MENUITEM "&Licenco", IDM_LICENSE + MENUITEM "&SEN GARANTIO...", IDM_NOWARRANTY + MENUITEM "&Pri Horlo�o", IDM_ABOUT + } +} + +STRINGTABLE DISCARDABLE +{ +IDS_CLOCK, "Horlo�o" +} diff --git a/programs/clock/rsrc.rc b/programs/clock/rsrc.rc index 61d07fe..a08d702 100644 --- a/programs/clock/rsrc.rc +++ b/programs/clock/rsrc.rc @@ -26,6 +26,7 @@ #include "Da.rc" #include "De.rc" #include "En.rc" +#include "Eo.rc" #include "Es.rc" #include "Fi.rc" #include "Fr.rc"

1 0

Stefan Dösinger : wined3d: Do not set the mipmap level count every time a texture is used.
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: a7063774b91116e80a28d5ce09d06b0118280fe4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7063774b91116e80a28d5c… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Apr 1 19:34:20 2006 +0200 wined3d: Do not set the mipmap level count every time a texture is used. --- dlls/wined3d/basetexture.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 8d420cf..9938abd 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -275,16 +275,6 @@ HRESULT WINAPI IWineD3DBaseTextureImpl_B /* Bind the texture */ if (This->baseTexture.textureName != 0) { - /* Always need to reset the number of mipmap levels when rebinding as it is - a property of the active texture unit, and another texture may have set it - to a different value */ - if (This->baseTexture.levels > 1) { - TRACE("Setting GL_TEXTURE_MAX_LEVEL to %d\n", This->baseTexture.levels - 1); - glTexParameteri(textureDimensions, GL_TEXTURE_MAX_LEVEL, This->baseTexture.levels - 1); - checkGLcall("glTexParameteri(textureDimensions, GL_TEXTURE_MAX_LEVEL, This->baseTexture.levels)"); - } else { - glTexParameteri(textureDimensions, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - } glBindTexture(textureDimensions, This->baseTexture.textureName); checkGLcall("glBindTexture"); if (isNewTexture) {

1 0

Huw Davies : gdi32: Add tests for 'Small Fonts'.
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: edc34a3cbce4c5d10c2f96bf2605491a52603dd7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=edc34a3cbce4c5d10c2f96b… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Apr 2 19:39:32 2006 +0100 gdi32: Add tests for 'Small Fonts'. --- dlls/gdi/tests/gdiobj.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/gdi/tests/gdiobj.c b/dlls/gdi/tests/gdiobj.c index f9a621b..1fd4154 100644 --- a/dlls/gdi/tests/gdiobj.c +++ b/dlls/gdi/tests/gdiobj.c @@ -202,8 +202,6 @@ static INT CALLBACK find_font_proc(const { LOGFONT *lf = (LOGFONT *)lParam; - trace("found font %s, height %ld\n", elf->lfFaceName, elf->lfHeight); - if (elf->lfHeight == lf->lfHeight && !strcmp(elf->lfFaceName, lf->lfFaceName)) { *lf = *elf; @@ -238,8 +236,14 @@ static void test_bitmap_font_metrics(voi { "Courier", FW_NORMAL, 13, 11, 2, 0, 0, 8, 8 }, { "Courier", FW_NORMAL, 16, 13, 3, 0, 0, 9, 9 }, { "Courier", FW_NORMAL, 20, 16, 4, 0, 0, 12, 12 }, - { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 15 } - /* FIXME: add "Fixedsys", "Terminal", "Small Fonts" */ + { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 15 }, + { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2 }, + { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4 }, + { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13 }, + { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7 }, + { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8 }, + { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9 } + /* FIXME: add "Fixedsys", "Terminal" */ }; HDC hdc; LOGFONT lf;

1 0

qingdoa daoo : msvcrt: Allow environment strings longer than 512 characters .
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: 35a9398ffecba8205156639a32493ea294801fb5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35a9398ffecba8205156639… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Mon Apr 3 00:31:12 2006 -0700 msvcrt: Allow environment strings longer than 512 characters. --- dlls/msvcrt/environ.c | 41 +++++++++++++++++++++++++++++++---------- dlls/msvcrt/tests/environ.c | 22 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 0a49916..c59cd75 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -73,20 +73,28 @@ MSVCRT_wchar_t *_wgetenv(const MSVCRT_wc */ int _putenv(const char *str) { - char name[256], value[512]; - char *dst = name; + char *name, *value; + char *dst; int ret; TRACE("%s\n", str); if (!str) return -1; + + name = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); + if (!name) + return -1; + dst = name; while (*str && *str != '=') *dst++ = *str++; if (!*str++) - return -1; - *dst = '\0'; - dst = value; + { + ret = -1; + goto finish; + } + *dst++ = '\0'; + value = dst; while (*str) *dst++ = *str++; *dst = '\0'; @@ -101,6 +109,9 @@ int _putenv(const char *str) _environ = msvcrt_SnapshotOfEnvironmentA(_environ); if (_wenviron) _wenviron = msvcrt_SnapshotOfEnvironmentW(_wenviron); + +finish: + HeapFree(GetProcessHeap(), 0, name); return ret; } @@ -109,20 +120,27 @@ int _putenv(const char *str) */ int _wputenv(const MSVCRT_wchar_t *str) { - MSVCRT_wchar_t name[256], value[512]; - MSVCRT_wchar_t *dst = name; + MSVCRT_wchar_t *name, *value; + MSVCRT_wchar_t *dst; int ret; TRACE("%s\n", debugstr_w(str)); if (!str) return -1; + name = HeapAlloc(GetProcessHeap(), 0, (strlenW(str) + 1) * sizeof(MSVCRT_wchar_t)); + if (!name) + return -1; + dst = name; while (*str && *str != '=') *dst++ = *str++; if (!*str++) - return -1; - *dst = 0; - dst = value; + { + ret = -1; + goto finish; + } + *dst++ = 0; + value = dst; while (*str) *dst++ = *str++; *dst = 0; @@ -137,5 +155,8 @@ int _wputenv(const MSVCRT_wchar_t *str) _environ = msvcrt_SnapshotOfEnvironmentA(_environ); if (_wenviron) _wenviron = msvcrt_SnapshotOfEnvironmentW(_wenviron); + +finish: + HeapFree(GetProcessHeap(), 0, name); return ret; } diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 87355bc..661a8b5 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -21,6 +21,27 @@ #include "wine/test.h" #include <stdlib.h> +static const char *a_very_long_env_string = + "LIBRARY_PATH=" + "C:/Program Files/GLBasic/Compiler/platform/Win32/Bin/../lib/gcc/mingw32/3.4.2/;" + "C:/Program Files/GLBasic/Compiler/platform/Win32/Bin/../lib/gcc/;" + "/mingw/lib/gcc/mingw32/3.4.2/;" + "/usr/lib/gcc/mingw32/3.4.2/;" + "C:/Program Files/GLBasic/Compiler/platform/Win32/Bin/../lib/gcc/mingw32/3.4.2/../../../../mingw32/lib/mingw32/3.4.2/;" + "C:/Program Files/GLBasic/Compiler/platform/Win32/Bin/../lib/gcc/mingw32/3.4.2/../../../../mingw32/lib/;" + "/mingw/mingw32/lib/mingw32/3.4.2/;" + "/mingw/mingw32/lib/;" + "/mingw/lib/mingw32/3.4.2/;" + "/mingw/lib/;" + "C:/Program Files/GLBasic/Compiler/platform/Win32/Bin/../lib/gcc/mingw32/3.4.2/../../../mingw32/3.4.2/;" + "C:/Program Files/GLBasic/Compiler/platform/Win32/Bin/../lib/gcc/mingw32/3.4.2/../../../;" + "/mingw/lib/mingw32/3.4.2/;" + "/mingw/lib/;" + "/lib/mingw32/3.4.2/;" + "/lib/;" + "/usr/lib/mingw32/3.4.2/;" + "/usr/lib/"; + START_TEST(environ) { ok( _putenv("cat=") == 0, "_putenv failed on deletion of nonexistent environment variable\n" ); @@ -30,6 +51,7 @@ START_TEST(environ) ok( _putenv("=") == -1, "should not accept '=' as input\n" ); ok( _putenv("=dog") == -1, "should not accept '=dog' as input\n" ); + ok( _putenv(a_very_long_env_string) == 0, "_putenv failed for long environment string\n"); ok( getenv("nonexistent") == NULL, "getenv should fail with nonexistent var name\n" ); }

1 0

Marcus Meissner : usp10: Fixed debug output of ScriptItemize.
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: 6a13925a1692fffa82053aa9ae96dd5bb29120fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a13925a1692fffa82053aa… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 2 12:41:02 2006 +0200 usp10: Fixed debug output of ScriptItemize. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c02689d..7299968 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -169,7 +169,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR /* This implementation currently treats the entire string represented in * pwcInChars as a single entity. Hence pcItems will be set to 1. */ - FIXME("%s,%d,%d,%p,%p,%p,%p: semi-stub\n", debugstr_w(pwcInChars), cInChars, cMaxItems, + FIXME("%s,%d,%d,%p,%p,%p,%p: semi-stub\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); if (!pwcInChars || !cInChars || !pItems || cMaxItems < 2)

1 0

Vitaliy Margolen : dinput: Keyboard should be acquired before calling GetDeviceState.
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: bc1440699c071f7fa8d34ef3c65f4653653e3c6d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc1440699c071f7fa8d34ef… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Apr 1 19:55:00 2006 -0700 dinput: Keyboard should be acquired before calling GetDeviceState. --- dlls/dinput/keyboard.c | 3 ++- dlls/dinput/tests/keyboard.c | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 9d6ea8c..03f84c0 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -369,7 +369,8 @@ static HRESULT WINAPI SysKeyboardAImpl_G SysKeyboardImpl *This = (SysKeyboardImpl *)iface; TRACE("(%p)->(%ld,%p)\n", This, len, ptr); - /* Note: device does not need to be acquired */ + if (This->acquired == 0) return DIERR_NOTACQUIRED; + if (len != WINE_DINPUT_KEYBOARD_MAX_KEYS) return DIERR_INVALIDPARAM; diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index dc11f9b..f2a932c 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -66,8 +66,45 @@ const char * get_file_version(const char return version; } -static void keyboard_tests(void) +static void keyboard_tests(DWORD version) { + HRESULT hr; + LPDIRECTINPUT pDI; + LPDIRECTINPUTDEVICE pKeyboard; + HINSTANCE hInstance = GetModuleHandle(NULL); + BYTE kbd_state[256]; + ULONG ref; + + hr = DirectInputCreate(hInstance, version, &pDI, NULL); + ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); + if (FAILED(hr)) return; + + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); + if (FAILED(hr)) + { + IDirectInput_Release(pDI); + return; + } + + hr = IDirectInputDevice_SetDataFormat(pKeyboard, &c_dfDIKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, NULL, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetCooperativeLevel() failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, 10, kbd_state); + ok(hr == DIERR_NOTACQUIRED, "IDirectInputDevice_GetDeviceState(10,) should have failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); + ok(hr == DIERR_NOTACQUIRED, "IDirectInputDevice_GetDeviceState() should have failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_Acquire(pKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, 10, kbd_state); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(10,) should have failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState() failed: %s\n", DXGetErrorString8(hr)); + + ref = IDirectInput_Release(pDI); + ok(!ref, "IDirectInput_Release() reference count = %ld\n", ref); } START_TEST(keyboard) @@ -76,7 +113,7 @@ START_TEST(keyboard) trace("DLL Version: %s\n", get_file_version("dinput.dll")); - keyboard_tests(); + keyboard_tests(0x0700); CoUninitialize(); }

1 0

Alexander N.=?UTF-8?Q?=20S=C3=B8rnes=20?=: regedit: Fix typo in Norwegian resources.
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: 5656fa8f0079a620d8a8beb238f2dc7f85c7d260 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5656fa8f0079a620d8a8beb… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Sat Apr 1 20:45:31 2006 +0200 regedit: Fix typo in Norwegian resources. --- programs/regedit/No.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc index 439c530..7212321 100644 --- a/programs/regedit/No.rc +++ b/programs/regedit/No.rc @@ -1,7 +1,7 @@ /* * Regedit Norwegian Bokm�l resources * - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -79,7 +79,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Oppdate&r\tF5", ID_VIEW_REFRESH END - POPUP "&Favoritters" + POPUP "&Favoritter" BEGIN MENUITEM "Legg til i f&avoritter", ID_FAVORITES_ADDTOFAVORITES MENUITEM "Fje&rn favoritt", ID_FAVORITES_REMOVEFAVORITE

1 0

Alexandre Julliard : x11drv: Get rid of XSync calls on window creation and destruction.
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: e34ccb4c1c3d1c00f144a593ebb2292876bee4d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e34ccb4c1c3d1c00f144a59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 1 14:22:34 2006 +0200 x11drv: Get rid of XSync calls on window creation and destruction. --- dlls/x11drv/window.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index a3fff6f..a7d1410 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -702,8 +702,6 @@ static Window create_whole_window( Displ changes.stack_mode = Below; XConfigureWindow( display, data->whole_window, CWStackMode, &changes ); } - XSync( display, False ); /* FIXME: should not be needed */ - wine_tsx11_unlock(); xim = x11drv_thread_data()->xim; @@ -730,7 +728,6 @@ static void destroy_whole_window( Displa TRACE( "win %p xwin %lx\n", data->hwnd, data->whole_window ); if (thread_data->cursor_window == data->whole_window) thread_data->cursor_window = None; wine_tsx11_lock(); - XSync( gdi_display, False ); /* flush any reference to this drawable in GDI queue */ XDeleteContext( display, data->whole_window, winContext ); if (data->whole_window != DefaultRootWindow(display)) XDestroyWindow( display, data->whole_window );

1 0

Alexandre Julliard : x11drv: Ignore X errors caused by windows being created or deleted.
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: fb8ca46e8286a277403c0cc3188dfc44a97a4b9b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fb8ca46e8286a277403c0cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 1 14:21:31 2006 +0200 x11drv: Ignore X errors caused by windows being created or deleted. --- dlls/x11drv/x11drv.h | 1 + dlls/x11drv/x11drv_main.c | 16 ++++++++++++++++ dlls/x11drv/xrender.c | 6 +++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h index 0ba4fce..d259c86 100644 --- a/dlls/x11drv/x11drv.h +++ b/dlls/x11drv/x11drv.h @@ -538,6 +538,7 @@ extern int managed_mode; extern int private_color_map; extern int copy_default_colors; extern int alloc_system_colors; +extern int xrender_error_base; extern BYTE key_state_table[256]; extern POINT cursor_pos; diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c index 16d0a5c..050ac54 100644 --- a/dlls/x11drv/x11drv_main.c +++ b/dlls/x11drv/x11drv_main.c @@ -37,6 +37,9 @@ #ifdef HAVE_XKB #include <X11/XKBlib.h> #endif +#ifdef HAVE_X11_EXTENSIONS_XRENDER_H +#include <X11/extensions/Xrender.h> +#endif #include "windef.h" #include "winbase.h" @@ -85,6 +88,7 @@ int client_side_antialias_with_render = int copy_default_colors = 128; int alloc_system_colors = 256; DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; +int xrender_error_base = 0; static BOOL desktop_dbl_buf = TRUE; @@ -161,6 +165,18 @@ static const char * const atom_names[NB_ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) { if (event->request_code == X_SetInputFocus && event->error_code == BadMatch) return TRUE; + + /* ignore a number of errors on gdi display caused by creating/destroying windows */ + if (display == gdi_display) + { + if (event->error_code == BadDrawable || event->error_code == BadGC) return TRUE; +#ifdef HAVE_X11_EXTENSIONS_XRENDER_H + if (xrender_error_base) /* check for XRender errors */ + { + if (event->error_code == xrender_error_base + BadPicture) return TRUE; + } +#endif + } return FALSE; } diff --git a/dlls/x11drv/xrender.c b/dlls/x11drv/xrender.c index a782ea5..2068e5b 100644 --- a/dlls/x11drv/xrender.c +++ b/dlls/x11drv/xrender.c @@ -167,7 +167,7 @@ static CRITICAL_SECTION xrender_cs = { & */ void X11DRV_XRender_Init(void) { - int error_base, event_base, i; + int event_base, i; XRenderPictFormat pf; if (client_side_with_render && @@ -200,9 +200,9 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureT wine_tsx11_lock(); - if(pXRenderQueryExtension(gdi_display, &event_base, &error_base)) { + if(pXRenderQueryExtension(gdi_display, &event_base, &xrender_error_base)) { X11DRV_XRender_Installed = TRUE; - TRACE("Xrender is up and running error_base = %d\n", error_base); + TRACE("Xrender is up and running error_base = %d\n", xrender_error_base); screen_format = pXRenderFindVisualFormat(gdi_display, visual); if(!screen_format) {

1 0

lostwages/wwn wn20060402_310.xml
by WineHQ 03 Apr '06

03 Apr '06

ChangeSet ID: 23914 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/04/03 00:16:19 Modified files: wwn : wn20060402_310.xml Log message: Correctly attribute some quotes in WWN #310 Patch: http://cvs.winehq.org/patch.py?id=23914 Old revision New revision Changes Path 1.1 1.2 +3 -2 lostwages/wwn/wn20060402_310.xml Index: lostwages/wwn/wn20060402_310.xml diff -u -p lostwages/wwn/wn20060402_310.xml:1.1 lostwages/wwn/wn20060402_310.xml:1.2 --- lostwages/wwn/wn20060402_310.xml:1.1 3 Apr 2006 5:16:19 -0000 +++ lostwages/wwn/wn20060402_310.xml 3 Apr 2006 5:16:19 -0000 @@ -194,7 +194,8 @@ interested to hear your feedback on this that bit in next thread. The other issue that provoked discussion concerned copyrights. Here's my theory: there's no better way to get a bunch of software developers to care about law than to mention licenses or copyrights. -Two comments stand out (keeping in mind IANAL nor do I play one on TV): +Two comments stand out (keeping in mind IANAL nor do I play one on TV), the +first from Scott Ritchie: <quote who="Scott Ritchie"> Fortunately, in order to enforce the license they don't really need @@ -203,7 +204,7 @@ portions of the useful stuff. Heck, Ale could probably be enough code to cover virtually the entire project. </quote> -And: +And the second from Kai Blin: <quote who="Kai Blin"> I'm still unsure about this "assigning the copyright to someone else" thing. I'm living in the EU, where the copyright is split into "usage

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2006