May 2010 - Wine-Commits - list.winehq.org

David Adam : d3drm: Remove a useless include.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 6448987253cc04c0786c0b48634f7228beee7139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6448987253cc04c0786c0b486… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun May 23 05:24:44 2010 +0200 d3drm: Remove a useless include. --- dlls/d3drm/d3drm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index a14226c..30d2a4a 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -26,7 +26,6 @@ #include "wingdi.h" #include "d3drm_private.h" -#include "d3drm.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm);

1 0

Henri Verbeet : wined3d: Set the nvidia_texture_shader. c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 31d1417ca3cc552e857b2598f9b635fcfbd2e09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d1417ca3cc552e857b2598f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 24 09:56:37 2010 +0200 wined3d: Set the nvidia_texture_shader.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/nvidia_texture_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 3587db9..d22989d 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION stateblock->device->adapter->gl_info +#define GLINFO_LOCATION (*gl_info) /* GL locking for state handlers is done by the caller. */ @@ -137,7 +137,6 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEX GLenum portion = is_alpha ? GL_ALPHA : GL_RGB; GLenum target = GL_COMBINER0_NV + stage; GLenum output; - IWineD3DStateBlockImpl *stateblock = This->stateBlock; /* For GLINFO_LOCATION */ TRACE("stage %d, is_alpha %d, op %s, arg1 %#x, arg2 %#x, arg3 %#x, texture_idx %d\n", stage, is_alpha, debug_d3dtop(op), arg1, arg2, arg3, texture_idx); @@ -579,6 +578,7 @@ static void nvts_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, str { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); DWORD mapped_stage = stateblock->device->texUnitMap[stage + 1]; + const struct wined3d_gl_info *gl_info = context->gl_info; float mat[2][2]; /* Direct3D sets the matrix in the stage reading the perturbation map. The result is used to @@ -587,7 +587,7 @@ static void nvts_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, str * map is read from a specified source stage(always stage - 1 for d3d). Thus set the matrix * for stage + 1. Keep the nvrc tex unit mapping in mind too */ - if (mapped_stage < context->gl_info->limits.textures) + if (mapped_stage < gl_info->limits.textures) { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage))"); @@ -606,6 +606,7 @@ static void nvts_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, str static void nvrc_texfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; float col[4]; D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_TEXTUREFACTOR], col); GL_EXTCALL(glCombinerParameterfvNV(GL_CONSTANT_COLOR0_NV, &col[0]));

1 0

Alexandre Julliard : winex11: Allow the Xft configuration to override both registry and fontconfig parameters .
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: c30688c4d2e265216e4a30a809b6116e23297648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30688c4d2e265216e4a30a80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 12:34:55 2010 +0200 winex11: Allow the Xft configuration to override both registry and fontconfig parameters. --- dlls/winex11.drv/xrender.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 087da2b..b13f2e4 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -964,6 +964,30 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) pFcPatternDestroy( pattern ); } #endif /* SONAME_LIBFONTCONFIG */ + + /* now check Xft resources */ + { + char *value; + BOOL antialias = TRUE; + + wine_tsx11_lock(); + if ((value = XGetDefault( gdi_display, "Xft", "antialias" ))) + { + if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || + value[0] == '0' || !strcasecmp( value, "off" )) + antialias = FALSE; + } + if ((value = XGetDefault( gdi_display, "Xft", "rgba" ))) + { + TRACE( "Xft resource returned rgba '%s' antialias %u\n", value, antialias ); + if (!strcmp( value, "rgb" )) entry->aa_default = AA_RGB; + else if (!strcmp( value, "bgr" )) entry->aa_default = AA_BGR; + else if (!strcmp( value, "vrgb" )) entry->aa_default = AA_VRGB; + else if (!strcmp( value, "vbgr" )) entry->aa_default = AA_VBGR; + else if (!strcmp( value, "none" )) entry->aa_default = antialias ? AA_Grey : AA_None; + } + wine_tsx11_unlock(); + } } else entry->aa_default = AA_None;

1 0

Austin English : usp10/tests: Check return value of SelectObject.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 21dac9f6cd47ca66a1a9c203bbd0086e7a07f4d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21dac9f6cd47ca66a1a9c203b… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 03:45:33 2010 -0500 usp10/tests: Check return value of SelectObject. --- dlls/usp10/tests/usp10.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 41c9035..e47d7c5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1734,6 +1734,7 @@ START_TEST(usp10) lf.lfWidth = 10; hfont = SelectObject(hdc, CreateFontIndirectA(&lf)); + ok(hfont != NULL, "SelectObject failed: %p\n", hfont); test_ScriptItemize(); test_ScriptItemIzeShapePlace(hdc,pwOutGlyphs);

1 0

Austin English : user32: Add test for drop down width in test_changesize().
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 8ee8806773f7d6b883991b7514f0ae5fc6f672ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee8806773f7d6b883991b751… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 02:25:13 2010 -0500 user32: Add test for drop down width in test_changesize(). --- dlls/user32/tests/combo.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index faf2145..b7fa63f 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -384,6 +384,8 @@ static void test_changesize( DWORD style) rc.right - rc.left, clwidth - 2); ok( rc.bottom - rc.top == ddheight, "drop-down rect height is %d vs %d\n", rc.bottom - rc.top, ddheight); + ok( rc.right - rc.left == ddwidth -2, "drop-down rect width is %d vs %d\n", + rc.right - rc.left, ddwidth - 2); /* new cx, cy is slightly bigger than the initial values */ MoveWindow( hCombo, 10, 10, clwidth + 2, clheight + 2, TRUE); GetClientRect( hCombo, &rc);

1 0

Austin English : gdi32/tests: Use ret in test_CreateFontIndirect().
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 00ddfc804aaf11f5e9f3120fc998fedd0a902e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ddfc804aaf11f5e9f3120fc… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 03:35:07 2010 -0500 gdi32/tests: Use ret in test_CreateFontIndirect(). --- dlls/gdi32/tests/font.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 72cf9be..6ef98c8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3095,7 +3095,9 @@ static void test_CreateFontIndirect(void) lstrcpyA(lf.lfFaceName, TestName[i]); hfont = CreateFontIndirectA(&lf); ok(hfont != 0, "CreateFontIndirectA failed\n"); + SetLastError(0xdeadbeef); ret = GetObject(hfont, sizeof(getobj_lf), &getobj_lf); + ok(ret, "GetObject failed: %d\n", GetLastError()); ok(lf.lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf.lfItalic, getobj_lf.lfItalic); ok(lf.lfWeight == getobj_lf.lfWeight || broken((SHORT)lf.lfWeight == getobj_lf.lfWeight), /* win9x */

1 0

Austin English : ntdll: Add %gs support for FreeBSD.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 40b3d2ed13f4a90b891527a9ded7a72e8f5aba18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b3d2ed13f4a90b891527a9d… Author: Austin English <austinenglish(a)gmail.com> Date: Sun May 23 21:18:17 2010 -0500 ntdll: Add %gs support for FreeBSD. --- configure | 1 + configure.ac | 1 + dlls/ntdll/signal_x86_64.c | 9 ++++++++- include/config.h.in | 3 +++ 4 files changed, 13 insertions(+), 1 deletions(-) diff --git a/configure b/configure index fe69a20..54573a4 100755 --- a/configure +++ b/configure @@ -5837,6 +5837,7 @@ for ac_header in \ machine/cpu.h \ machine/limits.h \ machine/soundcard.h \ + machine/sysarch.h \ mntent.h \ mpg123.h \ ncurses.h \ diff --git a/configure.ac b/configure.ac index 130291c..4c0cdbe 100644 --- a/configure.ac +++ b/configure.ac @@ -422,6 +422,7 @@ AC_CHECK_HEADERS(\ machine/cpu.h \ machine/limits.h \ machine/soundcard.h \ + machine/sysarch.h \ mntent.h \ mpg123.h \ ncurses.h \ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 3411110..ccea6df 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -28,10 +28,15 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> + #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#ifdef HAVE_MACHINE_SYSARCH_H +# include <machine/sysarch.h> +#endif + #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -2288,8 +2293,10 @@ void signal_init_thread( TEB *teb ) { stack_t ss; -#ifdef __linux__ +#if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); +#elif defined __FreeBSD__ + amd64_set_gsbase( teb ); #else # error Please define setting %gs for your architecture #endif diff --git a/include/config.h.in b/include/config.h.in index 0faf127..5d8806d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -461,6 +461,9 @@ /* Define to 1 if you have the <machine/soundcard.h> header file. */ #undef HAVE_MACHINE_SOUNDCARD_H +/* Define to 1 if you have the <machine/sysarch.h> header file. */ +#undef HAVE_MACHINE_SYSARCH_H + /* Define to 1 if you have the <mach/machine.h> header file. */ #undef HAVE_MACH_MACHINE_H

1 0

Austin English : kernel32/tests: Check return value of alarmThread in test_NamedPipe_2().
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 3fd4f68827de87b97795dc440c59d9ac4a166941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd4f68827de87b97795dc440… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 14:06:32 2010 -0500 kernel32/tests: Check return value of alarmThread in test_NamedPipe_2(). --- dlls/kernel32/tests/pipe.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 5abfd85..f5a56c6 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -804,31 +804,37 @@ static void test_NamedPipe_2(void) trace("test_NamedPipe_2 starting\n"); /* Set up a twenty second timeout */ alarm_event = CreateEvent( NULL, TRUE, FALSE, NULL ); + SetLastError(0xdeadbeef); alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 20000, 0, &alarmThreadId); + ok(alarmThread != NULL, "CreateThread failed: %d\n", GetLastError()); - /* The servers we're about to exercize do try to clean up carefully, - * but to reduce the change of a test failure due to a pipe handle + /* The servers we're about to exercise do try to clean up carefully, + * but to reduce the chance of a test failure due to a pipe handle * leak in the test code, we'll use a different pipe name for each server. */ /* Try server #1 */ + SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain1, (void *)8, 0, &serverThreadId); - ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain1", serverThread); /* Try server #2 */ + SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain2, 0, 0, &serverThreadId); - ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain2", serverThread); /* Try server #3 */ + SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain3, 0, 0, &serverThreadId); - ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain3", serverThread); /* Try server #4 */ + SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain4, 0, 0, &serverThreadId); - ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain4", serverThread); ok(SetEvent( alarm_event ), "SetEvent\n");

1 0

Alexandre Julliard : winex11: Fetch the antialias parameter from fontconfig too.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 4c206326913706788644e8f4ebc11dcede368d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c206326913706788644e8f4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 12:34:28 2010 +0200 winex11: Fetch the antialias parameter from fontconfig too. --- dlls/winex11.drv/xrender.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cc0b2b5..087da2b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -193,6 +193,7 @@ MAKE_FUNCPTR(FcPatternCreate) MAKE_FUNCPTR(FcPatternDestroy) MAKE_FUNCPTR(FcPatternAddInteger) MAKE_FUNCPTR(FcPatternAddString) +MAKE_FUNCPTR(FcPatternGetBool) MAKE_FUNCPTR(FcPatternGetInteger) MAKE_FUNCPTR(FcPatternGetString) static void *fontconfig_handle; @@ -408,6 +409,7 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) LOAD_FUNCPTR(FcPatternDestroy); LOAD_FUNCPTR(FcPatternAddInteger); LOAD_FUNCPTR(FcPatternAddString); + LOAD_FUNCPTR(FcPatternGetBool); LOAD_FUNCPTR(FcPatternGetInteger); LOAD_FUNCPTR(FcPatternGetString); #undef LOAD_FUNCPTR @@ -936,14 +938,17 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) if ((match = pFcFontMatch( NULL, pattern, &result ))) { int rgba; + FcBool antialias; + if (pFcPatternGetBool( match, FC_ANTIALIAS, 0, &antialias ) != FcResultMatch) + antialias = TRUE; if (pFcPatternGetInteger( match, FC_RGBA, 0, &rgba ) == FcResultMatch) { FcChar8 *file; if (pFcPatternGetString( match, FC_FILE, 0, &file ) != FcResultMatch) file = NULL; - TRACE( "fontconfig returned rgba %u for font %s file %s\n", - rgba, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); + TRACE( "fontconfig returned rgba %u antialias %u for font %s file %s\n", + rgba, antialias, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); switch (rgba) { @@ -951,7 +956,7 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) case FC_RGBA_BGR: entry->aa_default = AA_BGR; break; case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break; case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break; - case FC_RGBA_NONE: entry->aa_default = AA_None; break; + case FC_RGBA_NONE: entry->aa_default = antialias ? AA_Grey : AA_None; break; } } pFcPatternDestroy( match );

1 0

Austin English : user32/tests: Check return value of DdeClientTransaction in test_initialisation().
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 5396713c2bed6bd8020013903ffa161277babffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5396713c2bed6bd8020013903… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 03:17:37 2010 -0500 user32/tests: Check return value of DdeClientTransaction in test_initialisation(). --- dlls/user32/tests/dde.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 3a0d656..92bee45 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1447,6 +1447,7 @@ static void test_initialisation(void) res = 0xdeadbeef; DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); + ok(hdata == NULL, "Expected NULL, got %p\n", hdata); ret = DdeGetLastError(client_pid); todo_wine ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret);

1 0