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

Roderick Colenbrander : wined3d: Raster caps fix.
by Alexandre Julliard Aug. 5, 2006

Aug. 5, 2006

Module: wine Branch: refs/heads/master Commit: 6ded5542b2fed9880d730d21db96ee9ed796b0f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ded5542b2fed9880d730d2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Aug 4 22:42:57 2006 +0200 wined3d: Raster caps fix. --- dlls/wined3d/directx.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 375906b..f621d86 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1726,7 +1726,10 @@ #endif WINED3DPRASTERCAPS_FOGRANGE | WINED3DPRASTERCAPS_STIPPLE | WINED3DPRASTERCAPS_SUBPIXEL | - WINED3DPRASTERCAPS_ZTEST; + WINED3DPRASTERCAPS_ZTEST | + WINED3DPRASTERCAPS_SCISSORTEST | + WINED3DPRASTERCAPS_SLOPESCALEDEPTHBIAS | + WINED3DPRASTERCAPS_DEPTHBIAS; if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC)) { *pCaps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY |

1 0

Roderick Colenbrander : wined3d: Primitive misc caps fix.
by Alexandre Julliard Aug. 5, 2006

Aug. 5, 2006

Module: wine Branch: refs/heads/master Commit: 6fedd6c041bd53b68a785f1e0b0f5e02351679c5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6fedd6c041bd53b68a785f1… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Aug 4 22:37:27 2006 +0200 wined3d: Primitive misc caps fix. --- dlls/wined3d/directx.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fc4cd26..375906b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1692,13 +1692,30 @@ static HRESULT WINAPI IWineD3DImpl_GetDe WINED3DDEVCAPS_DRAWPRIMITIVES2 | WINED3DDEVCAPS_DRAWPRIMITIVES2EX; - *pCaps->PrimitiveMiscCaps = D3DPMISCCAPS_CULLCCW | + *pCaps->PrimitiveMiscCaps = D3DPMISCCAPS_CULLNONE | + D3DPMISCCAPS_CULLCCW | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS | - D3DPMISCCAPS_MASKZ; - /*NOT: D3DPMISCCAPS_TSSARGTEMP*/ + D3DPMISCCAPS_MASKZ | + D3DPMISCCAPS_BLENDOP; + /* TODO: + D3DPMISCCAPS_NULLREFERENCE + D3DPMISCCAPS_INDEPENDENTWRITEMASKS + D3DPMISCCAPS_FOGANDSPECULARALPHA + D3DPMISCCAPS_SEPARATEALPHABLEND + D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS + D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING + D3DPMISCCAPS_FOGVERTEXCLAMPED */ + +/* The caps below can be supported but aren't handled yet in utils.c 'd3dta_to_combiner_input', disable them until support is fixed */ +#if 0 + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) + *pCaps->PrimitiveMiscCaps |= D3DPMISCCAPS_TSSARGTEMP; + if (GL_SUPPORT(NV_REGISTER_COMBINERS2)) + *pCaps->PrimitiveMiscCaps |= D3DPMISCCAPS_PERSTAGECONSTANT; +#endif *pCaps->RasterCaps = WINED3DPRASTERCAPS_DITHER | WINED3DPRASTERCAPS_PAT |

1 0

Kevin Koltzau : setupapi: Create an empty list when getting device interface classes.
by Alexandre Julliard Aug. 5, 2006

Aug. 5, 2006

Module: wine Branch: refs/heads/master Commit: 93f5e0a7fd9c9f741de4a1faaa8a90ed88a36d60 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93f5e0a7fd9c9f741de4a1f… Author: Kevin Koltzau <kevin(a)plop.org> Date: Fri Aug 4 16:31:59 2006 -0400 setupapi: Create an empty list when getting device interface classes. --- dlls/setupapi/devinst.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 50d17e5..30ed085 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1013,7 +1013,18 @@ HDEVINFO WINAPI SetupDiGetClassDevsW( TRACE("%s %s %p 0x%08lx\n", debugstr_guid(class), debugstr_w(enumstr), parent, flags); - if (enumstr) + if(flags & DIGCF_DEVICEINTERFACE) + { + if(!class) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + /* WinXP always succeeds, returns empty list for unknown classes */ + FIXME(": returning empty list\n"); + ret = SetupDiCreateDeviceInfoList(class, parent); + } + } + else if (enumstr) FIXME(": unimplemented for enumerator strings (%s)\n", debugstr_w(enumstr)); else if (flags & DIGCF_ALLCLASSES) @@ -1045,7 +1056,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW( * SetupDiEnumDeviceInterfaces (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDeviceInterfaces( - HDEVINFO DeviceInfoSet, + HDEVINFO devinfo, PSP_DEVINFO_DATA DeviceInfoData, CONST GUID * InterfaceClassGuid, DWORD MemberIndex, @@ -1053,10 +1064,19 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces( { BOOL ret = FALSE; - FIXME("%p, %p, %s, 0x%08lx, %p\n", DeviceInfoSet, DeviceInfoData, + FIXME("%p, %p, %s, 0x%08lx, %p\n", devinfo, DeviceInfoData, debugstr_guid(InterfaceClassGuid), MemberIndex, DeviceInterfaceData); - SetLastError(ERROR_INVALID_HANDLE); + if (devinfo && devinfo != (HDEVINFO)INVALID_HANDLE_VALUE) + { + struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo; + if (list->magic == SETUP_DEVICE_INFO_SET_MAGIC) + SetLastError(ERROR_NO_MORE_ITEMS); + else + SetLastError(ERROR_INVALID_HANDLE); + } + else + SetLastError(ERROR_INVALID_HANDLE); return ret; }

1 0

Matt Finnicum : riched20: Implement EM_SETPASSWORDCHAR and EM_GETPASSWORDCHAR.
by Alexandre Julliard Aug. 5, 2006

Aug. 5, 2006

Module: wine Branch: refs/heads/master Commit: 2b92bf78d1939cfb785b6911dbb2b8ab1843a527 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b92bf78d1939cfb785b691… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Fri Aug 4 15:47:44 2006 -0400 riched20: Implement EM_SETPASSWORDCHAR and EM_GETPASSWORDCHAR. --- dlls/riched20/editor.c | 28 +++++++++++++++++++++----- dlls/riched20/editor.h | 2 ++ dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 20 +++++++++++++++--- dlls/riched20/run.c | 46 ++++++++++++++++++++++++++++++++++++------ dlls/riched20/string.c | 26 ++++++++++++++++++++++++ dlls/riched20/tests/editor.c | 25 +++++++++++++++++++++++ 7 files changed, 132 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2b92bf78d1939cfb785…

1 0

Dan Hipschman : widl: Replace strdup, malloc and realloc with xstrdup, xmalloc and xrealloc.
by Alexandre Julliard Aug. 5, 2006

Aug. 5, 2006

Module: wine Branch: refs/heads/master Commit: 4961379d7408cc6f080106b0c01e85eb014da17d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4961379d7408cc6f080106b… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Aug 4 11:06:54 2006 -0700 widl: Replace strdup, malloc and realloc with xstrdup, xmalloc and xrealloc. --- tools/widl/widl.c | 12 ++++++------ tools/widl/write_msft.c | 19 ++----------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 152d35f..aac1d5e 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -189,7 +189,7 @@ #endif do_client = 1; break; case 'C': - client_name = strdup(optarg); + client_name = xstrdup(optarg); break; case 'd': debuglevel = strtol(optarg, NULL, 0); @@ -206,7 +206,7 @@ #endif do_header = 1; break; case 'H': - header_name = strdup(optarg); + header_name = xstrdup(optarg); break; case 'I': wpp_add_include_path(optarg); @@ -219,28 +219,28 @@ #endif do_proxies = 1; break; case 'P': - proxy_name = strdup(optarg); + proxy_name = xstrdup(optarg); break; case 's': do_everything = 0; do_server = 1; break; case 'S': - server_name = strdup(optarg); + server_name = xstrdup(optarg); break; case 't': do_everything = 0; do_typelib = 1; break; case 'T': - typelib_name = strdup(optarg); + typelib_name = xstrdup(optarg); break; case 'u': do_everything = 0; do_idfile = 1; break; case 'U': - idfile_name = strdup(optarg); + idfile_name = xstrdup(optarg); break; case 'V': printf(version_string); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 8148a93..cac1f7f 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -362,7 +362,6 @@ static int ctl2_encode_string( * RETURNS * * Success: The offset within the segment of the new data area. - * Failure: -1 (this is invariably an out of memory condition). * * BUGS * @@ -389,8 +388,7 @@ static int ctl2_alloc_segment( char *block; block_size = typelib->typelib_segment_block_length[segment]; - block = realloc(typelib->typelib_segment_data[segment], block_size << 1); - if (!block) return -1; + block = xrealloc(typelib->typelib_segment_data[segment], block_size << 1); if (segment == MSFT_SEG_TYPEINFO) { /* TypeInfos have a direct pointer to their memory space, so we have to fix them up. */ @@ -430,7 +428,6 @@ static int ctl2_alloc_typeinfo( MSFT_TypeInfoBase *typeinfo; offset = ctl2_alloc_segment(typelib, MSFT_SEG_TYPEINFO, sizeof(MSFT_TypeInfoBase), 0); - if (offset == -1) return -1; typelib->typelib_typeinfo_offsets[typelib->typelib_header.nrtypeinfos++] = offset; @@ -475,7 +472,6 @@ static int ctl2_alloc_typeinfo( * RETURNS * * Success: The offset of the new GUID. - * Failure: -1 (this is invariably an out of memory condition). */ static int ctl2_alloc_guid( msft_typelib_t *typelib, /* [I] The type library to allocate in. */ @@ -491,7 +487,6 @@ static int ctl2_alloc_guid( if (offset != -1) return offset; offset = ctl2_alloc_segment(typelib, MSFT_SEG_GUID, sizeof(MSFT_GuidEntry), 0); - if (offset == -1) return -1; guid_space = (void *)(typelib->typelib_segment_data[MSFT_SEG_GUID] + offset); *guid_space = *guid; @@ -528,7 +523,6 @@ static int ctl2_alloc_name( if (offset != -1) return offset; offset = ctl2_alloc_segment(typelib, MSFT_SEG_NAME, length + 8, 0); - if (offset == -1) return -1; name_space = (void *)(typelib->typelib_segment_data[MSFT_SEG_NAME] + offset); name_space->hreftype = -1; @@ -574,7 +568,6 @@ static int ctl2_alloc_string( } offset = ctl2_alloc_segment(typelib, MSFT_SEG_STRING, length, 0); - if (offset == -1) return -1; string_space = typelib->typelib_segment_data[MSFT_SEG_STRING] + offset; memcpy(string_space, encoded_string, length); @@ -611,7 +604,6 @@ static int alloc_msft_importinfo( impinfo->flags |= typelib->typelib_header.nimpinfos++; offset = ctl2_alloc_segment(typelib, MSFT_SEG_IMPORTINFO, sizeof(MSFT_ImpInfo), 0); - if (offset == -1) return -1; impinfo_space = (void *)(typelib->typelib_segment_data[MSFT_SEG_IMPORTINFO] + offset); *impinfo_space = *impinfo; @@ -653,7 +645,6 @@ static int alloc_importfile( } offset = ctl2_alloc_segment(typelib, MSFT_SEG_IMPORTFILES, length + 0xc, 0); - if (offset == -1) return -1; importfile = (MSFT_ImpFile *)&typelib->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset]; importfile->guid = guidoffset; @@ -1233,11 +1224,9 @@ static HRESULT set_custdata(msft_typelib guidentry.next_hash = -1; guidoffset = ctl2_alloc_guid(typelib, &guidentry); - if (guidoffset == -1) return E_OUTOFMEMORY; write_value(typelib, &data_out, vt, value); custoffset = ctl2_alloc_segment(typelib, MSFT_SEG_CUSTDATAGUID, 12, 0); - if (custoffset == -1) return E_OUTOFMEMORY; custdata = (int *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATAGUID][custoffset]; custdata[0] = guidoffset; @@ -2262,9 +2251,6 @@ static void set_guid(msft_typelib_t *typ } offset = ctl2_alloc_guid(typelib, &guidentry); - - if (offset == -1) return; - typelib->typelib_header.posguid = offset; return; @@ -2527,8 +2513,7 @@ int create_msft_typelib(typelib_t *typel GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; - msft = malloc(sizeof(*msft)); - if (!msft) return 0; + msft = xmalloc(sizeof(*msft)); memset(msft, 0, sizeof(*msft)); msft->typelib = typelib;

1 0

Alexandre Julliard : configure: Only link against libresolv where necessary .
by Alexandre Julliard Aug. 5, 2006

Aug. 5, 2006

Module: wine Branch: refs/heads/master Commit: eebb1112214a68762d2e9d3663e95fef51c4b6dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eebb1112214a68762d2e9d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 4 23:17:56 2006 +0200 configure: Only link against libresolv where necessary. --- configure | 87 --------------------------------------------- configure.ac | 2 - dlls/iphlpapi/Makefile.in | 1 + 3 files changed, 1 insertions(+), 89 deletions(-) diff --git a/configure b/configure index 448115d..4ad1108 100755 --- a/configure +++ b/configure @@ -7861,93 +7861,6 @@ _ACEOF fi - -{ echo "$as_me:$LINENO: checking for res_9_init in -lresolv" >&5 -echo $ECHO_N "checking for res_9_init in -lresolv... $ECHO_C" >&6; } -if test "${ac_cv_lib_resolv_res_9_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lresolv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char res_9_init (); -int -main () -{ -return res_9_init (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_resolv_res_9_init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_resolv_res_9_init=no -fi - -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_9_init" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_res_9_init" >&6; } -if test $ac_cv_lib_resolv_res_9_init = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRESOLV 1 -_ACEOF - - LIBS="-lresolv $LIBS" - -fi - { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then diff --git a/configure.ac b/configure.ac index f375c59..5782654 100644 --- a/configure.ac +++ b/configure.ac @@ -146,8 +146,6 @@ dnl Check for -lxpg4 for FreeBSD AC_CHECK_LIB(xpg4,_xpg4_setrunelocale) dnl Check for -lpoll for Mac OS X/Darwin AC_CHECK_LIB(poll,poll) -dnl Check for -lresolv for Mac OS X/Darwin -AC_CHECK_LIB(resolv,res_9_init) dnl Check for -lpthread AC_CHECK_LIB(pthread,pthread_create,AC_SUBST(LIBPTHREAD,"-lpthread")) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 713f1f1..163593f 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = iphlpapi.dll IMPORTLIB = libiphlpapi.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 +EXTRALIBS = @RESOLVLIBS@ C_SRCS = \ ifenum.c \

1 0

Alexandre Julliard : server: Added support for kqueue() as an alternative to poll() on FreeBSD.
by Alexandre Julliard Aug. 5, 2006

Aug. 5, 2006

Module: wine Branch: refs/heads/master Commit: c82789264b89e40c8bad49c6866d655dc1f44754 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c82789264b89e40c8bad49c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 4 22:11:00 2006 +0200 server: Added support for kqueue() as an alternative to poll() on FreeBSD. --- configure | 54 ++++++++++------------- configure.ac | 2 + include/config.h.in | 6 +++ server/fd.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 152 insertions(+), 32 deletions(-) diff --git a/configure b/configure index 90aa97e..448115d 100755 --- a/configure +++ b/configure @@ -4118,12 +4118,12 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 + { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + ac_xsave_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4172,23 +4172,15 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_R_nospace=yes + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_R_nospace=no -fi - -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_nospace = yes; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - X_LIBS="$X_LIBS -R$x_libraries" - else LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4237,27 +4229,25 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_R_space=yes + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + X_LIBS="$X_LIBS -R $x_libraries" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_R_space=no + { echo "$as_me:$LINENO: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6; } fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test $ac_R_space = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - X_LIBS="$X_LIBS -R $x_libraries" - else - { echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6; } - fi - fi - LIBS=$ac_xsave_LIBS - esac +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag + LIBS=$ac_xsave_LIBS fi # Check for system-dependent libraries X programs must link with. @@ -8436,6 +8426,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ CoreAudio/CoreAudio.h \ @@ -8504,6 +8495,7 @@ for ac_header in \ sys/elf32.h \ sys/epoll.h \ sys/errno.h \ + sys/event.h \ sys/exec_elf.h \ sys/filio.h \ sys/ioctl.h \ @@ -19349,6 +19341,7 @@ fi + for ac_func in \ _lwp_create \ _lwp_self \ @@ -19385,6 +19378,7 @@ for ac_func in \ gettimeofday \ getuid \ inet_network \ + kqueue \ lstat \ memmove \ mmap \ diff --git a/configure.ac b/configure.ac index fa74bee..f375c59 100644 --- a/configure.ac +++ b/configure.ac @@ -227,6 +227,7 @@ AC_CHECK_HEADERS(\ sys/elf32.h \ sys/epoll.h \ sys/errno.h \ + sys/event.h \ sys/exec_elf.h \ sys/filio.h \ sys/ioctl.h \ @@ -1289,6 +1290,7 @@ AC_CHECK_FUNCS(\ gettimeofday \ getuid \ inet_network \ + kqueue \ lstat \ memmove \ mmap \ diff --git a/include/config.h.in b/include/config.h.in index 870e96c..3d1d4b5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -263,6 +263,9 @@ #undef HAVE_JACK_JACK_H /* Define to 1 if you have the <jpeglib.h> header file. */ #undef HAVE_JPEGLIB_H +/* Define to 1 if you have the `kqueue' function. */ +#undef HAVE_KQUEUE + /* Define to 1 if you have the <lber.h> header file. */ #undef HAVE_LBER_H @@ -725,6 +728,9 @@ #undef HAVE_SYS_EPOLL_H /* Define to 1 if you have the <sys/errno.h> header file. */ #undef HAVE_SYS_ERRNO_H +/* Define to 1 if you have the <sys/event.h> header file. */ +#undef HAVE_SYS_EVENT_H + /* Define to 1 if you have the <sys/exec_elf.h> header file. */ #undef HAVE_SYS_EXEC_ELF_H diff --git a/server/fd.c b/server/fd.c index 02aa88d..b7281a4 100644 --- a/server/fd.c +++ b/server/fd.c @@ -37,6 +37,11 @@ #endif #ifdef HAVE_SYS_POLL_H #include <sys/poll.h> #endif +#ifdef HAVE_SYS_EVENT_H +#include <sys/event.h> +#undef LIST_INIT +#undef LIST_ENTRY +#endif #ifdef HAVE_STDINT_H #include <stdint.h> #endif @@ -358,7 +363,7 @@ static int get_next_timeout(void); #ifdef USE_EPOLL -static int epoll_fd; +static int epoll_fd = -1; static inline void init_epoll(void) { @@ -452,7 +457,120 @@ static inline void main_loop_epoll(void) } } -#else /* USE_EPOLL */ +#elif defined(HAVE_KQUEUE) + +static int kqueue_fd = -1; + +static inline void init_epoll(void) +{ +#ifndef __APPLE__ /* kqueue support is broken in the MacOS kernel so we can't use it */ + kqueue_fd = kqueue(); +#endif +} + +static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) +{ + struct kevent ev[2]; + + if (kqueue_fd == -1) return; + + EV_SET( &ev[0], fd->unix_fd, EVFILT_READ, 0, NOTE_LOWAT, 1, (void *)user ); + EV_SET( &ev[1], fd->unix_fd, EVFILT_WRITE, 0, NOTE_LOWAT, 1, (void *)user ); + + if (events == -1) /* stop waiting on this fd completely */ + { + if (pollfd[user].fd == -1) return; /* already removed */ + ev[0].flags |= EV_DELETE; + ev[1].flags |= EV_DELETE; + } + else if (pollfd[user].fd == -1) + { + if (pollfd[user].events) return; /* stopped waiting on it, don't restart */ + ev[0].flags |= EV_ADD | ((events & POLLIN) ? EV_ENABLE : EV_DISABLE); + ev[1].flags |= EV_ADD | ((events & POLLOUT) ? EV_ENABLE : EV_DISABLE); + } + else + { + if (pollfd[user].events == events) return; /* nothing to do */ + ev[0].flags |= (events & POLLIN) ? EV_ENABLE : EV_DISABLE; + ev[1].flags |= (events & POLLOUT) ? EV_ENABLE : EV_DISABLE; + } + + if (kevent( kqueue_fd, ev, 2, NULL, 0, NULL ) == -1) + { + if (errno == ENOMEM) /* not enough memory, give up on kqueue */ + { + close( kqueue_fd ); + kqueue_fd = -1; + } + else perror( "kevent" ); /* should not happen */ + } +} + +static inline void remove_epoll_user( struct fd *fd, int user ) +{ + if (kqueue_fd == -1) return; + + if (pollfd[user].fd != -1) + { + struct kevent ev[2]; + + EV_SET( &ev[0], fd->unix_fd, EVFILT_READ, EV_DELETE, 0, 0, 0 ); + EV_SET( &ev[1], fd->unix_fd, EVFILT_WRITE, EV_DELETE, 0, 0, 0 ); + kevent( kqueue_fd, ev, 2, NULL, 0, NULL ); + } +} + +static inline void main_loop_epoll(void) +{ + int i, ret, timeout; + struct kevent events[128]; + + if (kqueue_fd == -1) return; + + while (active_users) + { + timeout = get_next_timeout(); + + if (!active_users) break; /* last user removed by a timeout */ + if (kqueue_fd == -1) break; /* an error occurred with kqueue */ + + if (timeout != -1) + { + struct timespec ts; + + ts.tv_sec = timeout / 1000; + ts.tv_nsec = (timeout % 1000) * 1000000; + ret = kevent( kqueue_fd, NULL, 0, events, sizeof(events)/sizeof(events[0]), &ts ); + } + else ret = kevent( kqueue_fd, NULL, 0, events, sizeof(events)/sizeof(events[0]), NULL ); + + /* put the events into the pollfd array first, like poll does */ + for (i = 0; i < ret; i++) + { + long user = (long)events[i].udata; + pollfd[user].revents = 0; + } + for (i = 0; i < ret; i++) + { + long user = (long)events[i].udata; + if (events[i].filter == EVFILT_READ) pollfd[user].revents |= POLLIN; + else if (events[i].filter == EVFILT_WRITE) pollfd[user].revents |= POLLOUT; + if (events[i].flags & EV_EOF) pollfd[user].revents |= POLLHUP; + if (events[i].flags & EV_ERROR) pollfd[user].revents |= POLLERR; + } + + /* read events from the pollfd array, as set_fd_events may modify them */ + for (i = 0; i < ret; i++) + { + long user = (long)events[i].udata; + if (pollfd[user].revents) fd_poll_event( poll_users[user], pollfd[user].revents ); + pollfd[user].revents = 0; + } + } +} + +#else /* HAVE_KQUEUE */ static inline void init_epoll(void) { } static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) { }

1 0

Roderick Colenbrander : wined3d: Basetexture anisotropic fix.
by Alexandre Julliard Aug. 4, 2006

Aug. 4, 2006

Module: wine Branch: refs/heads/master Commit: 9925b0561eb10eb2077e867037252f7772f436b8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9925b0561eb10eb2077e867… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Aug 4 18:14:41 2006 +0200 wined3d: Basetexture anisotropic fix. --- dlls/wined3d/basetexture.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 58fb92d..9343416 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -430,8 +430,12 @@ void WINAPI IWineD3DBaseTextureImpl_Appl break; case WINED3DSAMP_MAXANISOTROPY: *state = samplerStates[textureObjectSamplerStates[i].state]; - glTexParameteri(textureDimensions, GL_TEXTURE_MAX_ANISOTROPY_EXT, *state); - checkGLcall("glTexParameteri GL_TEXTURE_MAX_ANISOTROPY_EXT ..."); + if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC)) { + glTexParameteri(textureDimensions, GL_TEXTURE_MAX_ANISOTROPY_EXT, *state); + checkGLcall("glTexParameteri GL_TEXTURE_MAX_ANISOTROPY_EXT ..."); + } else { + WARN("Unsupported in local OpenGL implementation: glTexParameteri GL_TEXTURE_MAX_ANISOTROPY_EXT\n"); + } break; case WINED3DFUNC_UNIMPLEMENTED: /* unimplemented */ TRACE("(%p) : stub\n", This);

1 0

Dan Hipschman : user: Call SetLastError in CreateWindowEx when WS_CHILD is set with no parent.
by Alexandre Julliard Aug. 4, 2006

Aug. 4, 2006

Module: wine Branch: refs/heads/master Commit: 74ece17c6bd141c5a13b3aec7522303fb50bc472 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74ece17c6bd141c5a13b3ae… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Aug 4 10:08:53 2006 -0700 user: Call SetLastError in CreateWindowEx when WS_CHILD is set with no parent. --- dlls/user/tests/win.c | 2 +- dlls/user/win.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 9d37253..42c6ed5 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -140,7 +140,7 @@ static void test_parent_owner(void) SetLastError(0xdeadbeef); test = CreateWindowExA(0, "ToolWindowClass", "Tool window 1", WS_CHILD, 0, 0, 100, 100, 0, 0, 0, NULL ); - todo_wine ok( GetLastError() == ERROR_TLW_WITH_WSCHILD, "CreateWindowExA should call SetLastError\n" ); + ok( GetLastError() == ERROR_TLW_WITH_WSCHILD, "CreateWindowExA should call SetLastError\n" ); ok( !test, "WS_CHILD without parent created\n" ); /* desktop window */ diff --git a/dlls/user/win.c b/dlls/user/win.c index 592eeac..a4f2c26 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -995,6 +995,7 @@ static HWND WIN_CreateWindowEx( CREATEST if ((cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) { WARN("No parent for child window\n" ); + SetLastError(ERROR_TLW_WITH_WSCHILD); return 0; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } if (classAtom != LOWORD(DESKTOP_CLASS_ATOM)) /* are we creating the desktop itself? */

1 0

Dan Hipschman : user: Add a test for CreateWindowEx.
by Alexandre Julliard Aug. 4, 2006

Aug. 4, 2006

Module: wine Branch: refs/heads/master Commit: 50486859706d01f5d639d8029a5cba71bdd9ccae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50486859706d01f5d639d80… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Aug 4 10:08:00 2006 -0700 user: Add a test for CreateWindowEx. --- dlls/user/tests/win.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index a1c7539..9d37253 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -137,8 +137,10 @@ static void test_parent_owner(void) trace( "main window %p main2 %p desktop %p child %p\n", hwndMain, hwndMain2, desktop, child ); /* child without parent, should fail */ + SetLastError(0xdeadbeef); test = CreateWindowExA(0, "ToolWindowClass", "Tool window 1", WS_CHILD, 0, 0, 100, 100, 0, 0, 0, NULL ); + todo_wine ok( GetLastError() == ERROR_TLW_WITH_WSCHILD, "CreateWindowExA should call SetLastError\n" ); ok( !test, "WS_CHILD without parent created\n" ); /* desktop window */

1 0