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

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

Aug. 20, 2013

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

Nikolay Sivov : xmllite: Support predefined xml entities.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

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

Austin English : programs: Add a stub tasklist.exe.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

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

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

Aug. 20, 2013

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

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

Aug. 20, 2013

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

Alistair Leslie-Hughes : oledb32: Implement IErrorRecord::AddErrorRecord.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

Module: wine Branch: master Commit: e1c34221b33dbde0d3e8c97eff70783377ecead4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c34221b33dbde0d3e8c97ef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 19 11:13:34 2013 +1000 oledb32: Implement IErrorRecord::AddErrorRecord. --- dlls/oledb32/errorinfo.c | 31 ++++++++++++++++++++++++++++--- dlls/oledb32/tests/database.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index eef2b37..4a2a1e2 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); struct ErrorEntry { struct list entry; - ERRORINFO* info; + ERRORINFO info; DISPPARAMS dispparams; IUnknown *unknown; DWORD lookupID; @@ -109,6 +109,7 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); ULONG ref = InterlockedDecrement(&This->ref); + struct ErrorEntry *cursor, *cursor2; TRACE("(%p)->%u\n",This,ref+1); @@ -117,6 +118,15 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) SysFreeString(This->source); SysFreeString(This->description); SysFreeString(This->help_file); + + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->errors, struct ErrorEntry, entry) + { + list_remove(&cursor->entry); + if(cursor->unknown) + IUnknown_Release(cursor->unknown); + + heap_free(cursor); + } heap_free(This); } return ref; @@ -226,12 +236,27 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p DWORD dwLookupID, DISPPARAMS *pdispparams, IUnknown *punkCustomError, DWORD dwDynamicErrorID) { ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + struct ErrorEntry *entry; - FIXME("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); + TRACE("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); - if(pErrorInfo) + if(!pErrorInfo) return E_INVALIDARG; + entry = heap_alloc(sizeof(*entry)); + if(!entry) + return E_OUTOFMEMORY; + + entry->info = *pErrorInfo; + if(pdispparams) + entry->dispparams = *pdispparams; + entry->unknown = punkCustomError; + if(entry->unknown) + IUnknown_AddRef(entry->unknown); + entry->lookupID = dwDynamicErrorID; + + list_add_head(&This->errors, &entry->entry); + return S_OK; } diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 7b129b8..f41fd6c 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -31,6 +31,7 @@ #include "shlobj.h" #include "msdaguid.h" #include "initguid.h" +#include "oledberr.h" #include "wine/test.h" @@ -159,6 +160,45 @@ static void test_errorinfo(void) ok(hr == S_OK, "got %08x\n", hr); if(hr == S_OK) { + ERRORINFO info, info2, info3; + ULONG cnt = 0; + + memset(&info, 0, sizeof(ERRORINFO)); + info.dwMinor = 1; + memset(&info2, 0, sizeof(ERRORINFO)); + info2.dwMinor = 2; + memset(&info3, 0, sizeof(ERRORINFO)); + + hr = IErrorRecords_AddErrorRecord(errrecs, NULL, 268435456, NULL, NULL, 0); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IErrorRecords_AddErrorRecord(errrecs, &info, 1, NULL, NULL, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IErrorRecords_GetRecordCount(errrecs, &cnt); + ok(hr == S_OK, "got %08x\n", hr); + ok(cnt == 1, "expected 1 got %d\n", cnt); + + hr = IErrorRecords_AddErrorRecord(errrecs, &info2, 2, NULL, NULL, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IErrorRecords_GetRecordCount(errrecs, &cnt); + ok(hr == S_OK, "got %08x\n", hr); + ok(cnt == 2, "expected 2 got %d\n", cnt); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 100, &info3); + ok(hr == DB_E_BADRECORDNUM, "got %08x\n", hr); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, &info3); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + ok(info3.dwMinor == 2, "expected 2 got %d\n", info3.dwMinor); + } + IErrorRecords_Release(errrecs); }

1 0

Henri Verbeet : d3drm: Avoid LPDIRECTXFILEDATA.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

Module: wine Branch: master Commit: 19b8ba0cb94c6f2ceb917822e9e4701372eb0ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b8ba0cb94c6f2ceb917822e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:12 2013 +0200 d3drm: Avoid LPDIRECTXFILEDATA. --- dlls/d3drm/d3drm.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 097d141..1e3547a 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1355,7 +1355,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v DXFILELOADOPTIONS load_options; IDirectXFile *file = NULL; IDirectXFileEnumObject *enum_object = NULL; - LPDIRECTXFILEDATA pData = NULL; + IDirectXFileData *data = NULL; HRESULT hr; const GUID* pGuid; DWORD size; @@ -1399,11 +1399,11 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v if (hr != DXFILE_OK) goto end; - hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &pData); + hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &data); if (hr != DXFILE_OK) goto end; - hr = IDirectXFileData_GetType(pData, &pGuid); + hr = IDirectXFileData_GetType(data, &pGuid); if (hr != DXFILE_OK) goto end; @@ -1415,7 +1415,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v goto end; } - hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&pHeader); + hr = IDirectXFileData_GetData(data, NULL, &size, (void **)&pHeader); if ((hr != DXFILE_OK) || (size != sizeof(Header))) goto end; @@ -1428,12 +1428,12 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v goto end; } - IDirectXFileData_Release(pData); - pData = NULL; + IDirectXFileData_Release(data); + data = NULL; while (1) { - hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &pData); + hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &data); if (hr == DXFILEERR_NOMOREOBJECTS) { TRACE("No more object\n"); @@ -1445,19 +1445,19 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v goto end; } - ret = load_data(iface, pData, iids, iid_count, load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame); + ret = load_data(iface, data, iids, iid_count, load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame); if (ret != D3DRM_OK) goto end; - IDirectXFileData_Release(pData); - pData = NULL; + IDirectXFileData_Release(data); + data = NULL; } ret = D3DRM_OK; end: - if (pData) - IDirectXFileData_Release(pData); + if (data) + IDirectXFileData_Release(data); if (enum_object) IDirectXFileEnumObject_Release(enum_object); if (file)

1 0

Michael Stefaniuc : winedbg: Fix the return type of read_input(); it is never negative.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

Module: wine Branch: master Commit: 4cf489f9ceb9f99ed33be527479944dae935570b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf489f9ceb9f99ed33be5274… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 20 00:13:42 2013 +0200 winedbg: Fix the return type of read_input(); it is never negative. --- programs/winedbg/debug.l | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index a6ab10c..ef7a2eb 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -61,7 +61,7 @@ void lexeme_flush(void) next_lexeme = 0; } -static int read_input(const char* pfx, char* buf, int size) +static size_t read_input(const char* pfx, char* buf, int size) { int len; static char* last_line = NULL; @@ -107,8 +107,7 @@ static int read_input(const char* pfx, char* buf, int size) } #define YY_INPUT(buf,result,max_size) \ - if ((result = read_input("Wine-dbg>", buf, max_size)) < 0) \ - YY_FATAL_ERROR("read_input in flex scanner failed"); + (result = read_input("Wine-dbg>", buf, max_size)) static int syntax_error; %}

1 0

Alistair Leslie-Hughes : oledberr: Add more defines.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

Module: wine Branch: master Commit: 399bd421e53cc2da169af888a11858abfe4e518f URL: http://source.winehq.org/git/wine.git/?a=commit;h=399bd421e53cc2da169af888a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 20 09:15:24 2013 +1000 oledberr: Add more defines. --- include/oledberr.h | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/include/oledberr.h b/include/oledberr.h index d1306e4..c739d23 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -32,7 +32,21 @@ #define DB_E_BADSTORAGEFLAG 0x80040e26 #define DB_E_BADCOMPAREOP 0x80040e27 #define DB_E_BADSTATUSVALUE 0x80040e28 - +#define DB_E_CANTSCROLLBACKWARDS 0x80040e29 +#define DB_E_BADREGIONHANDLE 0x80040e2a +#define DB_E_NONCONTIGUOUSRANGE 0x80040e2b +#define DB_E_INVALIDTRANSITION 0x80040e2c +#define DB_E_NOTASUBREGION 0x80040e2d +#define DB_E_MULTIPLESTATEMENTS 0x80040e2e +#define DB_E_INTEGRITYVIOLATION 0x80040e2f +#define DB_E_BADTYPENAME 0x80040e30 +#define DB_E_ABORTLIMITREACHED 0x80040e31 +#define DB_E_ROWSETINCOMMAND 0x80040e32 +#define DB_E_CANTTRANSLATE 0x80040e33 +#define DB_E_DUPLICATEINDEXID 0x80040e34 +#define DB_E_NOINDEX 0x80040e35 +#define DB_E_INDEXINUSE 0x80040e36 +#define DB_E_NOTABLE 0x80040e37 #define DB_E_CONCURRENCYVIOLATION 0x80040e38 #define DB_E_TABLEINUSE 0x80040e40 @@ -41,6 +55,14 @@ #define DB_E_BOOKMARKSKIPPED 0x80040e43 #define DB_E_BADPROPERTYVALUE 0x80040e44 #define DB_E_INVALID 0x80040e45 +#define DB_E_BADACCESSORFLAGS 0x80040e46 +#define DB_E_BADSTORAGEFLAGS 0x80040e47 +#define DB_E_BYREFACCESSORNOTSUPPORTED 0x80040e48 +#define DB_E_NULLACCESSORNOTSUPPORTED 0x80040e49 +#define DB_E_NOTPREPARED 0x80040e4a +#define DB_E_BADACCESSORTYPE 0x80040e4b +#define DB_E_WRITEONLYACCESSOR 0x80040e4c +#define DB_SEC_E_AUTH_FAILED 0x80040e4d #define DB_E_ALREADYINITIALIZED 0x80040e52 #define DB_E_DATAOVERFLOW 0x80040e57

1 0

Nikolay Sivov : ole32: Test HRESULT values using proper success code.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

Module: wine Branch: master Commit: ba999f05e11f1e09e43dea1032076576693dd4f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba999f05e11f1e09e43dea103… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 18 09:14:20 2013 +0400 ole32: Test HRESULT values using proper success code. --- dlls/ole32/compobj.c | 4 ++-- dlls/ole32/git.c | 2 +- dlls/ole32/rpc.c | 17 +++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 710f21e..45376d1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2910,7 +2910,7 @@ HRESULT WINAPI CoCreateInstance( { IGlobalInterfaceTable *git = get_std_git(); hres = IGlobalInterfaceTable_QueryInterface(git, iid, ppv); - if (hres) return hres; + if (hres != S_OK) return hres; TRACE("Retrieved GIT (%p)\n", *ppv); return S_OK; @@ -2992,7 +2992,7 @@ HRESULT WINAPI CoCreateInstanceEx( &IID_IUnknown, (VOID**)&pUnk); - if (hr) + if (hr != S_OK) return hr; /* diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index ad921ed..f5dd00b 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -296,7 +296,7 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( hres = CoUnmarshalInterface(stream, riid, ppv); IStream_Release(stream); - if (hres) { + if (hres != S_OK) { WARN("Failed to unmarshal stream\n"); return hres; } diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 5bade5c..dd67546 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1519,7 +1519,7 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) /* if IRpcStubBuffer_Invoke fails, we should raise an exception to tell * the RPC runtime that the call failed */ - if (hr) RpcRaiseException(hr); + if (hr != S_OK) RpcRaiseException(hr); } /* stub registration */ @@ -1656,6 +1656,7 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) DWORD size = (MAX_PATH+1) * sizeof(WCHAR); STARTUPINFOW sinfo; PROCESS_INFORMATION pinfo; + LONG ret; hres = COM_OpenKeyForCLSID(rclsid, wszLocalServer32, KEY_READ, &key); if (FAILED(hres)) { @@ -1663,9 +1664,9 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) return hres; } - hres = RegQueryValueExW(key, NULL, NULL, NULL, (LPBYTE)command, &size); + ret = RegQueryValueExW(key, NULL, NULL, NULL, (LPBYTE)command, &size); RegCloseKey(key); - if (hres) { + if (ret) { WARN("No default value for LocalServer32 key\n"); return REGDB_E_CLASSNOTREG; /* FIXME: check retval */ } @@ -1861,9 +1862,9 @@ HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return E_NOINTERFACE; hres = CreateStreamOnHGlobal(0,TRUE,&pStm); - if (hres) return hres; + if (hres != S_OK) return hres; hres = IStream_Write(pStm,marshalbuffer,bufferlen,&res); - if (hres) goto out; + if (hres != S_OK) goto out; seekto.u.LowPart = 0;seekto.u.HighPart = 0; hres = IStream_Seek(pStm,seekto,STREAM_SEEK_SET,&newpos); @@ -1935,13 +1936,13 @@ static DWORD WINAPI local_server_thread(LPVOID param) TRACE("marshalling LocalServer to client\n"); hres = IStream_Stat(pStm,&ststg,STATFLAG_NONAME); - if (hres) + if (hres != S_OK) break; seekto.u.LowPart = 0; seekto.u.HighPart = 0; hres = IStream_Seek(pStm,seekto,STREAM_SEEK_SET,&newpos); - if (hres) { + if (hres != S_OK) { FIXME("IStream_Seek failed, %x\n",hres); break; } @@ -1950,7 +1951,7 @@ static DWORD WINAPI local_server_thread(LPVOID param) buffer = HeapAlloc(GetProcessHeap(),0,buflen); hres = IStream_Read(pStm,buffer,buflen,&res); - if (hres) { + if (hres != S_OK) { FIXME("Stream Read failed, %x\n",hres); HeapFree(GetProcessHeap(),0,buffer); break;

1 0