October 2009 - Wine-Commits

Juan Lang : winhttp: Unload OpenSSL when unloading winhttp.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: d7d8a0eec46219adc421065223959737a91f92ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d8a0eec46219adc42106522… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 2 07:53:01 2009 -0700 winhttp: Unload OpenSSL when unloading winhttp. --- dlls/winhttp/main.c | 1 + dlls/winhttp/net.c | 16 ++++++++++++++++ dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index c0ac9cb..945123a 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -42,6 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: + netconn_unload(); break; } return TRUE; diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index a824271..7ab9944 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -97,6 +97,7 @@ static SSL_CTX *ctx; MAKE_FUNCPTR( SSL_library_init ); MAKE_FUNCPTR( SSL_load_error_strings ); MAKE_FUNCPTR( SSLv23_method ); +MAKE_FUNCPTR( SSL_CTX_free ); MAKE_FUNCPTR( SSL_CTX_new ); MAKE_FUNCPTR( SSL_new ); MAKE_FUNCPTR( SSL_free ); @@ -221,6 +222,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_library_init ); LOAD_FUNCPTR( SSL_load_error_strings ); LOAD_FUNCPTR( SSLv23_method ); + LOAD_FUNCPTR( SSL_CTX_free ); LOAD_FUNCPTR( SSL_CTX_new ); LOAD_FUNCPTR( SSL_new ); LOAD_FUNCPTR( SSL_free ); @@ -270,6 +272,20 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) return TRUE; } +void netconn_unload( void ) +{ +#if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) + if (libcrypto_handle) + wine_dlclose( libcrypto_handle, NULL, 0 ); + if (libssl_handle) + { + if (ctx) + pSSL_CTX_free( ctx ); + wine_dlclose( libssl_handle, NULL, 0 ); + } +#endif +} + BOOL netconn_connected( netconn_t *conn ) { return (conn->socket != -1); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index e445109..64348a2 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -215,6 +215,7 @@ BOOL netconn_connected( netconn_t * ); BOOL netconn_create( netconn_t *, int, int, int ); BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ); BOOL netconn_init( netconn_t *, BOOL ); +void netconn_unload( void ); BOOL netconn_query_data_available( netconn_t *, DWORD * ); BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ); BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t * );

1 0

Jacek Caban : mshtml.idl: Moved IHTMLElement3 dispinterface declaration to macro.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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

Jacek Caban : mshtml.idl: Moved IHTMLElement2 dispinterface declaration to macro.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: bff6c1cd72dfb72700fa08e252ffb31fbc361a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff6c1cd72dfb72700fa08e25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:12:10 2009 +0200 mshtml.idl: Moved IHTMLElement2 dispinterface declaration to macro. --- include/mshtml.idl | 3680 +++++----------------------------------------------- 1 files changed, 310 insertions(+), 3370 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bff6c1cd72dfb72700fa0…

1 0

Juan Lang : wininet: Quiet a fixme.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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 Oct. 5, 2009

Oct. 5, 2009

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

Alexandre Julliard : odbc32: Define correct function prototypes for all libodbc entry points.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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 Oct. 5, 2009

Oct. 5, 2009

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 Oct. 5, 2009

Oct. 5, 2009

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 : winetest: Use explicit prototypes for function pointers.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

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

Alexandre Julliard : wnaspi32: Use explicit prototypes for function pointers.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

Module: wine Branch: master Commit: a85b6fe2c4ff3b226b99bded919b9efc3d26c43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85b6fe2c4ff3b226b99bded9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 14:55:19 2009 +0200 wnaspi32: Use explicit prototypes for function pointers. --- dlls/wnaspi32/winaspi32.c | 2 +- include/wnaspi32.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 84b54f0..342fb82 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -270,7 +270,7 @@ ASPI_DebugPrintResult(SRB_ExecSCSICmd *prb) static DWORD WNASPI32_DoPosting( SRB_ExecSCSICmd *lpPRB, DWORD status ) { - void (*SRB_PostProc)() = lpPRB->SRB_PostProc; + void (*SRB_PostProc)(SRB_ExecSCSICmd *) = lpPRB->SRB_PostProc; BYTE SRB_Flags = lpPRB->SRB_Flags; if( status == SS_PENDING ) { diff --git a/include/wnaspi32.h b/include/wnaspi32.h index 09ada9c..6a20fb0 100644 --- a/include/wnaspi32.h +++ b/include/wnaspi32.h @@ -150,7 +150,7 @@ typedef struct tagSRB32_ExecSCSICmd { BYTE SRB_CDBLen; /* 15 CDB Length */ BYTE SRB_HaStat; /* 16 Host Adapter Status */ BYTE SRB_TargStat; /* 17 Target Status */ - void (*SRB_PostProc)(); /* 18 Post routine */ + void (*SRB_PostProc)( struct tagSRB32_ExecSCSICmd * ); /* 18 Post routine */ void *SRB_Rsvd2; /* 1C Reserved */ BYTE SRB_Rsvd3[16]; /* 20 Reserved for expansion */ BYTE CDBByte[16]; /* 30 SCSI CDB */ @@ -179,7 +179,7 @@ typedef struct tagSRB32_BusDeviceReset { BYTE SRB_Rsvd1[12]; /* 0A Reserved for Alignment */ BYTE SRB_HaStat; /* 16 Host Adapter Status */ BYTE SRB_TargStat; /* 17 Target Status */ - void (*SRB_PostProc)(); /* 18 Post routine */ + void (*SRB_PostProc)( struct tagSRB32_BusDeviceReset * ); /* 18 Post routine */ void *SRB_Rsvd2; /* 1c Reserved */ BYTE SRB_Rsvd3[32]; /* 20 Reserved */ } SRB_BusDeviceReset, *PSRB_BusDeviceReset;

1 0