June 2012 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : windowscodecs: Add WICIfdMetadataReader registration.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 9f58bef1acbc30598023bb531dc6a1d3612d5c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f58bef1acbc30598023bb531… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 8 14:09:00 2012 +0900 windowscodecs: Add WICIfdMetadataReader registration. --- dlls/windowscodecs/regsvr.c | 45 +++++++++++++++++++----- dlls/windowscodecs/tests/metadata.c | 12 +++++- dlls/windowscodecs/windowscodecs_wincodec.idl | 7 ++++ 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 9dfe37b..85ebc6f 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1290,18 +1290,43 @@ static struct regsvr_converter const converter_list[] = { { NULL } /* list terminator */ }; +static const BYTE no_magic[1] = { 0 }; +static const BYTE no_mask[1] = { 0 }; + +static const struct metadata_pattern ifd_metadata_pattern[] = { + { 0, 1, no_magic, no_mask, 0 }, + { 0 } +}; + +static const struct reader_containers ifd_containers[] = { + { + &GUID_ContainerFormatTiff, + ifd_metadata_pattern + }, + { NULL } /* list terminator */ +}; + static struct regsvr_metadatareader const metadatareader_list[] = { { &CLSID_WICUnknownMetadataReader, - "The Wine Project", - "Unknown Metadata Reader", - "1.0.0.0", - "1.0.0.0", - &GUID_VendorMicrosoft, - &GUID_MetadataFormatUnknown, - 0, - 0, - 0, - NULL + "The Wine Project", + "Unknown Metadata Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatUnknown, + 0, 0, 0, + NULL + }, + { + &CLSID_WICIfdMetadataReader, + "The Wine Project", + "Ifd Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatIfd, + 1, 1, 0, + ifd_containers }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 9f74c0a..a4f9ad1 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -364,8 +364,7 @@ static void test_metadata_IFD(void) hr = CoCreateInstance(&CLSID_WICIfdMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void**)&reader); - todo_wine ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); - if (FAILED(hr)) return; + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); hr = IWICMetadataReader_GetCount(reader, NULL); ok(hr == E_INVALIDARG, "GetCount error %#x\n", hr); @@ -378,6 +377,7 @@ static void test_metadata_IFD(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); +todo_wine ok(count == 6, "unexpected count %u\n", count); hr = IWICMetadataReader_GetEnumerator(reader, NULL); @@ -410,14 +410,22 @@ static void test_metadata_IFD(void) IWICEnumMetadataItem_Release(enumerator); hr = IWICMetadataReader_GetMetadataFormat(reader, &format); +todo_wine ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); +todo_wine ok(IsEqualGUID(&format, &GUID_MetadataFormatIfd), "unexpected format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetMetadataFormat(reader, NULL); ok(hr == E_INVALIDARG, "GetMetadataFormat should fail\n"); hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, NULL); +todo_wine ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + if (FAILED(hr)) + { + IWICMetadataReader_Release(reader); + return; + } hr = IWICMetadataReader_GetValueByIndex(reader, count - 1, NULL, NULL, NULL); ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 56cf112..bc4c994 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -128,3 +128,10 @@ coclass WineTgaDecoder { interface IWICBitmapDecoder; } uuid(699745c2-5066-4b82-a8e3-d40478dbec8c) ] coclass WICUnknownMetadataReader { interface IWICMetadataReader; } + +[ + helpstring("WIC Ifd Metadata Reader"), + threading(both), + uuid(8f914656-9d0a-4eb2-9019-0bf96d8a9ee6) +] +coclass WICIfdMetadataReader { interface IWICIfdMetadataReader; }

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataHandler_GetCount.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 8d71cc1f2d02c427345d38c841806dd8a66eb679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d71cc1f2d02c427345d38c84… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 8 14:08:42 2012 +0900 windowscodecs: Implement MetadataHandler_GetCount. --- dlls/windowscodecs/metadatahandler.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 013fe04..da70b1c 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -149,10 +149,14 @@ static HRESULT WINAPI MetadataHandler_GetMetadataHandlerInfo(IWICMetadataWriter static HRESULT WINAPI MetadataHandler_GetCount(IWICMetadataWriter *iface, UINT *pcCount) { + MetadataHandler *This = impl_from_IWICMetadataWriter(iface); + + TRACE("%p,%p\n", iface, pcCount); + if (!pcCount) return E_INVALIDARG; - FIXME("(%p,%p): stub\n", iface, pcCount); - return E_NOTIMPL; + *pcCount = This->item_count; + return S_OK; } static HRESULT WINAPI MetadataHandler_GetValueByIndex(IWICMetadataWriter *iface,

1 0

Francois Gouget : quartz: Make VMR9_{Break, Complete}Connect() static.
by Alexandre Julliard June 8, 2012

June 8, 2012

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

Dmitry Timoshkov : windowscodecs: Add WICIfdMetadataReader stub implementation.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 781113f4daa025b3e44ed3fe46b7a6507df83b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781113f4daa025b3e44ed3fe4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 8 14:08:52 2012 +0900 windowscodecs: Add WICIfdMetadataReader stub implementation. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/metadatahandler.c | 24 +++++++++++++++++++++++- dlls/windowscodecs/wincodecs_private.h | 3 +-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index e55ce0c..40c8df3 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -60,6 +60,7 @@ static classinfo wic_classes[] = { {&CLSID_WICDefaultFormatConverter, FormatConverter_CreateInstance}, {&CLSID_WineTgaDecoder, TgaDecoder_CreateInstance}, {&CLSID_WICUnknownMetadataReader, UnknownMetadataReader_CreateInstance}, + {&CLSID_WICIfdMetadataReader, IfdMetadataReader_CreateInstance}, {0}}; typedef struct { diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index da70b1c..a4dc174 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -325,7 +325,7 @@ static const IWICPersistStreamVtbl MetadataHandler_PersistStream_Vtbl = { MetadataHandler_SaveEx }; -HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) +static HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) { MetadataHandler *This; HRESULT hr; @@ -597,3 +597,25 @@ HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, vo { return MetadataReader_Create(&UnknownMetadataReader_Vtbl, pUnkOuter, iid, ppv); } + +static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, + DWORD persist_options, MetadataItem **items, DWORD *item_count) +{ + FIXME("stub\n"); + + *items = NULL; + *item_count = 0; + + return S_OK; +} + +static const MetadataHandlerVtbl IfdMetadataReader_Vtbl = { + 0, + &CLSID_WICIfdMetadataReader, + LoadIfdMetadata +}; + +HRESULT IfdMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) +{ + return MetadataReader_Create(&IfdMetadataReader_Vtbl, pUnkOuter, iid, ppv); +} diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 5c21afc..92fa7ef 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -84,8 +84,7 @@ typedef struct _MetadataHandlerVtbl ULARGE_INTEGER *size); } MetadataHandlerVtbl; -extern HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; - extern HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT IfdMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; #endif /* WINCODECS_PRIVATE_H */

1 0

Dmitry Timoshkov : windowscodecs: Protect from invalid input some metadata handler methods.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 1f48c89e04ed9ce63ddbcd95cf8a6b71233e1923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f48c89e04ed9ce63ddbcd95c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 8 14:08:28 2012 +0900 windowscodecs: Protect from invalid input some metadata handler methods. --- dlls/windowscodecs/metadatahandler.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index afcff21..013fe04 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -133,6 +133,8 @@ static ULONG WINAPI MetadataHandler_Release(IWICMetadataWriter *iface) static HRESULT WINAPI MetadataHandler_GetMetadataFormat(IWICMetadataWriter *iface, GUID *pguidMetadataFormat) { + if (!pguidMetadataFormat) return E_INVALIDARG; + FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidMetadataFormat)); return E_NOTIMPL; } @@ -147,6 +149,8 @@ static HRESULT WINAPI MetadataHandler_GetMetadataHandlerInfo(IWICMetadataWriter static HRESULT WINAPI MetadataHandler_GetCount(IWICMetadataWriter *iface, UINT *pcCount) { + if (!pcCount) return E_INVALIDARG; + FIXME("(%p,%p): stub\n", iface, pcCount); return E_NOTIMPL; } @@ -514,6 +518,8 @@ static HRESULT MetadataHandlerEnum_Create(MetadataHandler *parent, DWORD index, { MetadataHandlerEnum *This; + if (!ppIEnumMetadataItem) return E_INVALIDARG; + *ppIEnumMetadataItem = NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataHandlerEnum));

1 0

Jacek Caban : wininet: Access request object directly in WININET_SetAuthorization.
by Alexandre Julliard June 8, 2012

June 8, 2012

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 June 8, 2012

June 8, 2012

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 June 8, 2012

June 8, 2012

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 June 8, 2012

June 8, 2012

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 June 8, 2012

June 8, 2012

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