August 2013 - Wine-commits - list.winehq.org

Daniel Jelinski : shell32: Simplify cut/copy operations.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: b49c9ac923a7b83c7fe73412a0702f3042e9690e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49c9ac923a7b83c7fe73412a… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Aug 11 01:02:58 2013 +0200 shell32: Simplify cut/copy operations. --- dlls/shell32/shlview_cmenu.c | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 6004afc..4c4edef 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -257,29 +257,17 @@ static void DoDelete(ContextMenu *This) * * copies the currently selected items into the clipboard */ -static BOOL DoCopyOrCut(ContextMenu *This, HWND hwnd, BOOL cut) +static void DoCopyOrCut(ContextMenu *This, HWND hwnd, BOOL cut) { IDataObject *dataobject; - IShellBrowser *browser; - IShellView *view; TRACE("(%p)->(wnd=%p, cut=%d)\n", This, hwnd, cut); - /* get the active IShellView */ - if ((browser = (IShellBrowser*)SendMessageA(hwnd, CWM_GETISHELLBROWSER, 0, 0))) + if (SUCCEEDED(IShellFolder_GetUIObjectOf(This->parent, hwnd, This->cidl, (LPCITEMIDLIST*)This->apidl, &IID_IDataObject, 0, (void**)&dataobject))) { - if (SUCCEEDED(IShellBrowser_QueryActiveShellView(browser, &view))) - { - if (SUCCEEDED(IShellView_GetItemObject(view, SVGIO_SELECTION, &IID_IDataObject, (void**)&dataobject))) - { - OleSetClipboard(dataobject); - IDataObject_Release(dataobject); - } - IShellView_Release(view); - } + OleSetClipboard(dataobject); + IDataObject_Release(dataobject); } - - return TRUE; } /**************************************************************************

1 0

Charles Davis : iphlpapi: Implement find_owning_pid() for Mac OS.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: e3b91673351f63516e558898a8a781f5c549d195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b91673351f63516e558898a… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Aug 19 12:07:25 2013 -0600 iphlpapi: Implement find_owning_pid() for Mac OS. --- configure | 1 + configure.ac | 1 + dlls/iphlpapi/ipstats.c | 61 +++++++++++++++++++++++++++++++++++++++++++++- include/config.h.in | 3 ++ 4 files changed, 64 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c149359..fb05116 100755 --- a/configure +++ b/configure @@ -5968,6 +5968,7 @@ for ac_header in \ kstat.h \ lber.h \ ldap.h \ + libproc.h \ link.h \ linux/cdrom.h \ linux/compiler.h \ diff --git a/configure.ac b/configure.ac index b9de304..958fa5f 100644 --- a/configure.ac +++ b/configure.ac @@ -428,6 +428,7 @@ AC_CHECK_HEADERS(\ kstat.h \ lber.h \ ldap.h \ + libproc.h \ link.h \ linux/cdrom.h \ linux/compiler.h \ diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 9ca51e9..7b41f32 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -123,6 +123,9 @@ #ifdef HAVE_SYS_TIHDR_H #include <sys/tihdr.h> #endif +#ifdef HAVE_LIBPROC_H +#include <libproc.h> +#endif #ifndef ROUNDUP #define ROUNDUP(a) \ @@ -1950,13 +1953,13 @@ done: return map; } -static unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, int inode ) +static unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UINT_PTR inode ) { #ifdef __linux__ unsigned int i, len_socket; char socket[32]; - sprintf( socket, "socket:[%d]", inode ); + sprintf( socket, "socket:[%lu]", inode ); len_socket = strlen( socket ); for (i = 0; i < num_entries; i++) { @@ -1984,6 +1987,36 @@ static unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entri } } return 0; +#elif defined(HAVE_LIBPROC_H) + struct proc_fdinfo *fds; + struct socket_fdinfo sock; + unsigned int i, j, n, fd_len; + + for (i = 0; i < num_entries; i++) + { + fd_len = proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, NULL, 0 ); + if (fd_len <= 0) continue; + + fds = HeapAlloc( GetProcessHeap(), 0, fd_len ); + if (!fds) continue; + + proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, fds, fd_len ); + n = fd_len / sizeof(struct proc_fdinfo); + for (j = 0; j < n; j++) + { + if (fds[j].proc_fdtype != PROX_FDTYPE_SOCKET) continue; + + proc_pidfdinfo( map[i].unix_pid, fds[j].proc_fd, PROC_PIDFDSOCKETINFO, &sock, sizeof(sock) ); + if (sock.psi.soi_pcb == inode) + { + HeapFree( GetProcessHeap(), 0, fds ); + return map[i].pid; + } + } + + HeapFree( GetProcessHeap(), 0, fds ); + } + return 0; #else FIXME( "not implemented\n" ); return 0; @@ -2105,6 +2138,8 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE size_t Len = 0; char *Buf = NULL; struct xinpgen *pXIG, *pOrigXIG; + struct pid_map *pMap; + unsigned NumEntries; if (sysctlbyname ("net.inet.tcp.pcblist", NULL, &Len, NULL, 0) < 0) { @@ -2127,6 +2162,8 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE goto done; } + if (class >= TCP_TABLE_OWNER_PID_LISTENER) pMap = get_pid_map( &NumEntries ); + /* Might be nothing here; first entry is just a header it seems */ if (Len <= sizeof (struct xinpgen)) goto done; @@ -2172,6 +2209,13 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.dwRemotePort = pINData->inp_fport; row.dwState = TCPStateToMIBState (pTCPData->t_state); if (!match_class( class, row.dwState )) continue; + if (class >= TCP_TABLE_OWNER_PID_LISTENER) + row.dwOwningPid = find_owning_pid( pMap, NumEntries, (UINT_PTR)pSockData->so_pcb ); + if (class >= TCP_TABLE_OWNER_MODULE_LISTENER) + { + row.liCreateTimestamp.QuadPart = 0; /* FIXME */ + memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); + } if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) break; } @@ -2368,6 +2412,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE size_t Len = 0; char *Buf = NULL; struct xinpgen *pXIG, *pOrigXIG; + struct pid_map *pMap; + unsigned NumEntries; if (sysctlbyname ("net.inet.udp.pcblist", NULL, &Len, NULL, 0) < 0) { @@ -2390,6 +2436,9 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE goto done; } + if (class >= UDP_TABLE_OWNER_PID) + pMap = get_pid_map( &NumEntries ); + /* Might be nothing here; first entry is just a header it seems */ if (Len <= sizeof (struct xinpgen)) goto done; @@ -2427,6 +2476,14 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE /* Fill in structure details */ row.dwLocalAddr = pINData->inp_laddr.s_addr; row.dwLocalPort = pINData->inp_lport; + if (class >= UDP_TABLE_OWNER_PID) + row.dwOwningPid = find_owning_pid( pMap, NumEntries, (UINT_PTR)pSockData->so_pcb ); + if (class >= UDP_TABLE_OWNER_MODULE) + { + row.liCreateTimestamp.QuadPart = 0; /* FIXME */ + row.u.dwFlags = 0; + memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); + } if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) break; } diff --git a/include/config.h.in b/include/config.h.in index 014c78a..d377d02 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -351,6 +351,9 @@ /* Define to 1 if you have the `ossaudio' library (-lossaudio). */ #undef HAVE_LIBOSSAUDIO +/* Define to 1 if you have the <libproc.h> header file. */ +#undef HAVE_LIBPROC_H + /* Define to 1 if you have the <libv4l1.h> header file. */ #undef HAVE_LIBV4L1_H

1 0

Charles Davis : iphlpapi: Implement find_owning_pid() on FreeBSD.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 3a2247f7d3e8f1c51d1cde6bb6790f84c242a53d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2247f7d3e8f1c51d1cde6bb… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Aug 19 12:07:26 2013 -0600 iphlpapi: Implement find_owning_pid() on FreeBSD. --- configure | 73 +++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 21 +++++++++++++ dlls/iphlpapi/Makefile.in | 2 +- dlls/iphlpapi/ipstats.c | 59 ++++++++++++++++++++++++++++++++++++ include/config.h.in | 9 +++++ 5 files changed, 163 insertions(+), 1 deletions(-) diff --git a/configure b/configure index fb05116..a0f9477 100755 --- a/configure +++ b/configure @@ -638,6 +638,7 @@ LDPATH UNWINDFLAGS BUILTINFLAG EXTRACFLAGS +LIBPROCSTAT LIBKSTAT LIBOPENAL MPG123_LIBS @@ -6031,6 +6032,7 @@ for ac_header in \ sys/prctl.h \ sys/protosw.h \ sys/ptrace.h \ + sys/queue.h \ sys/resource.h \ sys/scsiio.h \ sys/shm.h \ @@ -6046,6 +6048,7 @@ for ac_header in \ sys/timeout.h \ sys/times.h \ sys/uio.h \ + sys/user.h \ sys/utsname.h \ sys/vm86.h \ sys/wait.h \ @@ -6381,6 +6384,28 @@ fi done +for ac_header in libprocstat.h +do : + ac_fn_c_check_header_compile "$LINENO" "libprocstat.h" "ac_cv_header_libprocstat_h" "#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif +#ifdef HAVE_SYS_QUEUE_H +#include <sys/queue.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +" +if test "x$ac_cv_header_libprocstat_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPROCSTAT_H 1 +_ACEOF + +fi + +done + + DLLEXT="" @@ -12367,6 +12392,54 @@ fi fi +if test "$ac_cv_header_libprocstat_h" = "yes" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for procstat_open_sysctl in -lprocstat" >&5 +$as_echo_n "checking for procstat_open_sysctl in -lprocstat... " >&6; } +if ${ac_cv_lib_procstat_procstat_open_sysctl+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lprocstat $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* 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 procstat_open_sysctl (); +int +main () +{ +return procstat_open_sysctl (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_procstat_procstat_open_sysctl=yes +else + ac_cv_lib_procstat_procstat_open_sysctl=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_procstat_procstat_open_sysctl" >&5 +$as_echo "$ac_cv_lib_procstat_procstat_open_sysctl" >&6; } +if test "x$ac_cv_lib_procstat_procstat_open_sysctl" = xyes; then : + +$as_echo "#define HAVE_LIBPROCSTAT 1" >>confdefs.h + + LIBPROCSTAT="-lprocstat" + +fi + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lodbc" >&5 $as_echo_n "checking for -lodbc... " >&6; } if ${ac_cv_lib_soname_odbc+:} false; then : diff --git a/configure.ac b/configure.ac index 958fa5f..0458206 100644 --- a/configure.ac +++ b/configure.ac @@ -491,6 +491,7 @@ AC_CHECK_HEADERS(\ sys/prctl.h \ sys/protosw.h \ sys/ptrace.h \ + sys/queue.h \ sys/resource.h \ sys/scsiio.h \ sys/shm.h \ @@ -506,6 +507,7 @@ AC_CHECK_HEADERS(\ sys/timeout.h \ sys/times.h \ sys/uio.h \ + sys/user.h \ sys/utsname.h \ sys/vm86.h \ sys/wait.h \ @@ -660,6 +662,17 @@ AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h libv4l1.h],,, #include <asm/types.h> #endif]) +AC_CHECK_HEADERS([libprocstat.h],,, +[#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif +#ifdef HAVE_SYS_QUEUE_H +#include <sys/queue.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif]) + dnl **** Check for working dll **** AC_SUBST(DLLEXT,"") @@ -1723,6 +1736,14 @@ then AC_SUBST(LIBKSTAT,"-lkstat")]) fi +dnl **** Check for libprocstat **** +if test "$ac_cv_header_libprocstat_h" = "yes" +then + AC_CHECK_LIB(procstat,procstat_open_sysctl, + [AC_DEFINE(HAVE_LIBPROCSTAT, 1, [Define to 1 if you have the `procstat' library (-lprocstat).]) + AC_SUBST(LIBPROCSTAT,"-lprocstat")]) +fi + dnl **** Check for libodbc **** WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])]) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 892a3cb..9cfc955 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -1,7 +1,7 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi IMPORTS = advapi32 -EXTRALIBS = @RESOLVLIBS@ @LIBKSTAT@ +EXTRALIBS = @RESOLVLIBS@ @LIBKSTAT@ @LIBPROCSTAT@ C_SRCS = \ icmp.c \ diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 7b41f32..962d421 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -123,6 +123,19 @@ #ifdef HAVE_SYS_TIHDR_H #include <sys/tihdr.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif +#ifdef HAVE_SYS_QUEUE_H +#include <sys/queue.h> +#endif +#ifdef HAVE_SYS_USER_H +/* Make sure the definitions of struct kinfo_proc are the same. */ +#include <sys/user.h> +#endif +#ifdef HAVE_LIBPROCSTAT_H +#include <libprocstat.h> +#endif #ifdef HAVE_LIBPROC_H #include <libproc.h> #endif @@ -1987,6 +2000,52 @@ static unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entri } } return 0; +#elif defined(HAVE_LIBPROCSTAT) + struct procstat *pstat; + struct kinfo_proc *proc; + struct filestat_list *fds; + struct filestat *fd; + struct sockstat sock; + unsigned int i, proc_count; + + pstat = procstat_open_sysctl(); + if (!pstat) return 0; + + for (i = 0; i < num_entries; i++) + { + proc = procstat_getprocs( pstat, KERN_PROC_PID, map[i].unix_pid, &proc_count ); + if (!proc || proc_count < 1) continue; + + fds = procstat_getfiles( pstat, proc, 0 ); + if (!fds) + { + procstat_freeprocs( pstat, proc ); + continue; + } + + STAILQ_FOREACH( fd, fds, next ) + { + char errbuf[_POSIX2_LINE_MAX]; + + if (fd->fs_type != PS_FST_TYPE_SOCKET) continue; + + procstat_get_socket_info( pstat, fd, &sock, errbuf ); + + if (sock.so_pcb == inode) + { + procstat_freefiles( pstat, fds ); + procstat_freeprocs( pstat, proc ); + procstat_close( pstat ); + return map[i].pid; + } + } + + procstat_freefiles( pstat, fds ); + procstat_freeprocs( pstat, proc ); + } + + procstat_close( pstat ); + return 0; #elif defined(HAVE_LIBPROC_H) struct proc_fdinfo *fds; struct socket_fdinfo sock; diff --git a/include/config.h.in b/include/config.h.in index d377d02..643e2e1 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -351,6 +351,12 @@ /* Define to 1 if you have the `ossaudio' library (-lossaudio). */ #undef HAVE_LIBOSSAUDIO +/* Define to 1 if you have the `procstat' library (-lprocstat). */ +#undef HAVE_LIBPROCSTAT + +/* Define to 1 if you have the <libprocstat.h> header file. */ +#undef HAVE_LIBPROCSTAT_H + /* Define to 1 if you have the <libproc.h> header file. */ #undef HAVE_LIBPROC_H @@ -978,6 +984,9 @@ /* Define to 1 if you have the <sys/ptrace.h> header file. */ #undef HAVE_SYS_PTRACE_H +/* Define to 1 if you have the <sys/queue.h> header file. */ +#undef HAVE_SYS_QUEUE_H + /* Define to 1 if you have the <sys/resource.h> header file. */ #undef HAVE_SYS_RESOURCE_H

1 0

Austin English : programs: Add a stub tasklist.exe.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: f725c989e94842ceb23efae0d9486e288bd6c57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f725c989e94842ceb23efae0d… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 19 11:25:05 2013 -0700 programs: Add a stub tasklist.exe. --- configure | 1 + configure.ac | 1 + programs/tasklist/Makefile.in | 8 ++++++++ programs/tasklist/tasklist.c | 33 +++++++++++++++++++++++++++++++++ programs/tasklist/version.rc | 26 ++++++++++++++++++++++++++ 5 files changed, 69 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a0f9477..ddf79be 100755 --- a/configure +++ b/configure @@ -16663,6 +16663,7 @@ wine_fn_config_program spoolsv enable_spoolsv install wine_fn_config_program start enable_start install,po wine_fn_config_program svchost enable_svchost install wine_fn_config_program taskkill enable_taskkill install,po +wine_fn_config_program tasklist enable_tasklist install wine_fn_config_program taskmgr enable_taskmgr install,po wine_fn_config_program termsv enable_termsv install wine_fn_config_program uninstaller enable_uninstaller install,po diff --git a/configure.ac b/configure.ac index 0458206..1cba660 100644 --- a/configure.ac +++ b/configure.ac @@ -3251,6 +3251,7 @@ WINE_CONFIG_PROGRAM(spoolsv,,[install]) WINE_CONFIG_PROGRAM(start,,[install,po]) WINE_CONFIG_PROGRAM(svchost,,[install]) WINE_CONFIG_PROGRAM(taskkill,,[install,po]) +WINE_CONFIG_PROGRAM(tasklist,,[install]) WINE_CONFIG_PROGRAM(taskmgr,,[install,po]) WINE_CONFIG_PROGRAM(termsv,,[install]) WINE_CONFIG_PROGRAM(uninstaller,,[install,po]) diff --git a/programs/tasklist/Makefile.in b/programs/tasklist/Makefile.in new file mode 100644 index 0000000..f8c7e47 --- /dev/null +++ b/programs/tasklist/Makefile.in @@ -0,0 +1,8 @@ +MODULE = tasklist.exe +APPMODE = -mconsole -municode + +C_SRCS = tasklist.c + +RC_SRCS = version.rc + +(a)MAKE_PROG_RULES@ diff --git a/programs/tasklist/tasklist.c b/programs/tasklist/tasklist.c new file mode 100644 index 0000000..a0efa63 --- /dev/null +++ b/programs/tasklist/tasklist.c @@ -0,0 +1,33 @@ +/* + * Copyright 2013 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(tasklist); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/programs/tasklist/version.rc b/programs/tasklist/version.rc new file mode 100644 index 0000000..d6eecb5 --- /dev/null +++ b/programs/tasklist/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2013 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine tasklist" +#define WINE_FILENAME_STR "tasklist.exe" +#define WINE_FILEVERSION 6,1,7601,16385 +#define WINE_FILEVERSION_STR "6.1.7601.16385" +#define WINE_PRODUCTVERSION 6,1,7601,16385 +#define WINE_PRODUCTVERSION_STR "6.1.7601.16385" + +#include "wine/wine_common_ver.rc"

1 0

Nikolay Sivov : msxml3: Apostrophe is never escaped by writer.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 610320864b189ca26cf430198aad903cc2be46b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=610320864b189ca26cf430198… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 20 12:49:54 2013 +0400 msxml3: Apostrophe is never escaped by writer. --- dlls/msxml3/tests/saxreader.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index a6c399d..d9c3c4e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1553,8 +1553,8 @@ static HRESULT WINAPI isaxattributes_getValue(ISAXAttributes* iface, int index, { static const WCHAR attrvaluesW[][10] = {{'a','1','j','u','n','k',0}, {'a','2','j','u','n','k',0}, - {'<','&','"','>',0}}; - static const int attrvalueslen[] = {2, 2, 4}; + {'<','&','"','>','\'',0}}; + static const int attrvalueslen[] = {2, 2, 5}; ok(index >= 0 && index <= 2, "invalid index received %d\n", index); @@ -3331,9 +3331,9 @@ struct writer_startendelement_t { ISAXAttributes *attr; }; -static const char startelement_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&">\">"; -static const char startendelement_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&">\"/>"; -static const char startendelement_noescape_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&\">\"/>"; +static const char startelement_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&">\'\">"; +static const char startendelement_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&">\'\"/>"; +static const char startendelement_noescape_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&\">\'\"/>"; static const struct writer_startendelement_t writer_startendelement[] = { /* 0 */ @@ -3751,10 +3751,10 @@ struct writer_characters_t { }; static const struct writer_characters_t writer_characters[] = { - { &CLSID_MXXMLWriter, "< > & \"", "< > & \"" }, - { &CLSID_MXXMLWriter30, "< > & \"", "< > & \"" }, - { &CLSID_MXXMLWriter40, "< > & \"", "< > & \"" }, - { &CLSID_MXXMLWriter60, "< > & \"", "< > & \"" }, + { &CLSID_MXXMLWriter, "< > & \" \'", "< > & \" \'" }, + { &CLSID_MXXMLWriter30, "< > & \" \'", "< > & \" \'" }, + { &CLSID_MXXMLWriter40, "< > & \" \'", "< > & \" \'" }, + { &CLSID_MXXMLWriter60, "< > & \" \'", "< > & \" \'" }, { NULL } };

1 0

Nikolay Sivov : xmllite: Support predefined xml entities.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: c75726ba76935553bf37facc07677152d8956f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75726ba76935553bf37facc0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 20 14:07:32 2013 +0400 xmllite: Support predefined xml entities. --- dlls/xmllite/reader.c | 79 ++++++++++++++++++++++++++++++++++++++----- dlls/xmllite/tests/reader.c | 3 ++ 2 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index efdc6ff..e193e9d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -207,9 +207,9 @@ static const struct IUnknownVtbl xmlreaderinputvtbl; */ typedef struct { - WCHAR *start; /* input position where value starts */ - UINT len; /* length in WCHARs, altered after ReadValueChunk */ WCHAR *str; /* allocated null-terminated string */ + UINT len; /* length in WCHARs, altered after ReadValueChunk */ + WCHAR *start; /* input position where value starts */ } strval; static WCHAR emptyW[] = {0}; @@ -1788,11 +1788,50 @@ static void reader_normalize_space(xmlreader *reader, WCHAR *ptr) *ptr = ' '; } +static WCHAR get_predefined_entity(const strval *name) +{ + static const WCHAR entltW[] = {'l','t'}; + static const WCHAR entgtW[] = {'g','t'}; + static const WCHAR entampW[] = {'a','m','p'}; + static const WCHAR entaposW[] = {'a','p','o','s'}; + static const WCHAR entquotW[] = {'q','u','o','t'}; + + static const strval lt = { (WCHAR*)entltW, 2 }; + static const strval gt = { (WCHAR*)entgtW, 2 }; + static const strval amp = { (WCHAR*)entampW, 3 }; + static const strval apos = { (WCHAR*)entaposW, 4 }; + static const strval quot = { (WCHAR*)entquotW, 4 }; + + switch (name->str[0]) + { + case 'l': + if (strval_eq(name, &lt)) return '<'; + break; + case 'g': + if (strval_eq(name, &gt)) return '>'; + break; + case 'a': + if (strval_eq(name, &amp)) + return '&'; + else if (strval_eq(name, &apos)) + return '\''; + break; + case 'q': + if (strval_eq(name, &quot)) return '\"'; + break; + default: + ; + } + + return 0; +} + /* [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' [67] Reference ::= EntityRef | CharRef [68] EntityRef ::= '&' Name ';' */ static HRESULT reader_parse_reference(xmlreader *reader) { + encoded_buffer *buffer = &reader->input->buffer->utf16; WCHAR *start = reader_get_cur(reader), *ptr; WCHAR ch = 0; int len; @@ -1803,8 +1842,6 @@ static HRESULT reader_parse_reference(xmlreader *reader) if (*ptr == '#') { - encoded_buffer *buffer = &reader->input->buffer->utf16; - reader_skipn(reader, 1); ptr = reader_get_cur(reader); @@ -1850,16 +1887,40 @@ static HRESULT reader_parse_reference(xmlreader *reader) len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); memmove(start+1, ptr+1, len); - buffer->cur = (char*)start; + buffer->cur = (char*)(start+1); *start = ch; - - return S_OK; } else - FIXME("Entity references not supported\n"); + { + strval name; + HRESULT hr; - return E_NOTIMPL; + hr = reader_parse_name(reader, &name); + if (FAILED(hr)) return hr; + + ptr = reader_get_cur(reader); + if (*ptr != ';') return WC_E_SEMICOLON; + + /* predefined entities resolve to a single character */ + ch = get_predefined_entity(&name); + if (ch) + { + len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); + memmove(start+1, ptr+1, len); + buffer->cur = (char*)(start+1); + + *start = ch; + } + else + { + FIXME("undeclared entity %s\n", debugstr_wn(name.str, name.len)); + return WC_E_UNDECLAREDENTITY; + } + + } + + return S_OK; } /* [10 NS] AttValue ::= '"' ([^<&"] | Reference)* '"' | "'" ([^<&'] | Reference)* "'" */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index b53c044..d7400bc 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1576,6 +1576,8 @@ static struct test_entry attributes_tests[] = { { "<a attr1=\"\r\n\tval\n\"/>", "attr1", " val ", S_OK }, { "<a attr1=\"val \"/>", "attr1", "val ", S_OK }, { "<a attr1=\"val \"/>", "attr1", "val ", S_OK }, + { "<a attr1=\"<>&'"\"/>", "attr1", "<>&\'\"", S_OK }, + { "<a attr1=\"&entname;\"/>", NULL, NULL, WC_E_UNDECLAREDENTITY }, { "<a attr1=\"val\"/>", NULL, NULL, WC_E_XMLCHARACTER }, { "<a attr1=\"val &#a;\"/>", NULL, NULL, WC_E_DIGIT, WC_E_SEMICOLON }, { "<a attr1=\"val &#12a;\"/>", NULL, NULL, WC_E_SEMICOLON }, @@ -1583,6 +1585,7 @@ static struct test_entry attributes_tests[] = { { "<a attr1=\"val &#xg;\"/>", NULL, NULL, WC_E_HEXDIGIT, WC_E_SEMICOLON }, { "<a attr1=attrvalue/>", NULL, NULL, WC_E_QUOTE }, { "<a attr1=\"attr<value\"/>", NULL, NULL, WC_E_LESSTHAN }, + { "<a attr1=\"&entname\"/>", NULL, NULL, WC_E_SEMICOLON }, { NULL } };

1 0

Hans Leidekker : rpcrt4: Accept NULL server principal name in RpcBindingSetAuthInfoExA.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 4557e50575c251a656a968add5aa4e3abfcb53e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4557e50575c251a656a968add… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 20 12:53:30 2013 +0200 rpcrt4: Accept NULL server principal name in RpcBindingSetAuthInfoExA. --- dlls/rpcrt4/rpc_binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 8152f87..e575e65 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1729,7 +1729,7 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, if (r == RPC_S_OK) { new_auth_info->server_principal_name = RPCRT4_strdupAtoW((char *)ServerPrincName); - if (new_auth_info->server_principal_name) + if (!ServerPrincName || new_auth_info->server_principal_name) { if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); bind->AuthInfo = new_auth_info;

1 0

Hans Leidekker : rpcrt4: Include authentication schemes in the quality of service match.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 1e3186c6c74b1e8ec6c140eee59815d492a32335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3186c6c74b1e8ec6c140eee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 20 12:54:06 2013 +0200 rpcrt4: Include authentication schemes in the quality of service match. --- dlls/rpcrt4/rpc_binding.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index e575e65..161420d 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1414,7 +1414,18 @@ BOOL RpcQualityOfService_IsEqual(const RpcQualityOfService *qos1, const RpcQuali if (http_credentials1->AuthenticationTarget != http_credentials2->AuthenticationTarget) return FALSE; - /* authentication schemes and server certificate subject not currently used */ + if (http_credentials1->NumberOfAuthnSchemes != http_credentials2->NumberOfAuthnSchemes) + return FALSE; + + if ((!http_credentials1->AuthnSchemes && http_credentials2->AuthnSchemes) || + (http_credentials1->AuthnSchemes && !http_credentials2->AuthnSchemes)) + return FALSE; + + if (memcmp(http_credentials1->AuthnSchemes, http_credentials2->AuthnSchemes, + http_credentials1->NumberOfAuthnSchemes * sizeof(http_credentials1->AuthnSchemes[0]))) + return FALSE; + + /* server certificate subject not currently used */ if (http_credentials1->TransportCredentials != http_credentials2->TransportCredentials) {

1 0

Hans Leidekker : rpcrt4: Trace the first authentication scheme in RpcBindingSetAuthInfoExA/W.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 1cef6a2322d8a39178ac6c86d4b14f765194ad84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cef6a2322d8a39178ac6c86d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 20 12:54:30 2013 +0200 rpcrt4: Trace the first authentication scheme in RpcBindingSetAuthInfoExA/W. --- dlls/rpcrt4/rpc_binding.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 161420d..5b49643 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1663,12 +1663,13 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, const RPC_SECURITY_QOS_V2_A *SecurityQos2 = (const RPC_SECURITY_QOS_V2_A *)SecurityQos; TRACE(", AdditionalSecurityInfoType=%d", SecurityQos2->AdditionalSecurityInfoType); if (SecurityQos2->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) - TRACE(", { %p, 0x%x, %d, %d, %p, %s }", + TRACE(", { %p, 0x%x, %d, %d, %p(%u), %s }", SecurityQos2->u.HttpCredentials->TransportCredentials, SecurityQos2->u.HttpCredentials->Flags, SecurityQos2->u.HttpCredentials->AuthenticationTarget, SecurityQos2->u.HttpCredentials->NumberOfAuthnSchemes, SecurityQos2->u.HttpCredentials->AuthnSchemes, + SecurityQos2->u.HttpCredentials->AuthnSchemes ? *SecurityQos2->u.HttpCredentials->AuthnSchemes : 0, SecurityQos2->u.HttpCredentials->ServerCertificateSubject); } TRACE("}\n"); @@ -1793,12 +1794,13 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, const RPC_SECURITY_QOS_V2_W *SecurityQos2 = (const RPC_SECURITY_QOS_V2_W *)SecurityQos; TRACE(", AdditionalSecurityInfoType=%d", SecurityQos2->AdditionalSecurityInfoType); if (SecurityQos2->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) - TRACE(", { %p, 0x%x, %d, %d, %p, %s }", + TRACE(", { %p, 0x%x, %d, %d, %p(%u), %s }", SecurityQos2->u.HttpCredentials->TransportCredentials, SecurityQos2->u.HttpCredentials->Flags, SecurityQos2->u.HttpCredentials->AuthenticationTarget, SecurityQos2->u.HttpCredentials->NumberOfAuthnSchemes, SecurityQos2->u.HttpCredentials->AuthnSchemes, + SecurityQos2->u.HttpCredentials->AuthnSchemes ? *SecurityQos2->u.HttpCredentials->AuthnSchemes : 0, debugstr_w(SecurityQos2->u.HttpCredentials->ServerCertificateSubject)); } TRACE("}\n");

1 0

Hans Leidekker : rpcrt4: Try to authorize with the first HTTP request instead of waiting for a challenge .
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: d5b2c8e943445bbe5361ff6975578a116b91ba44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b2c8e943445bbe5361ff697… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 20 12:55:13 2013 +0200 rpcrt4: Try to authorize with the first HTTP request instead of waiting for a challenge. --- dlls/rpcrt4/rpc_transport.c | 99 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 99 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 921c43d..e7f10ab 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2355,6 +2355,98 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, return RPC_S_OK; } +static UINT encode_base64(const char *bin, unsigned int len, WCHAR *base64) +{ + static char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + UINT i = 0, x; + + while (len > 0) + { + /* first 6 bits, all from bin[0] */ + base64[i++] = enc[(bin[0] & 0xfc) >> 2]; + x = (bin[0] & 3) << 4; + + /* next 6 bits, 2 from bin[0] and 4 from bin[1] */ + if (len == 1) + { + base64[i++] = enc[x]; + base64[i++] = '='; + base64[i++] = '='; + break; + } + base64[i++] = enc[x | ((bin[1] & 0xf0) >> 4)]; + x = (bin[1] & 0x0f) << 2; + + /* next 6 bits 4 from bin[1] and 2 from bin[2] */ + if (len == 2) + { + base64[i++] = enc[x]; + base64[i++] = '='; + break; + } + base64[i++] = enc[x | ((bin[2] & 0xc0) >> 6)]; + + /* last 6 bits, all from bin [2] */ + base64[i++] = enc[bin[2] & 0x3f]; + bin += 3; + len -= 3; + } + base64[i] = 0; + return i; +} + +static RPC_STATUS insert_authorization_header(HINTERNET request, RpcQualityOfService *qos) +{ + static const WCHAR basicW[] = + {'A','u','t','h','o','r','i','z','a','t','i','o','n',':',' ','B','a','s','i','c',' '}; + RPC_HTTP_TRANSPORT_CREDENTIALS_W *creds; + SEC_WINNT_AUTH_IDENTITY_W *id; + int len, datalen, userlen, passlen; + WCHAR *header, *ptr; + char *data; + RPC_STATUS status = RPC_S_SERVER_UNAVAILABLE; + + if (!qos || qos->qos->AdditionalSecurityInfoType != RPC_C_AUTHN_INFO_TYPE_HTTP) + return RPC_S_OK; + + creds = qos->qos->u.HttpCredentials; + if (creds->AuthenticationTarget != RPC_C_HTTP_AUTHN_TARGET_SERVER || !creds->NumberOfAuthnSchemes) + return RPC_S_OK; + + if (creds->AuthnSchemes[0] != RPC_C_HTTP_AUTHN_SCHEME_BASIC) + { + FIXME("scheme %u not supported\n", creds->AuthnSchemes[0]); + return RPC_S_OK; + } + id = creds->TransportCredentials; + if (!id->User || !id->Password) return RPC_S_OK; + + userlen = WideCharToMultiByte(CP_UTF8, 0, id->User, id->UserLength, NULL, 0, NULL, NULL); + passlen = WideCharToMultiByte(CP_UTF8, 0, id->Password, id->PasswordLength, NULL, 0, NULL, NULL); + + datalen = userlen + passlen + 1; + if (!(data = HeapAlloc(GetProcessHeap(), 0, datalen))) return RPC_S_OUT_OF_MEMORY; + + WideCharToMultiByte(CP_UTF8, 0, id->User, id->UserLength, data, userlen, NULL, NULL); + data[userlen] = ':'; + WideCharToMultiByte(CP_UTF8, 0, id->Password, id->PasswordLength, data + userlen + 1, passlen, NULL, NULL); + + len = ((datalen + 2) * 4) / 3; + if ((header = HeapAlloc(GetProcessHeap(), 0, sizeof(basicW) + (len + 2) * sizeof(WCHAR)))) + { + memcpy(header, basicW, sizeof(basicW)); + ptr = header + sizeof(basicW) / sizeof(basicW[0]); + len = encode_base64(data, datalen, ptr); + ptr[len++] = '\r'; + ptr[len++] = '\n'; + ptr[len] = 0; + if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_ADD_IF_NEW))) status = RPC_S_OK; + HeapFree(GetProcessHeap(), 0, header); + } + HeapFree(GetProcessHeap(), 0, data); + return status; +} + static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) { RpcConnection_http *httpc = (RpcConnection_http *)Connection; @@ -2415,6 +2507,10 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) HeapFree(GetProcessHeap(), 0, url); return RPC_S_SERVER_UNAVAILABLE; } + status = insert_authorization_header(httpc->in_request, httpc->common.QOS); + if (status != RPC_S_OK) + return status; + httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, wszAcceptTypes, flags, (DWORD_PTR)httpc->async_data); HeapFree(GetProcessHeap(), 0, url); @@ -2423,6 +2519,9 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) ERR("HttpOpenRequestW failed with error %d\n", GetLastError()); return RPC_S_SERVER_UNAVAILABLE; } + status = insert_authorization_header(httpc->out_request, httpc->common.QOS); + if (status != RPC_S_OK) + return status; status = rpcrt4_http_prepare_in_pipe(httpc->in_request, httpc->async_data,

1 0