wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Francois Gouget : quartz: Make VMR9_{Break, Complete}Connect() static.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: b5b7947ee86cb734ed3a533f437708da575e9586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b7947ee86cb734ed3a533f4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 8 15:12:51 2012 +0200 quartz: Make VMR9_{Break,Complete}Connect() static. --- dlls/quartz/vmr9.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d7e73c0..f197878 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -436,7 +436,7 @@ static HRESULT WINAPI VMR9_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample return S_FALSE; } -HRESULT WINAPI VMR9_CompleteConnect(BaseRenderer *This, IPin *pReceivePin) +static HRESULT WINAPI VMR9_CompleteConnect(BaseRenderer *This, IPin *pReceivePin) { VMR9Impl *pVMR9 = (VMR9Impl*)This; HRESULT hr = S_OK; @@ -452,7 +452,7 @@ HRESULT WINAPI VMR9_CompleteConnect(BaseRenderer *This, IPin *pReceivePin) return hr; } -HRESULT WINAPI VMR9_BreakConnect(BaseRenderer *This) +static HRESULT WINAPI VMR9_BreakConnect(BaseRenderer *This) { VMR9Impl *pVMR9 = (VMR9Impl*)This; HRESULT hr = S_OK;

1 0

Francois Gouget : d3dcompiler_43: Make debug_{base, node}_type() static.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: b0a339707f4047840c47bee51e7801a317010ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a339707f4047840c47bee51… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 8 15:12:46 2012 +0200 d3dcompiler_43: Make debug_{base,node}_type() static. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 - dlls/d3dcompiler_43/utils.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 9f7fce1..5e5f1d3 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -834,7 +834,6 @@ BOOL pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, const char *entrypoint, char **messages) DECLSPEC_HIDDEN; -const char *debug_base_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; const char *debug_modifiers(DWORD modifiers) DECLSPEC_HIDDEN; void free_hlsl_type(struct hlsl_type *type) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index c890fd8..304f70c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -886,7 +886,7 @@ BOOL pop_scope(struct hlsl_parse_ctx *ctx) return TRUE; } -const char *debug_base_type(const struct hlsl_type *type) +static const char *debug_base_type(const struct hlsl_type *type) { const char *name = "(unknown)"; @@ -961,7 +961,7 @@ const char *debug_modifiers(DWORD modifiers) return wine_dbg_sprintf("%s", string[0] ? string + 1 : ""); } -const char *debug_node_type(enum hlsl_ir_node_type type) +static const char *debug_node_type(enum hlsl_ir_node_type type) { const char *names[] = {

1 0

Jacek Caban : widl: Added --help command line option.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: 42e77c849f32946d1e6417dfb5d6c6d667482871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e77c849f32946d1e6417dfb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 8 11:15:17 2012 +0200 widl: Added --help command line option. --- tools/widl/widl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index b0e2b67..85d66d7 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -56,6 +56,7 @@ static const char usage[] = " -d n Set debug level to 'n'\n" " -D id[=val] Define preprocessor identifier id=val\n" " -E Preprocess only\n" +" --help Display this help and exit\n" " -h Generate headers\n" " -H file Name of header file (default is infile.h)\n" " -I path Set include search dir to path (multiple -I allowed)\n" @@ -149,6 +150,7 @@ enum { PREFIX_ALL_OPTION, PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, + PRINT_HELP, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, @@ -160,6 +162,7 @@ static const char short_options[] = static const struct option long_options[] = { { "dlldata", 1, NULL, DLLDATA_OPTION }, { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, + { "help", 0, NULL, PRINT_HELP }, { "local-stubs", 1, NULL, LOCAL_STUBS_OPTION }, { "oldnames", 0, NULL, OLDNAMES_OPTION }, { "output", 0, NULL, 'o' }, @@ -526,6 +529,9 @@ int main(int argc,char *argv[]) case PREFIX_SERVER_OPTION: prefix_server = xstrdup(optarg); break; + case PRINT_HELP: + fprintf(stderr, "%s", usage); + return 0; case WIN32_OPTION: do_win32 = 1; do_win64 = 0;

1 0

Jacek Caban : wininet: Skip security flags tests on too old wininet versions.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: e3dfbe33f6b1e77b2f3689849ff0454a15be853f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3dfbe33f6b1e77b2f3689849… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 8 15:02:51 2012 +0200 wininet: Skip security flags tests on too old wininet versions. --- dlls/wininet/tests/http.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1d82537..e7be839 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2933,8 +2933,8 @@ static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags) flags = 0xdeadbeef; size = sizeof(flags); res = InternetQueryOptionW(req, 98, &flags, &size); - ok_(__FILE__,line)(res, "InternetQueryOptionW(INTERNET_OPTION_SECURITY_FLAGS) failed: %u\n", GetLastError()); - ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS flags = %x, expected %x\n", flags, ex_flags); + ok_(__FILE__,line)(res, "InternetQueryOptionW(98) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS(98) flags = %x, expected %x\n", flags, ex_flags); } #define set_secflags(a,b,c) _set_secflags(__LINE__,a,b,c) @@ -2975,6 +2975,17 @@ static void test_security_flags(void) ok(req != NULL, "HttpOpenRequest failed\n"); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + flags = 0xdeadbeef; + size = sizeof(flags); + res = InternetQueryOptionW(req, 98, &flags, &size); + if(!res && GetLastError() == ERROR_INVALID_PARAMETER) { + win_skip("Incomplete security flags support, skipping\n"); + + close_async_handle(ses, hCompleteEvent, 2); + CloseHandle(hCompleteEvent); + return; + } + test_secflags_option(req, 0); set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_REVOCATION);

1 0

Jacek Caban : wininet: Read status code directly from request object in InternetErrorDlg.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: 74f596c5edf95fc3677690b642a55070fc6c8f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f596c5edf95fc3677690b64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 8 10:52:42 2012 +0200 wininet: Read status code directly from request object in InternetErrorDlg. --- dlls/wininet/dialogs.c | 30 ++---------------------------- 1 files changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index e660e2b..a3235a4 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -477,28 +477,6 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( } /*********************************************************************** - * WININET_GetConnectionStatus - */ -static INT WININET_GetConnectionStatus( HINTERNET hRequest ) -{ - WCHAR szStatus[0x20]; - DWORD sz, index, dwStatus; - - TRACE("%p\n", hRequest ); - - sz = sizeof szStatus; - index = 0; - if( !HttpQueryInfoW( hRequest, HTTP_QUERY_STATUS_CODE, - szStatus, &sz, &index)) - return -1; - dwStatus = atoiW( szStatus ); - - TRACE("request %p status = %d\n", hRequest, dwStatus ); - - return dwStatus; -} - -/*********************************************************************** * InternetErrorDlg */ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, @@ -531,16 +509,12 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, { case ERROR_SUCCESS: case ERROR_INTERNET_INCORRECT_PASSWORD: { - DWORD dwStatus; - if( !dwError && !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) ) break; if(!req) return ERROR_INVALID_HANDLE; - dwStatus = WININET_GetConnectionStatus( hRequest ); - switch (dwStatus) - { + switch(req->status_code) { case HTTP_STATUS_PROXY_AUTH_REQ: res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_PROXYDLG ), hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params ); @@ -550,7 +524,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, hWnd, WININET_PasswordDialog, (LPARAM) &params ); break; default: - WARN("unhandled status %u\n", dwStatus); + WARN("unhandled status %u\n", req->status_code); } break; }

1 0

Jacek Caban : wininet: Access request object directly in WININET_SetAuthorization.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: ebff6036bfd669c407616f08f15d4dbe6e63e1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebff6036bfd669c407616f08f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 8 10:52:32 2012 +0200 wininet: Access request object directly in WININET_SetAuthorization. --- dlls/wininet/dialogs.c | 31 +++++++------------------------ 1 files changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index ebbda7f..e660e2b 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -175,34 +175,21 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer, /*********************************************************************** * WININET_SetAuthorization */ -static BOOL WININET_SetAuthorization( HINTERNET hRequest, LPWSTR username, +static BOOL WININET_SetAuthorization( http_request_t *request, LPWSTR username, LPWSTR password, BOOL proxy ) { - http_request_t *request; - http_session_t *session; - BOOL ret = FALSE; + http_session_t *session = request->session; LPWSTR p, q; - request = (http_request_t*) get_handle_object( hRequest ); - if( !request ) - return FALSE; - - session = request->session; - if (NULL == session || session->hdr.htype != WH_HHTTPSESSION) - { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - goto done; - } - p = heap_strdupW(username); if( !p ) - goto done; + return FALSE; q = heap_strdupW(password); if( !q ) { heap_free(username); - goto done; + return FALSE; } if (proxy) @@ -224,11 +211,7 @@ static BOOL WININET_SetAuthorization( HINTERNET hRequest, LPWSTR username, session->password = q; } - ret = TRUE; - -done: - WININET_Release( &request->hdr ); - return ret; + return TRUE; } /*********************************************************************** @@ -291,7 +274,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( WININET_GetAuthRealm( params->req->hdr.hInternet, szRealm, sizeof szRealm/sizeof(WCHAR), TRUE) ) WININET_GetSetPassword( hdlg, params->req->session->appInfo->proxy, szRealm, TRUE ); - WININET_SetAuthorization( params->req->hdr.hInternet, username, password, TRUE ); + WININET_SetAuthorization( params->req, username, password, TRUE ); EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; @@ -368,7 +351,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( { WININET_GetSetPassword( hdlg, params->req->session->hostName, szRealm, TRUE ); } - WININET_SetAuthorization( params->req->hdr.hInternet, username, password, FALSE ); + WININET_SetAuthorization( params->req, username, password, FALSE ); EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE;

1 0

Jacek Caban : wininet: Access directly host name from request object in dialogs.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: 4f51146a4683c36ed85a1c37deb9eac15e902979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f51146a4683c36ed85a1c37d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 8 10:52:12 2012 +0200 wininet: Access directly host name from request object in dialogs. --- dlls/wininet/dialogs.c | 43 ++++--------------------------------------- 1 files changed, 4 insertions(+), 39 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 2ec12ae..ebbda7f 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -58,34 +58,6 @@ struct WININET_ErrorDlgParams }; /*********************************************************************** - * WININET_GetServer - * - * Determine the name of the web server - */ -static BOOL WININET_GetServer( HINTERNET hRequest, LPWSTR szBuf, DWORD sz ) -{ - http_request_t *request; - http_session_t *session = NULL; - BOOL ret = FALSE; - - request = (http_request_t*) get_handle_object( hRequest ); - if (NULL == request) - return FALSE; - - session = request->session; - if (NULL == session) - goto done; - - lstrcpynW(szBuf, session->hostName, sz); - - ret = TRUE; - -done: - WININET_Release( &request->hdr ); - return ret; -} - -/*********************************************************************** * WININET_GetAuthRealm * * Determine the name of the (basic) Authentication realm @@ -360,13 +332,8 @@ static INT_PTR WINAPI WININET_PasswordDialog( SetWindowTextW( hitem, szRealm ); } - /* extract the name of the server */ - if( WININET_GetServer( params->req->hdr.hInternet, - szServer, sizeof szServer/sizeof(WCHAR)) ) - { - hitem = GetDlgItem( hdlg, IDC_SERVER ); - SetWindowTextW( hitem, szServer ); - } + hitem = GetDlgItem( hdlg, IDC_SERVER ); + SetWindowTextW( hitem, params->req->session->hostName ); WININET_GetSetPassword( hdlg, szServer, szRealm, FALSE ); @@ -397,11 +364,9 @@ static INT_PTR WINAPI WININET_PasswordDialog( if( hitem && SendMessageW( hitem, BM_GETSTATE, 0, 0 ) && WININET_GetAuthRealm( params->req->hdr.hInternet, - szRealm, sizeof szRealm/sizeof(WCHAR), FALSE ) && - WININET_GetServer( params->req->hdr.hInternet, - szServer, sizeof szServer/sizeof(WCHAR)) ) + szRealm, sizeof szRealm/sizeof(WCHAR), FALSE )) { - WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); + WININET_GetSetPassword( hdlg, params->req->session->hostName, szRealm, TRUE ); } WININET_SetAuthorization( params->req->hdr.hInternet, username, password, FALSE );

1 0

Jacek Caban : wininet: Simplify proxy server access in dialogs.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: 9bc304689626cac7222da450df30b9e04011c307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bc304689626cac7222da450d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 8 10:51:58 2012 +0200 wininet: Simplify proxy server access in dialogs. --- dlls/wininet/dialogs.c | 56 +++-------------------------------------------- 1 files changed, 4 insertions(+), 52 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index a032ebb..2ec12ae 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -58,45 +58,6 @@ struct WININET_ErrorDlgParams }; /*********************************************************************** - * WININET_GetProxyServer - * - * Determine the name of the proxy server the request is using - */ -static BOOL WININET_GetProxyServer( HINTERNET hRequest, LPWSTR szBuf, DWORD sz ) -{ - http_request_t *request; - http_session_t *session = NULL; - appinfo_t *hIC = NULL; - BOOL ret = FALSE; - LPWSTR p; - - request = (http_request_t*) get_handle_object( hRequest ); - if (NULL == request) - return FALSE; - - session = request->session; - if (NULL == session) - goto done; - - hIC = session->appInfo; - if (NULL == hIC) - goto done; - - lstrcpynW(szBuf, hIC->proxy, sz); - - /* FIXME: perhaps it would be better to use InternetCrackUrl here */ - p = strchrW(szBuf, ':'); - if (p) - *p = 0; - - ret = TRUE; - -done: - WININET_Release( &request->hdr ); - return ret; -} - -/*********************************************************************** * WININET_GetServer * * Determine the name of the web server @@ -324,13 +285,8 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( SetWindowTextW( hitem, szRealm ); } - /* extract the name of the proxy server */ - if( WININET_GetProxyServer( params->req->hdr.hInternet, - szServer, sizeof szServer/sizeof(WCHAR)) ) - { - hitem = GetDlgItem( hdlg, IDC_PROXY ); - SetWindowTextW( hitem, szServer ); - } + hitem = GetDlgItem( hdlg, IDC_PROXY ); + SetWindowTextW( hitem, params->req->session->appInfo->proxy ); WININET_GetSetPassword( hdlg, szServer, szRealm, FALSE ); @@ -361,12 +317,8 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( if( hitem && SendMessageW( hitem, BM_GETSTATE, 0, 0 ) && WININET_GetAuthRealm( params->req->hdr.hInternet, - szRealm, sizeof szRealm/sizeof(WCHAR), TRUE ) && - WININET_GetProxyServer( params->req->hdr.hInternet, - szServer, sizeof szServer/sizeof(WCHAR)) ) - { - WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); - } + szRealm, sizeof szRealm/sizeof(WCHAR), TRUE) ) + WININET_GetSetPassword( hdlg, params->req->session->appInfo->proxy, szRealm, TRUE ); WININET_SetAuthorization( params->req->hdr.hInternet, username, password, TRUE ); EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY );

1 0

André Hentschel : iphlpapi: Check for struct icmpstat (for NetBSD).
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: bc99d86729a4f2ce25478d0f36b88b5ba1d7ed7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc99d86729a4f2ce25478d0f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 7 17:19:59 2012 +0200 iphlpapi: Check for struct icmpstat (for NetBSD). --- configure | 14 ++++++++++++++ configure.ac | 6 ++++++ dlls/iphlpapi/ipstats.c | 2 +- include/config.h.in | 3 +++ 4 files changed, 24 insertions(+), 1 deletions(-) diff --git a/configure b/configure index d9e1d65..4428a2c 100755 --- a/configure +++ b/configure @@ -14028,6 +14028,20 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_inhist" "ac_cv_member_struct_icmpstat_icps_inhist" "#ifdef HAVE_NETINET_ICMP_VAR +#include <netinet/icmp_var.h> +#endif +" +if test "x$ac_cv_member_struct_icmpstat_icps_inhist" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_ICMPSTAT_ICPS_INHIST 1 +_ACEOF + + +fi + + ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_outhist" "ac_cv_member_struct_icmpstat_icps_outhist" "#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/configure.ac b/configure.ac index c92c326..9688ba7 100644 --- a/configure.ac +++ b/configure.ac @@ -2282,6 +2282,12 @@ AC_CHECK_MEMBERS([ns_msg._msg_ptr],,, # include <arpa/nameser.h> #endif]) +dnl Check for struct icmpstat +AC_CHECK_MEMBERS([struct icmpstat.icps_inhist],,, +[#ifdef HAVE_NETINET_ICMP_VAR +#include <netinet/icmp_var.h> +#endif]) + dnl Check for struct icmpstat.icps_outhist AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],,, [#ifdef HAVE_SYS_TYPES_H diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 285e700..0edd011 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -493,7 +493,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) } if (kc) kstat_close( kc ); } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && defined(HAVE_STRUCT_ICMPSTAT_ICPS_INHIST) { int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) diff --git a/include/config.h.in b/include/config.h.in index 20a0be3..983c732 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -791,6 +791,9 @@ /* Define to 1 if `direction' is a member of `struct ff_effect'. */ #undef HAVE_STRUCT_FF_EFFECT_DIRECTION +/* Define to 1 if `icps_inhist' is a member of `struct icmpstat'. */ +#undef HAVE_STRUCT_ICMPSTAT_ICPS_INHIST + /* Define to 1 if `icps_outhist' is a member of `struct icmpstat'. */ #undef HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST

1 0

André Hentschel : iphlpapi: Check for struct udpstat ( for NetBSD).
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: 20dbe9121258bcabccf67993e3ae1c65a555623a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20dbe9121258bcabccf67993e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 7 17:19:49 2012 +0200 iphlpapi: Check for struct udpstat (for NetBSD). --- configure | 14 ++++++++++++++ configure.ac | 6 ++++++ dlls/iphlpapi/ipstats.c | 2 +- include/config.h.in | 3 +++ 4 files changed, 24 insertions(+), 1 deletions(-) diff --git a/configure b/configure index a6536b2..d9e1d65 100755 --- a/configure +++ b/configure @@ -14128,6 +14128,20 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct udpstat" "udps_ipackets" "ac_cv_member_struct_udpstat_udps_ipackets" "#ifdef HAVE_NETINET_UDP_VAR_H +#include <netinet/udp_var.h> +#endif +" +if test "x$ac_cv_member_struct_udpstat_udps_ipackets" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_UDPSTAT_UDPS_IPACKETS 1 +_ACEOF + + +fi + + ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_hwaddr" "ac_cv_member_struct_ifreq_ifr_hwaddr" "#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/configure.ac b/configure.ac index 46e448e..c92c326 100644 --- a/configure.ac +++ b/configure.ac @@ -2342,6 +2342,12 @@ AC_CHECK_MEMBERS([struct tcp_stats.tcps_connattempt],,, #include <netinet/tcp_var.h> #endif]) +dnl Check for struct udpstat +AC_CHECK_MEMBERS([struct udpstat.udps_ipackets],,, +[#ifdef HAVE_NETINET_UDP_VAR_H +#include <netinet/udp_var.h> +#endif]) + dnl Check for struct ifreq.ifr_hwaddr AC_CHECK_MEMBERS([struct ifreq.ifr_hwaddr],,, [#ifdef HAVE_SYS_TYPES_H diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 41cb779..285e700 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -927,7 +927,7 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) } if (kc) kstat_close( kc ); } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && defined(HAVE_STRUCT_UDPSTAT_UDPS_IPACKETS) { int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) diff --git a/include/config.h.in b/include/config.h.in index 7d6e261..20a0be3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -866,6 +866,9 @@ /* Define to 1 if `tcps_connattempt' is a member of `struct tcp_stats'. */ #undef HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT +/* Define to 1 if `udps_ipackets' is a member of `struct udpstat'. */ +#undef HAVE_STRUCT_UDPSTAT_UDPS_IPACKETS + /* Define to 1 if the system has the type `struct xinpgen'. */ #undef HAVE_STRUCT_XINPGEN

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012