October 2009 - Wine-commits

Jacek Caban : mshtml.idl: Moved IHTMLElement3 dispinterface declaration to macro.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 0e24f312edcbbd58edb499d2ef1aa63e9bca80f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e24f312edcbbd58edb499d2e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:13:34 2009 +0200 mshtml.idl: Moved IHTMLElement3 dispinterface declaration to macro. --- include/mshtml.idl | 483 ++++++---------------------------------------------- 1 files changed, 50 insertions(+), 433 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e24f312edcbbd58edb49…

1 0

Juan Lang : wininet: Quiet a fixme.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b214fc62f13097e87ee0f123f41de07e8260f186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b214fc62f13097e87ee0f123f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 2 08:34:39 2009 -0700 wininet: Quiet a fixme. --- dlls/wininet/internet.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index bad49e4..dbee0a2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2162,6 +2162,8 @@ DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) return res; } + case INTERNET_OPTION_USER_AGENT: + return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; } FIXME("Stub for %d\n", option);

1 0

Juan Lang : winhttp: Move initialization of SSL_CTX to library initialization time.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 016d7c3c0a3f1180f8ed9081d96229f41c486eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=016d7c3c0a3f1180f8ed9081d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 30 10:29:38 2009 -0700 winhttp: Move initialization of SSL_CTX to library initialization time. --- dlls/winhttp/net.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index ed4d4b9..b264314 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -234,6 +234,13 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) pBIO_new_fp( stderr, BIO_NOCLOSE ); method = pSSLv23_method(); + ctx = pSSL_CTX_new( method ); + if (!pSSL_CTX_set_default_verify_paths( ctx )) + { + ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + set_last_error( ERROR_OUTOFMEMORY ); + return FALSE; + } #else WARN("SSL support not compiled in.\n"); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); @@ -333,13 +340,6 @@ BOOL netconn_secure_connect( netconn_t *conn ) X509 *cert; long res; - ctx = pSSL_CTX_new( method ); - if (!pSSL_CTX_set_default_verify_paths( ctx )) - { - ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); - set_last_error( ERROR_OUTOFMEMORY ); - return FALSE; - } if (!(conn->ssl_conn = pSSL_new( ctx ))) { ERR("SSL_new failed: %s\n", pERR_error_string( pERR_get_error(), 0 ));

1 0

Juan Lang : winhttp: Protect OpenSSL initialization with critical section.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 349e82508029bdd600704d5e34146d7251ee4f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349e82508029bdd600704d5e3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 30 10:55:36 2009 -0700 winhttp: Protect OpenSSL initialization with critical section. --- dlls/winhttp/net.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index b264314..a824271 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -76,6 +76,16 @@ static CRITICAL_SECTION cs_gethostbyname = { &critsect_debug, -1, 0, 0, 0, 0 }; #include <openssl/err.h> +static CRITICAL_SECTION init_ssl_cs; +static CRITICAL_SECTION_DEBUG init_ssl_cs_debug = +{ + 0, 0, &init_ssl_cs, + { &init_ssl_cs_debug.ProcessLocksList, + &init_ssl_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": init_ssl_cs") } +}; +static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; + static void *libssl_handle; static void *libcrypto_handle; @@ -180,17 +190,24 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) if (!secure) return TRUE; #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) - if (libssl_handle) return TRUE; + EnterCriticalSection( &init_ssl_cs ); + if (libssl_handle) + { + LeaveCriticalSection( &init_ssl_cs ); + return TRUE; + } if (!(libssl_handle = wine_dlopen( SONAME_LIBSSL, RTLD_NOW, NULL, 0 ))) { ERR("Trying to use SSL but couldn't load %s. Expect trouble.\n", SONAME_LIBSSL); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); + LeaveCriticalSection( &init_ssl_cs ); return FALSE; } if (!(libcrypto_handle = wine_dlopen( SONAME_LIBCRYPTO, RTLD_NOW, NULL, 0 ))) { ERR("Trying to use SSL but couldn't load %s. Expect trouble.\n", SONAME_LIBCRYPTO); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); + LeaveCriticalSection( &init_ssl_cs ); return FALSE; } #define LOAD_FUNCPTR(x) \ @@ -198,6 +215,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) { \ ERR("Failed to load symbol %s\n", #x); \ set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); \ + LeaveCriticalSection( &init_ssl_cs ); \ return FALSE; \ } LOAD_FUNCPTR( SSL_library_init ); @@ -221,6 +239,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) { \ ERR("Failed to load symbol %s\n", #x); \ set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); \ + LeaveCriticalSection( &init_ssl_cs ); \ return FALSE; \ } LOAD_FUNCPTR( BIO_new_fp ); @@ -239,8 +258,10 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) { ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); set_last_error( ERROR_OUTOFMEMORY ); + LeaveCriticalSection( &init_ssl_cs ); return FALSE; } + LeaveCriticalSection( &init_ssl_cs ); #else WARN("SSL support not compiled in.\n"); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR );

1 0

Jacek Caban : mshtml.idl: Moved IHTMLUniqueName dispinterface declaration to macro.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: c8230cfa5196b32903fe8841893152fc8327ec80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8230cfa5196b32903fe88418… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:13:57 2009 +0200 mshtml.idl: Moved IHTMLUniqueName dispinterface declaration to macro. --- include/mshtml.idl | 129 +++++++++++++++------------------------------------ 1 files changed, 38 insertions(+), 91 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index c8b1068..f04cf77 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -5371,6 +5371,31 @@ interface IHTMLElement4 : IDispatch VARIANT onfocusout() /***************************************************************************** + * IHTMLUniqueName interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4d0-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLUniqueName : IDispatch +{ + [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] + HRESULT uniqueNumber([retval, out] LONG * p); + + [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] + HRESULT uniqueID([retval, out] BSTR * p); +} + +#define WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL \ + [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] \ + LONG uniqueNumber(); \ + \ + [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] \ + BSTR uniqueID() + +/***************************************************************************** * IHTMLGenericElement interface */ [ @@ -5406,12 +5431,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -6384,12 +6404,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -6622,25 +6637,7 @@ methods: [propget, id(DISPID_IHTMLIMGELEMENT2_LONGDESC), displaybind, bindable] BSTR longDesc(); -}; - -/***************************************************************************** - * IHTMLUniqueName interface - */ -[ - odl, - oleautomation, - dual, - uuid(3050f4d0-98b5-11cf-bb82-00aa00bdce0b) -] -interface IHTMLUniqueName : IDispatch -{ - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - HRESULT uniqueNumber([retval, out] LONG * p); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - HRESULT uniqueID([retval, out] BSTR * p); -}; +} [ odl, @@ -6888,12 +6885,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -7251,12 +7243,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -7869,12 +7856,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -8157,12 +8139,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -8613,12 +8590,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -9009,12 +8981,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -13133,12 +13100,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -14428,12 +14390,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -14694,12 +14651,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -15030,12 +14982,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType();

1 0

Alexandre Julliard : odbc32: Define correct function prototypes for all libodbc entry points.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 27a44a5d63bd3cbae61f4cbde1b0168d53628932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a44a5d63bd3cbae61f4cbde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 3 14:40:19 2009 +0200 odbc32: Define correct function prototypes for all libodbc entry points. Fix the prototypes of the Unicode functions. --- dlls/odbc32/proxyodbc.c | 1406 +++++++++++++++++++---------------------------- dlls/odbc32/proxyodbc.h | 131 ----- include/sqltypes.h | 10 + 3 files changed, 588 insertions(+), 959 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27a44a5d63bd3cbae61f4…

1 0

Owen Rudge : comctl32: Capture the mouse when performing a listview marquee selection.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b63c1cb219bf1fd3a62c39799a0f248eaa4a979f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b63c1cb219bf1fd3a62c39799… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Oct 2 16:13:26 2009 +0100 comctl32: Capture the mouse when performing a listview marquee selection. --- dlls/comctl32/listview.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index eb2dbfb..e1e51e7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3731,7 +3731,10 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN /* If we're allowing multiple selections, send notification. If return value is non-zero, cancel. */ if (!(infoPtr->dwStyle & LVS_SINGLESEL) && (notify_hdr(infoPtr, LVN_MARQUEEBEGIN, &hdr) == 0)) + { infoPtr->bMarqueeSelect = TRUE; + SetCapture(infoPtr->hwndSelf); + } } else { @@ -9533,9 +9536,12 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT if (infoPtr->bDragging || infoPtr->bMarqueeSelect) { - /* Remove the marquee rectangle */ + /* Remove the marquee rectangle and release our mouse capture */ if (infoPtr->bMarqueeSelect) + { LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeRect); + ReleaseCapture(); + } SetRect(&infoPtr->marqueeRect, 0, 0, 0, 0);

1 0

Juan Lang : wininet: Correct user agent handling.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 05a7e3d38653660abed38604b7df9225bf26b54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a7e3d38653660abed38604b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 2 08:31:31 2009 -0700 wininet: Correct user agent handling. --- dlls/wininet/internet.c | 27 +++++++++++++++++++++++---- dlls/wininet/tests/internet.c | 4 ++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 619674e..bad49e4 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -526,17 +526,36 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe bufsize = *size; if (unicode) { - *size = (strlenW(ai->lpszAgent) + 1) * sizeof(WCHAR); + DWORD len = ai->lpszAgent ? strlenW(ai->lpszAgent) : 0; + + *size = (len + 1) * sizeof(WCHAR); if(!buffer || bufsize < *size) return ERROR_INSUFFICIENT_BUFFER; - strcpyW(buffer, ai->lpszAgent); + if (ai->lpszAgent) + strcpyW(buffer, ai->lpszAgent); + else + *(WCHAR *)buffer = 0; + /* If the buffer is copied, the returned length doesn't include + * the NULL terminator. + */ + *size = len * sizeof(WCHAR); }else { - *size = WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, NULL, 0, NULL, NULL); + if (ai->lpszAgent) + *size = WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, NULL, 0, NULL, NULL); + else + *size = 1; if(!buffer || bufsize < *size) return ERROR_INSUFFICIENT_BUFFER; - WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, buffer, *size, NULL, NULL); + if (ai->lpszAgent) + WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, buffer, *size, NULL, NULL); + else + *(char *)buffer = 0; + /* If the buffer is copied, the returned length doesn't include + * the NULL terminator. + */ + *size -= 1; } return ERROR_SUCCESS; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 144c630..622711a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -184,7 +184,7 @@ static void test_InternetQueryOptionA(void) if (retval) { ok(!strcmp(useragent,buffer),"Got wrong user agent string %s instead of %s\n",buffer,useragent); - todo_wine ok(len == strlen(useragent),"Got wrong user agent length %d instead of %d\n",len,lstrlenA(useragent)); + ok(len == strlen(useragent),"Got wrong user agent length %d instead of %d\n",len,lstrlenA(useragent)); } ok(err == 0xdeadbeef, "Got wrong error code %d\n",err); HeapFree(GetProcessHeap(),0,buffer); @@ -231,7 +231,7 @@ static void test_InternetQueryOptionA(void) len=0; retval=InternetQueryOptionA(hinet,INTERNET_OPTION_USER_AGENT,NULL,&len); err=GetLastError(); - todo_wine ok(len == 1,"Got wrong user agent length %d instead of %d\n",len,1); + ok(len == 1,"Got wrong user agent length %d instead of %d\n",len,1); ok(retval == 0,"Got wrong return value %d\n",retval); ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code%d\n",err);

1 0

Alexandre Julliard : winedump: Use consistent prototypes for option callbacks.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 19c0b3ee4800d5f5566bd85c6462201126205a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c0b3ee4800d5f5566bd85c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 14:52:17 2009 +0200 winedump: Use consistent prototypes for option callbacks. --- tools/winedump/main.c | 26 +++++++++++++------------- tools/winedump/winedump.h | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index 2aba30a..3524a1e 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -80,13 +80,13 @@ static void do_dump (const char *arg) } -static void do_code (void) +static void do_code (const char *arg) { globals.do_code = 1; } -static void do_trace (void) +static void do_trace (const char *arg) { globals.do_trace = 1; globals.do_code = 1; @@ -100,18 +100,18 @@ static void do_forward (const char *arg) globals.do_code = 1; } -static void do_document (void) +static void do_document (const char *arg) { globals.do_documentation = 1; } -static void do_cdecl (void) +static void do_cdecl (const char *arg) { globals.do_cdecl = 1; } -static void do_quiet (void) +static void do_quiet (const char *arg) { globals.do_quiet = 1; } @@ -157,18 +157,18 @@ static void do_symfile (const char *arg) } -static void do_verbose (void) +static void do_verbose (const char *arg) { globals.do_verbose = 1; } -static void do_symdmngl (void) +static void do_symdmngl (const char *arg) { globals.do_demangle = 1; } -static void do_dumphead (void) +static void do_dumphead (const char *arg) { globals.do_dumpheader = 1; } @@ -178,12 +178,12 @@ static void do_dumpsect (const char* arg) globals.dumpsect = arg; } -static void do_rawdebug (void) +static void do_rawdebug (const char *arg) { globals.do_debug = 1; } -static void do_dumpall(void) +static void do_dumpall(const char *arg) { globals.do_dumpheader = 1; globals.do_dump_rawdata = 1; @@ -195,7 +195,7 @@ struct my_option const char *name; Mode mode; int has_arg; - void (*func) (); + void (*func)(const char *arg); const char *usage; }; @@ -226,7 +226,7 @@ static const struct my_option option_table[] = { {NULL, NONE, 0, NULL, NULL} }; -void do_usage (void) +void do_usage (const char *arg) { const struct my_option *opt; printf ("Usage: winedump [-h | sym <sym> | spec <dll> | dump <file>]\n"); @@ -466,7 +466,7 @@ int main (int argc, char *argv[]) return 1; break; case NONE: - do_usage(); + do_usage(0); break; case DUMP: if (globals.input_name == NULL) diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 4b89842..15a8cdb 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -268,10 +268,10 @@ void dump_frame_pointer_omission(unsigned long base, unsigned long len); FILE *open_file (const char *name, const char *ext, const char *mode); #ifdef __GNUC__ -void do_usage (void) __attribute__ ((noreturn)); +void do_usage (const char *arg) __attribute__ ((noreturn)); void fatal (const char *message) __attribute__ ((noreturn)); #else -void do_usage (void); +void do_usage (const char *arg); void fatal (const char *message); #endif

1 0

Alexandre Julliard : winetest: Use explicit prototypes for function pointers.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 577d08c1e7618c7464083f6464858ad33d0bedaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=577d08c1e7618c7464083f646… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 14:54:12 2009 +0200 winetest: Use explicit prototypes for function pointers. --- programs/winetest/main.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index b16b9cf..bab7f11 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -135,8 +135,11 @@ static int running_on_visible_desktop (void) { HWND desktop; HMODULE huser32 = GetModuleHandle("user32.dll"); - FARPROC pGetProcessWindowStation = GetProcAddress(huser32, "GetProcessWindowStation"); - FARPROC pGetUserObjectInformationA = GetProcAddress(huser32, "GetUserObjectInformationA"); + HWINSTA (WINAPI *pGetProcessWindowStation)(void); + BOOL (WINAPI *pGetUserObjectInformationA)(HANDLE,INT,LPVOID,DWORD,LPDWORD); + + pGetProcessWindowStation = (void *)GetProcAddress(huser32, "GetProcessWindowStation"); + pGetUserObjectInformationA = (void *)GetProcAddress(huser32, "GetUserObjectInformationA"); desktop = GetDesktopWindow(); if (!GetWindowLongPtrW(desktop, GWLP_WNDPROC)) /* Win9x */

1 0