October 2021 - Wine-Commits

Piotr Caban : user32: Simplify CreateWindow condition for setting WS_EX_WINDOWEDGE style.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 3979f4a4e4e517e10c22f4350d9396832d70cdfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3979f4a4e4e517e10c22f435… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:52 2021 +0200 user32: Simplify CreateWindow condition for setting WS_EX_WINDOWEDGE style. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7c2471d2746..d261968d742 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1653,16 +1653,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } /* WS_EX_WINDOWEDGE depends on some other styles */ - if (wndPtr->dwExStyle & WS_EX_DLGMODALFRAME) + if ((wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME)) && + !(wndPtr->dwStyle & (WS_CHILD | WS_POPUP))) wndPtr->dwExStyle |= WS_EX_WINDOWEDGE; - else if (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME)) - { - if (!((wndPtr->dwExStyle & WS_EX_STATICEDGE) && - (wndPtr->dwStyle & (WS_CHILD | WS_POPUP)))) - wndPtr->dwExStyle |= WS_EX_WINDOWEDGE; - } - else - wndPtr->dwExStyle &= ~WS_EX_WINDOWEDGE; if (!(wndPtr->dwStyle & (WS_CHILD | WS_POPUP))) wndPtr->flags |= WIN_NEED_SIZE;

1 0

Piotr Caban : user32: Add helper for setting WS_EX_WINDOWEDGE flag.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 94c1a67f7846071910ca800f75ecbc80ace648c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c1a67f7846071910ca800f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:55 2021 +0200 user32: Add helper for setting WS_EX_WINDOWEDGE flag. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d261968d742..a1464f01345 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1461,6 +1461,20 @@ static void map_dpi_create_struct( CREATESTRUCTW *cs, UINT dpi_from, UINT dpi_to cs->cy = MulDiv( cs->cy, dpi_to, dpi_from ); } +/*********************************************************************** + * fix_exstyle + */ +static DWORD fix_exstyle( DWORD style, DWORD exstyle ) +{ + if ((exstyle & WS_EX_DLGMODALFRAME) || + (!(exstyle & WS_EX_STATICEDGE) && + (style & (WS_DLGFRAME | WS_THICKFRAME)))) + exstyle |= WS_EX_WINDOWEDGE; + else + exstyle &= ~WS_EX_WINDOWEDGE; + return exstyle; +} + /*********************************************************************** * WIN_CreateWindowEx * @@ -1596,13 +1610,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } WIN_FixCoordinates(cs, &sw); /* fix default coordinates */ - - if ((cs->dwExStyle & WS_EX_DLGMODALFRAME) || - ((!(cs->dwExStyle & WS_EX_STATICEDGE)) && - (cs->style & (WS_DLGFRAME | WS_THICKFRAME)))) - cs->dwExStyle |= WS_EX_WINDOWEDGE; - else - cs->dwExStyle &= ~WS_EX_WINDOWEDGE; + cs->dwExStyle = fix_exstyle(cs->style, cs->dwExStyle); /* Create the window structure */ @@ -2622,13 +2630,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return 0; /* WS_EX_TOPMOST can only be changed through SetWindowPos */ newval = (style.styleNew & ~WS_EX_TOPMOST) | (wndPtr->dwExStyle & WS_EX_TOPMOST); - /* WS_EX_WINDOWEDGE depends on some other styles */ - if (newval & WS_EX_DLGMODALFRAME) - newval |= WS_EX_WINDOWEDGE; - else if (!(newval & WS_EX_STATICEDGE) && (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME))) - newval |= WS_EX_WINDOWEDGE; - else - newval &= ~WS_EX_WINDOWEDGE; + newval = fix_exstyle(wndPtr->dwStyle, newval); break; case GWLP_HWNDPARENT: if (wndPtr->parent == GetDesktopWindow())

1 0

Alexandre Julliard : tools: Avoid using wine/port.h.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

1 0

Alexandre Julliard : configure: Remove some no longer needed configure checks.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: ae9f64c4642fdb3d1ff3bc54220ae55b2e0a3e4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9f64c4642fdb3d1ff3bc54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 14:35:03 2021 +0200 configure: Remove some no longer needed configure checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 98 +++-------------------------------------------------- configure.ac | 36 ++------------------ include/config.h.in | 24 ------------- libs/wine/config.c | 2 -- 4 files changed, 6 insertions(+), 154 deletions(-) diff --git a/configure b/configure index 8a7e8fece1e..7fdd2085ad1 100755 --- a/configure +++ b/configure @@ -7480,7 +7480,6 @@ for ac_header in \ elf.h \ float.h \ gettext-po.h \ - grp.h \ gsm.h \ gsm/gsm.h \ ieeefp.h \ @@ -17893,8 +17892,6 @@ esac ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" for ac_func in \ - __res_get_state \ - __res_getservers \ epoll_create \ fork \ fstatfs \ @@ -17992,13 +17989,12 @@ fi ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $DL_LIBS" -for ac_func in dladdr dlinfo +for ac_func in dlinfo do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "dlinfo" "ac_cv_func_dlinfo" +if test "x$ac_cv_func_dlinfo" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_DLINFO 1 _ACEOF fi @@ -18569,47 +18565,6 @@ _ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nameindex" >&5 -$as_echo_n "checking for if_nameindex... " >&6; } -if ${wine_cv_have_if_nameindex+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NET_IF_H -# include <net/if.h> -#endif -int -main () -{ -struct if_nameindex *p = if_nameindex(); return p->if_index; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - wine_cv_have_if_nameindex=yes -else - wine_cv_have_if_nameindex=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_if_nameindex" >&5 -$as_echo "$wine_cv_have_if_nameindex" >&6; } -if test "$wine_cv_have_if_nameindex" = "yes" -then - -$as_echo "#define HAVE_IF_NAMEINDEX 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigaddset" >&5 $as_echo_n "checking for sigaddset... " >&6; } if ${wine_cv_have_sigaddset+:} false; then : @@ -18751,22 +18706,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -fi -ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_SYS_UN_H -# include <sys/un.h> -#endif -" -if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_SA_LEN 1 -_ACEOF - - fi ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "sun_len" "ac_cv_member_struct_sockaddr_un_sun_len" "#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H @@ -18867,15 +18806,6 @@ _ACEOF fi -ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default" -if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BLOCKS 1 -_ACEOF - - -fi ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_mtim" = xyes; then : @@ -19028,26 +18958,6 @@ _ACEOF fi -ac_fn_c_check_member "$LINENO" "ns_msg" "_msg_ptr" "ac_cv_member_ns_msg__msg_ptr" "#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif -" -if test "x$ac_cv_member_ns_msg__msg_ptr" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_NS_MSG__MSG_PTR 1 -_ACEOF - - -fi - - ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_inhist" "ac_cv_member_struct_icmpstat_icps_inhist" "#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/configure.ac b/configure.ac index 39fb1eabc4b..d9935f63c3a 100644 --- a/configure.ac +++ b/configure.ac @@ -451,7 +451,6 @@ AC_CHECK_HEADERS(\ elf.h \ float.h \ gettext-po.h \ - grp.h \ gsm.h \ gsm/gsm.h \ ieeefp.h \ @@ -2125,8 +2124,6 @@ dnl **** Check for functions **** ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" AC_CHECK_FUNCS(\ - __res_get_state \ - __res_getservers \ epoll_create \ fork \ fstatfs \ @@ -2157,7 +2154,7 @@ CFLAGS="$ac_save_CFLAGS" dnl Check for -ldl AC_SEARCH_LIBS(dlopen, dl) -WINE_CHECK_LIB_FUNCS(dladdr dlinfo,[$DL_LIBS]) +WINE_CHECK_LIB_FUNCS(dlinfo,[$DL_LIBS]) dnl Check for -lnsl for Solaris AC_SEARCH_LIBS(gethostbyname, nsl) @@ -2262,22 +2259,6 @@ AC_CHECK_MEMBERS([struct ff_effect.direction],,, #include <linux/input.h> #endif]) -AC_CACHE_CHECK([for if_nameindex],wine_cv_have_if_nameindex, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NET_IF_H -# include <net/if.h> -#endif]], - [[struct if_nameindex *p = if_nameindex(); return p->if_index;]])],[wine_cv_have_if_nameindex=yes],[wine_cv_have_if_nameindex=no])) -if test "$wine_cv_have_if_nameindex" = "yes" -then - AC_DEFINE(HAVE_IF_NAMEINDEX, 1, [Define to 1 if you have the `if_nameindex' function.]) -fi - AC_CACHE_CHECK([for sigaddset],wine_cv_have_sigaddset, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <signal.h>]], [[sigset_t set; sigaddset(&set,SIGTERM);]])],[wine_cv_have_sigaddset=yes],[wine_cv_have_sigaddset=no])) if test "$wine_cv_have_sigaddset" = "yes" @@ -2332,7 +2313,7 @@ then fi dnl Check for socket structure members -AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr.sa_len, struct sockaddr_un.sun_len],,, +AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr_un.sun_len],,, [#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> @@ -2360,7 +2341,6 @@ AC_CHECK_MEMBERS([struct mtget.mt_blksiz, struct mtget.mt_gstat, struct mtget.mt dnl Check for stat.st_blocks and ns-resolved times AC_CHECK_MEMBERS([ - struct stat.st_blocks, struct stat.st_mtim, struct stat.st_mtimespec, struct stat.st_ctim, @@ -2400,18 +2380,6 @@ AC_CHECK_MEMBERS([struct __res_state._u._ext.nscount6],,, #include <resolv.h> #endif]) -dnl Check for ns_msg ptr member -AC_CHECK_MEMBERS([ns_msg._msg_ptr],,, -[#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif]) - dnl Check for struct icmpstat AC_CHECK_MEMBERS([struct icmpstat.icps_inhist],,, [#ifdef HAVE_SYS_TYPES_H diff --git a/include/config.h.in b/include/config.h.in index fc3749895a3..f262f8a0a12 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -59,9 +59,6 @@ file. */ #undef HAVE_DISKARBITRATION_DISKARBITRATION_H -/* Define to 1 if you have the `dladdr' function. */ -#undef HAVE_DLADDR - /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H @@ -150,9 +147,6 @@ /* Define if we have the libgphoto2_port development environment */ #undef HAVE_GPHOTO2_PORT -/* Define to 1 if you have the <grp.h> header file. */ -#undef HAVE_GRP_H - /* Define to 1 if you have the <gsm/gsm.h> header file. */ #undef HAVE_GSM_GSM_H @@ -171,9 +165,6 @@ /* Define to 1 if you have the <ifaddrs.h> header file. */ #undef HAVE_IFADDRS_H -/* Define to 1 if you have the `if_nameindex' function. */ -#undef HAVE_IF_NAMEINDEX - /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H @@ -447,9 +438,6 @@ /* Define to 1 if you have the <net/route.h> header file. */ #undef HAVE_NET_ROUTE_H -/* Define to 1 if `_msg_ptr' is a member of `ns_msg'. */ -#undef HAVE_NS_MSG__MSG_PTR - /* Define to 1 if OpenAL is available */ #undef HAVE_OPENAL @@ -621,9 +609,6 @@ /* Define to 1 if `sin6_scope_id' is a member of `struct sockaddr_in6'. */ #undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID -/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */ -#undef HAVE_STRUCT_SOCKADDR_SA_LEN - /* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ #undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN @@ -642,9 +627,6 @@ /* Define to 1 if `st_birthtimespec' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC -/* Define to 1 if `st_blocks' is a member of `struct stat'. */ -#undef HAVE_STRUCT_STAT_ST_BLOCKS - /* Define to 1 if `st_ctim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_CTIM @@ -963,12 +945,6 @@ function. */ #undef HAVE___CLEAR_CACHE -/* Define to 1 if you have the `__res_getservers' function. */ -#undef HAVE___RES_GETSERVERS - -/* Define to 1 if you have the `__res_get_state' function. */ -#undef HAVE___RES_GET_STATE - /* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>. */ #undef MAJOR_IN_MKDEV diff --git a/libs/wine/config.c b/libs/wine/config.c index 368491c3ae9..b8f1bd5f86d 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -109,7 +109,6 @@ static char *build_path( const char *dir, const char *name ) /* return the directory that contains the library at run-time */ static char *get_runtime_libdir(void) { -#ifdef HAVE_DLADDR Dl_info info; char *libdir; @@ -123,7 +122,6 @@ static char *get_runtime_libdir(void) libdir[len] = 0; return libdir; } -#endif /* HAVE_DLADDR */ return NULL; }

1 0

Alexandre Julliard : server: Avoid using wine/port.h.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: c954e5b9e6a6ae47af515926ceebbdf46ca9f4bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=c954e5b9e6a6ae47af515926… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 14:38:40 2021 +0200 server: Avoid using wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/atom.c | 1 - server/change.c | 2 +- server/class.c | 1 - server/clipboard.c | 1 - server/completion.c | 1 - server/console.c | 1 - server/debugger.c | 1 - server/device.c | 3 +-- server/directory.c | 1 - server/event.c | 1 - server/fd.c | 1 - server/file.c | 1 - server/handle.c | 1 - server/hook.c | 1 - server/mach.c | 1 - server/mailslot.c | 8 ++++---- server/mapping.c | 3 ++- server/mutex.c | 1 - server/named_pipe.c | 1 - server/object.c | 1 - server/process.c | 3 ++- server/ptrace.c | 1 - server/queue.c | 2 +- server/registry.c | 1 - server/request.c | 1 - server/semaphore.c | 1 - server/serial.c | 1 - server/symlink.c | 1 - server/thread.c | 2 +- server/timer.c | 1 - server/trace.c | 1 - server/unicode.c | 3 ++- server/window.c | 1 - server/winstation.c | 1 - 34 files changed, 14 insertions(+), 38 deletions(-) diff --git a/server/atom.c b/server/atom.c index 8d0ffbb05f3..ff0799f5880 100644 --- a/server/atom.c +++ b/server/atom.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdlib.h> diff --git a/server/change.c b/server/change.c index 5edeebf89d3..4fdb0394922 100644 --- a/server/change.c +++ b/server/change.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <fcntl.h> @@ -32,6 +31,7 @@ #include <limits.h> #include <dirent.h> #include <errno.h> +#include <unistd.h> #ifdef HAVE_POLL_H # include <poll.h> #endif diff --git a/server/class.c b/server/class.c index 92cbfa2d7e3..e1e180bd97c 100644 --- a/server/class.c +++ b/server/class.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdlib.h> diff --git a/server/clipboard.c b/server/clipboard.c index eb9bd4f7020..8118a467dd8 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdlib.h> diff --git a/server/completion.c b/server/completion.c index eb0d256ad09..6933195e72d 100644 --- a/server/completion.c +++ b/server/completion.c @@ -27,7 +27,6 @@ */ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> diff --git a/server/console.c b/server/console.c index 3a5b1270116..977c428cf9f 100644 --- a/server/console.c +++ b/server/console.c @@ -22,7 +22,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <string.h> diff --git a/server/debugger.c b/server/debugger.c index ca84a88258f..48adb244b09 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <signal.h> diff --git a/server/device.c b/server/device.c index f61f24ea4ea..d6288920bf4 100644 --- a/server/device.c +++ b/server/device.c @@ -19,8 +19,6 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/rbtree.h" #include <assert.h> #include <fcntl.h> @@ -33,6 +31,7 @@ #include "windef.h" #include "winternl.h" #include "ddk/wdm.h" +#include "wine/rbtree.h" #include "object.h" #include "file.h" diff --git a/server/directory.c b/server/directory.c index ec8187b425a..70a34d3f1bb 100644 --- a/server/directory.c +++ b/server/directory.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> diff --git a/server/event.c b/server/event.c index ccdd465dd5b..c7424dfe8ff 100644 --- a/server/event.c +++ b/server/event.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> diff --git a/server/fd.c b/server/fd.c index ad1b7a1bd4a..37e2eddeaba 100644 --- a/server/fd.c +++ b/server/fd.c @@ -20,7 +20,6 @@ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <dirent.h> diff --git a/server/file.c b/server/file.c index 08b0b59beb0..7cf6f3c0472 100644 --- a/server/file.c +++ b/server/file.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <fcntl.h> diff --git a/server/handle.c b/server/handle.c index 15da701ee99..6a5416bcb84 100644 --- a/server/handle.c +++ b/server/handle.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <limits.h> diff --git a/server/hook.c b/server/hook.c index c048908c295..5abdf39ad37 100644 --- a/server/hook.c +++ b/server/hook.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> diff --git a/server/mach.c b/server/mach.c index 20bc3878560..77f1fdcdb86 100644 --- a/server/mach.c +++ b/server/mach.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> diff --git a/server/mailslot.c b/server/mailslot.c index 1f4cb87d0fc..4048461a58f 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -21,9 +21,6 @@ */ #include "config.h" -#include "wine/port.h" -#include "ntstatus.h" -#define WIN32_NO_STATUS #include <assert.h> #include <fcntl.h> @@ -33,7 +30,7 @@ #include <stdlib.h> #include <sys/time.h> #include <sys/types.h> - +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif @@ -43,6 +40,9 @@ #ifdef HAVE_SYS_FILIO_H #include <sys/filio.h> #endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" diff --git a/server/mapping.c b/server/mapping.c index 8a53c2d89d3..93dae94b7c4 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -19,12 +19,13 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <sys/types.h> #include <sys/stat.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> diff --git a/server/mutex.c b/server/mutex.c index 75ff5117d3f..906e1c060e9 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> diff --git a/server/named_pipe.c b/server/named_pipe.c index f964ae19637..6964ab1b2ee 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <string.h> diff --git a/server/object.c b/server/object.c index b2779fd61fe..e438a6d41ba 100644 --- a/server/object.c +++ b/server/object.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <limits.h> diff --git a/server/process.c b/server/process.c index 8109fbe8de4..d8d09698558 100644 --- a/server/process.c +++ b/server/process.c @@ -19,16 +19,17 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <limits.h> #include <signal.h> #include <string.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <sys/types.h> #include <sys/time.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> diff --git a/server/ptrace.c b/server/ptrace.c index b2d23d89aaf..bcd0fe48f16 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> diff --git a/server/queue.c b/server/queue.c index e4903bcb79f..f38c7e9fb17 100644 --- a/server/queue.c +++ b/server/queue.c @@ -19,12 +19,12 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <unistd.h> #ifdef HAVE_POLL_H # include <poll.h> #endif diff --git a/server/registry.c b/server/registry.c index 427da8a5883..4ba5c86ae58 100644 --- a/server/registry.c +++ b/server/registry.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> diff --git a/server/request.c b/server/request.c index 29b63600f15..4733cef6511 100644 --- a/server/request.c +++ b/server/request.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> diff --git a/server/semaphore.c b/server/semaphore.c index 543d5883ec8..6a8b871940f 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> diff --git a/server/serial.c b/server/serial.c index bdc27de8e4f..81926f6d412 100644 --- a/server/serial.c +++ b/server/serial.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <fcntl.h> diff --git a/server/symlink.c b/server/symlink.c index 3879bb685f7..fa97d9155fa 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> diff --git a/server/thread.c b/server/thread.c index 9d412106809..90f3c5492f8 100644 --- a/server/thread.c +++ b/server/thread.c @@ -19,8 +19,8 @@ */ #include "config.h" -#include "wine/port.h" +#define _GNU_SOURCE /* sched_affinity */ #include <assert.h> #include <errno.h> #include <fcntl.h> diff --git a/server/timer.c b/server/timer.c index 5e265d2ddf6..96dc9d00ca1 100644 --- a/server/timer.c +++ b/server/timer.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> diff --git a/server/trace.c b/server/trace.c index 11e3eb25da6..a007cb280f0 100644 --- a/server/trace.c +++ b/server/trace.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> #include <stdarg.h> diff --git a/server/unicode.c b/server/unicode.c index 55f9954f4f4..67698d7639c 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -19,11 +19,12 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> +#include <fcntl.h> #include <stdio.h> #include <stdarg.h> +#include <unistd.h> #include "windef.h" #include "winternl.h" diff --git a/server/window.c b/server/window.c index 3a88b7f34fa..c94c745bd3c 100644 --- a/server/window.c +++ b/server/window.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> diff --git a/server/winstation.c b/server/winstation.c index 61f9f77c73f..6f2dfcf4e31 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdarg.h>

1 0

Piotr Caban : user32: Update exstyle when setting style in SetWindowLong.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: a9eee150ad03e28829ffafd1b3fff57fffc816a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9eee150ad03e28829ffafd1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:34:01 2021 +0200 user32: Update exstyle when setting style in SetWindowLong. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 14 ++++++-------- dlls/user32/win.c | 6 +++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 93d1e8ec232..f9428fd3494 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4548,8 +4548,7 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle else dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE; ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); - todo_wine_if (!dwStyleIn) - ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); + ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); DestroyWindow(hwnd); if (hwndParent) DestroyWindow(hwndParent); @@ -4701,7 +4700,7 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou WORD class_atom; WCHAR caption[1]; } dlg_data; - DWORD style, ex_style, ex_style_out2; + DWORD style, ex_style; HWND hwnd, grand_parent = 0, parent = 0; struct dialog_param param; @@ -4763,13 +4762,12 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou ok(style == style_out, "expected style %#x, got %#x\n", style_out, style); /* WS_EX_WINDOWEDGE can't always be changed */ if (ex_style_in & WS_EX_DLGMODALFRAME) - ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE; + ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; else if ((style & (WS_DLGFRAME | WS_THICKFRAME)) && !(ex_style_in & WS_EX_STATICEDGE)) - ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE; + ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; else - ex_style_out2 = ex_style_in & ~WS_EX_WINDOWEDGE; - todo_wine_if (ex_style_out != ex_style_out2) - ok(ex_style == ex_style_out2, "expected ex_style %#x, got %#x\n", ex_style_out2, ex_style); + ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE; + ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); DestroyWindow(hwnd); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a1464f01345..21214432b6d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2619,8 +2619,6 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if (wndPtr->parent == GetDesktopWindow()) newval |= WS_CLIPSIBLINGS; /* WS_MINIMIZE can't be reset */ if (wndPtr->dwStyle & WS_MINIMIZE) newval |= WS_MINIMIZE; - /* FIXME: changing WS_DLGFRAME | WS_THICKFRAME is supposed to change - WS_EX_WINDOWEDGE too */ break; case GWL_EXSTYLE: style.styleOld = wndPtr->dwExStyle; @@ -2699,8 +2697,9 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B switch(offset) { case GWL_STYLE: - req->flags = SET_WIN_STYLE; + req->flags = SET_WIN_STYLE | SET_WIN_EXSTYLE; req->style = newval; + req->ex_style = fix_exstyle(newval, wndPtr->dwExStyle); break; case GWL_EXSTYLE: req->flags = SET_WIN_EXSTYLE; @@ -2734,6 +2733,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B { case GWL_STYLE: wndPtr->dwStyle = newval; + wndPtr->dwExStyle = fix_exstyle(wndPtr->dwStyle, wndPtr->dwExStyle); retval = reply->old_style; break; case GWL_EXSTYLE:

1 0

Matteo Bruni : ntdll: Implement NtYieldExecution() as usleep().
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: b1a79c6b9c3ada0c34b1411b60879962f1815e4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1a79c6b9c3ada0c34b1411b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 6 15:53:57 2021 +0200 ntdll: Implement NtYieldExecution() as usleep(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/ntdll/unix/sync.c | 6 +----- include/config.h.in | 3 --- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configure b/configure index 2ef854b50a9..877c62d9647 100755 --- a/configure +++ b/configure @@ -17913,7 +17913,6 @@ for ac_func in \ posix_fallocate \ prctl \ proc_pidinfo \ - sched_yield \ setproctitle \ setprogname \ sigprocmask \ diff --git a/configure.ac b/configure.ac index b17d1ab4c3d..1928a6503ea 100644 --- a/configure.ac +++ b/configure.ac @@ -2145,7 +2145,6 @@ AC_CHECK_FUNCS(\ posix_fallocate \ prctl \ proc_pidinfo \ - sched_yield \ setproctitle \ setprogname \ sigprocmask \ diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index bbe7d53cba3..86a836a908f 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1505,12 +1505,8 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait, */ NTSTATUS WINAPI NtYieldExecution(void) { -#ifdef HAVE_SCHED_YIELD - sched_yield(); + usleep(0); return STATUS_SUCCESS; -#else - return STATUS_NO_YIELD_PERFORMED; -#endif } diff --git a/include/config.h.in b/include/config.h.in index f262f8a0a12..e975ca8a55d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -519,9 +519,6 @@ /* Define to 1 if you have the `sched_setaffinity' function. */ #undef HAVE_SCHED_SETAFFINITY -/* Define to 1 if you have the `sched_yield' function. */ -#undef HAVE_SCHED_YIELD - /* Define to 1 if `cmd' is a member of `scsireq_t'. */ #undef HAVE_SCSIREQ_T_CMD

1 0

Piotr Caban : user32/tests: Don't use the same condition in ok and todo_wine_if.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 08303d9bbf7da6fbe7f68685d6ec9c4b79de7545 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08303d9bbf7da6fbe7f68685… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:33:48 2021 +0200 user32/tests: Don't use the same condition in ok and todo_wine_if. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d725f129d36..93d1e8ec232 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4548,8 +4548,7 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle else dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE; ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); - /* FIXME: Remove the condition below once Wine is fixed */ - todo_wine_if (dwActualExStyle != dwExStyleOut) + todo_wine_if (!dwStyleIn) ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); DestroyWindow(hwnd); @@ -4702,7 +4701,7 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou WORD class_atom; WCHAR caption[1]; } dlg_data; - DWORD style, ex_style; + DWORD style, ex_style, ex_style_out2; HWND hwnd, grand_parent = 0, parent = 0; struct dialog_param param; @@ -4764,14 +4763,13 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou ok(style == style_out, "expected style %#x, got %#x\n", style_out, style); /* WS_EX_WINDOWEDGE can't always be changed */ if (ex_style_in & WS_EX_DLGMODALFRAME) - ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; + ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE; else if ((style & (WS_DLGFRAME | WS_THICKFRAME)) && !(ex_style_in & WS_EX_STATICEDGE)) - ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; + ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE; else - ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE; - /* FIXME: Remove the condition below once Wine is fixed */ - todo_wine_if (ex_style != ex_style_out) - ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); + ex_style_out2 = ex_style_in & ~WS_EX_WINDOWEDGE; + todo_wine_if (ex_style_out != ex_style_out2) + ok(ex_style == ex_style_out2, "expected ex_style %#x, got %#x\n", ex_style_out2, ex_style); DestroyWindow(hwnd);

1 0

Matteo Bruni : d3dcompiler/tests: Also accept broken HRESULT with d3dcompiler_46.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: ae1f9899bb06ff0998dcf6b446f6ea3354f14804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae1f9899bb06ff0998dcf6b4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 6 18:49:38 2021 +0200 d3dcompiler/tests: Also accept broken HRESULT with d3dcompiler_46. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 75f30e45dce..6d6173824a2 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -164,8 +164,8 @@ static void test_reflection_interfaces(void) expected_hr = D3D_COMPILER_VERSION < 46 ? E_NOINTERFACE : D3D_COMPILER_VERSION == 46 ? E_INVALIDARG : S_OK; hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D12ShaderReflection, (void **)&ref12); - /* Broken with older d3dcompiler_47. */ - ok(hr == expected_hr || broken(expected_hr == S_OK && hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + /* Broken with older d3dcompiler_46, d3dcompiler_47. */ + ok(hr == expected_hr || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); if (hr != S_OK) return;

1 0

Alistair Leslie-Hughes : wininet: Allow up to 4K for response headers.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 42920ad653db4514532ee713467856e5abc5b126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42920ad653db4514532ee713… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 7 13:58:05 2021 +0200 wininet: Allow up to 4K for response headers. LevelHead includes a Header value that is > 3K in length which causes a crash after linking your account. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47505 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.h | 2 +- dlls/wininet/tests/http.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..b361c0d1b4d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -462,7 +462,7 @@ void free_authorization_cache(void) DECLSPEC_HIDDEN; void init_winsock(void) DECLSPEC_HIDDEN; -#define MAX_REPLY_LEN 0x5B4 +#define MAX_REPLY_LEN 0x1000 /* Used for debugging - maybe need to be shared in the Wine debugging code ? */ typedef struct diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ae95b4399e0..d1d7e678853 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2410,6 +2410,17 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n0123456789"; send(c, headmsg, sizeof(headmsg)-1, 0); } + if (strstr(buffer, "GET /test_large_header")) + { + static const char allokmsg[] = "HTTP/1.1 200 OK\r\nServer: winetest\r\n"; + char header[4000 + sizeof("wine-header: ") - 1]; + + memset(header, 'A', sizeof(header)); + memcpy(header, "wine-header: ", sizeof("wine-header: ") - 1); + send(c, allokmsg, sizeof(allokmsg) - 1, 0); + send(c, header, sizeof(header), 0); + send(c, "\r\n\r\n", 4, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3616,6 +3627,41 @@ static void test_not_modified(int port) InternetCloseHandle(ses); } +static void test_large_header(int port) +{ + HINTERNET ses, con, req; + BOOL ret; + DWORD size, index, error; + char buffer[13]; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_large_header", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + index = 0; + size = sizeof(buffer); + strcpy(buffer, "wine-header"); + ret = HttpQueryInfoA(req, HTTP_QUERY_CUSTOM, buffer, &size, &index); + error = GetLastError(); + ok(!ret, "HttpQueryInfoA succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size == 4001, "got %u\n", size); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6190,6 +6236,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_not_modified(si.port); + test_large_header(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port);

1 0