September 2008 - Wine-commits

Hans Leidekker : winhttp: Handle redirects.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 41a763629f3150e5bcdf878e7d08554c50ef0f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a763629f3150e5bcdf878e7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 3 12:31:09 2008 +0200 winhttp: Handle redirects. --- dlls/winhttp/request.c | 151 ++++++++++++++++++++++++++++++++++-------- dlls/winhttp/tests/winhttp.c | 17 +++++- 2 files changed, 140 insertions(+), 28 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 66d2abd..9a273fa 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -932,6 +932,108 @@ end: return TRUE; } +static BOOL handle_redirect( request_t *request ) +{ + BOOL ret = FALSE; + DWORD size, len; + URL_COMPONENTS uc; + connect_t *connect = request->connect; + INTERNET_PORT port; + WCHAR *hostname = NULL, *location = NULL; + + size = 0; + query_headers( request, WINHTTP_QUERY_LOCATION, NULL, NULL, &size, NULL ); + if (!(location = heap_alloc( size ))) return FALSE; + if (!query_headers( request, WINHTTP_QUERY_LOCATION, NULL, location, &size, NULL )) goto end; + + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, size / sizeof(WCHAR) + 1 ); + + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.dwSchemeLength = uc.dwHostNameLength = uc.dwUrlPathLength = uc.dwExtraInfoLength = ~0UL; + + if (!(ret = WinHttpCrackUrl( location, size / sizeof(WCHAR), 0, &uc ))) goto end; + + if (uc.nScheme == INTERNET_SCHEME_HTTP && request->hdr.flags & WINHTTP_FLAG_SECURE) + { + TRACE("redirect from secure page to non-secure page\n"); + request->hdr.flags &= ~WINHTTP_FLAG_SECURE; + } + else if (uc.nScheme == INTERNET_SCHEME_HTTPS && !(request->hdr.flags & WINHTTP_FLAG_SECURE)) + { + TRACE("redirect from non-secure page to secure page\n"); + request->hdr.flags |= WINHTTP_FLAG_SECURE; + } + + len = uc.dwHostNameLength; + if (!(hostname = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + memcpy( hostname, uc.lpszHostName, len * sizeof(WCHAR) ); + hostname[len] = 0; + + port = uc.nPort ? uc.nPort : (uc.nScheme == INTERNET_SCHEME_HTTPS ? 443 : 80); + if (strcmpiW( connect->servername, hostname ) || connect->serverport != port) + { + heap_free( connect->servername ); + connect->servername = hostname; + connect->serverport = port; + + netconn_close( &request->netconn ); + if (!(ret = netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE ))) goto end; + } + if (!(ret = process_header( request, attr_host, hostname, WINHTTP_ADDREQ_FLAG_REPLACE, TRUE ))) goto end; + if (!(ret = open_connection( request ))) goto end; + + heap_free( request->path ); + request->path = NULL; + if (uc.lpszUrlPath) + { + len = uc.dwUrlPathLength + uc.dwExtraInfoLength; + if (!(request->path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + strcpyW( request->path, uc.lpszUrlPath ); + } + + ret = TRUE; + +end: + if (!ret) heap_free( hostname ); + heap_free( location ); + return ret; +} + +static BOOL read_data( request_t *request, void *buffer, DWORD size, DWORD *read, BOOL async ) +{ + DWORD to_read; + int bytes_read; + + to_read = min( size, request->content_length - request->content_read ); + if (!netconn_recv( &request->netconn, buffer, to_read, async ? 0 : MSG_WAITALL, &bytes_read )) + { + if (bytes_read != to_read) + { + ERR("not all data received %d/%d\n", bytes_read, to_read); + } + /* always return success, even if the network layer returns an error */ + *read = 0; + return TRUE; + } + request->content_read += bytes_read; + *read = bytes_read; + return TRUE; +} + +/* read any content returned by the server so that the connection can be reused */ +static void drain_content( request_t *request ) +{ + DWORD bytes_read; + char buffer[2048]; + + if (request->content_length == ~0UL) return; + for (;;) + { + if (!read_data( request, buffer, sizeof(buffer), &bytes_read, FALSE ) || !bytes_read) return; + } +} + /*********************************************************************** * WinHttpReceiveResponse (winhttp.@) */ @@ -939,7 +1041,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) { BOOL ret = TRUE; request_t *request; - DWORD size, query; + DWORD size, query, status; TRACE("%p, %p\n", hrequest, reserved); @@ -955,12 +1057,28 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) return FALSE; } - ret = receive_response( request, TRUE ); + for (;;) + { + if (!(ret = receive_response( request, TRUE ))) break; + + size = sizeof(DWORD); + query = WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER; + if (!(ret = query_headers( request, query, NULL, &status, &size, NULL ))) break; - size = sizeof(DWORD); - query = WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER; - if (!query_headers( request, query, NULL, &request->content_length, &size, NULL )) - request->content_length = ~0UL; + size = sizeof(DWORD); + query = WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER; + if (!query_headers( request, query, NULL, &request->content_length, &size, NULL )) + request->content_length = ~0UL; + + if (status == 200) break; + if (status == 301 || status == 302) + { + if (request->hdr.flags & WINHTTP_DISABLE_REDIRECTS) break; + drain_content( request ); + if (!(ret = handle_redirect( request ))) break; + } + ret = send_request( request, NULL, 0, NULL, 0, 0, 0 ); + } release_object( &request->hdr ); return ret; @@ -994,27 +1112,6 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return ret; } -static BOOL read_data( request_t *request, void *buffer, DWORD size, DWORD *read, BOOL async ) -{ - DWORD to_read; - int bytes_read; - - to_read = min( size, request->content_length - request->content_read ); - if (!netconn_recv( &request->netconn, buffer, to_read, async ? 0 : MSG_WAITALL, &bytes_read )) - { - if (bytes_read != to_read) - { - ERR("not all data received %d/%d\n", bytes_read, to_read); - } - /* always return success, even if the network layer returns an error */ - *read = 0; - return TRUE; - } - request->content_read += bytes_read; - *read = bytes_read; - return TRUE; -} - static DWORD get_chunk_size( const char *buffer ) { const char *p; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3e963ac..5b3bd38 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -532,7 +532,7 @@ static void test_secure_connection(void) static const WCHAR google[] = {'w','w','w','.','g','o','o','g','l','e','.','c','o','m',0}; HANDLE ses, con, req; - DWORD size; + DWORD size, status; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -566,6 +566,10 @@ static void test_secure_connection(void) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed unexpectedly %u\n", GetLastError()); + size = 0; ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); ok(!ret, "succeeded unexpectedly\n"); @@ -581,6 +585,7 @@ static void test_request_parameter_defaults(void) static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; HANDLE ses, con, req; + DWORD size, status; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -598,6 +603,11 @@ static void test_request_parameter_defaults(void) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed unexpectedly %u\n", GetLastError()); + ok(status == 200, "request failed unexpectedly %u\n", status); + WinHttpCloseHandle(req); req = WinHttpOpenRequest(con, empty, empty, empty, NULL, NULL, 0); @@ -609,6 +619,11 @@ static void test_request_parameter_defaults(void) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed unexpectedly %u\n", GetLastError()); + ok(status == 200, "request failed unexpectedly %u\n", status); + WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses);

1 0

Hans Leidekker : winhttp: Add an initial implementation of WinHttpQueryOption and WinHttpSetOption.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: a74b52cf38402b4dc082e19eea880f7afd83881b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a74b52cf38402b4dc082e19ee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 3 12:31:24 2008 +0200 winhttp: Add an initial implementation of WinHttpQueryOption and WinHttpSetOption. --- dlls/winhttp/main.c | 22 ---------- dlls/winhttp/session.c | 85 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 86 insertions(+), 23 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 5ea3994..4a4aea8 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -85,28 +85,6 @@ HRESULT WINAPI DllUnregisterServer(void) return S_OK; } -/*********************************************************************** - * WinHttpQueryOption (winhttp.@) - */ -BOOL WINAPI WinHttpQueryOption (HINTERNET hInternet, DWORD dwOption, LPVOID lpBuffer, LPDWORD lpdwBufferLength) -{ - FIXME("(%d): stub\n", dwOption); - - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; -} - -/*********************************************************************** - * WinHttpSetOption (winhttp.@) - */ -BOOL WINAPI WinHttpSetOption (HINTERNET hInternet, DWORD dwOption, LPVOID lpBuffer, DWORD dwBufferLength) -{ - FIXME("stub\n"); - - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; -} - #define SCHEME_HTTP 3 #define SCHEME_HTTPS 4 diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 885a4a4..d044d90 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -303,6 +303,91 @@ BOOL WINAPI WinHttpCloseHandle( HINTERNET handle ) return TRUE; } +static BOOL query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) +{ + BOOL ret = FALSE; + + switch (option) + { + case WINHTTP_OPTION_CONTEXT_VALUE: + { + *(DWORD_PTR *)buffer = hdr->context; + *buflen = sizeof(DWORD_PTR); + return TRUE; + } + default: + { + if (hdr->vtbl->query_option) ret = hdr->vtbl->query_option( hdr, option, buffer, buflen ); + else FIXME("unimplemented option %u\n", option); + } + } + return ret; +} + +/*********************************************************************** + * WinHttpQueryOption (winhttp.@) + */ +BOOL WINAPI WinHttpQueryOption( HINTERNET handle, DWORD option, LPVOID buffer, LPDWORD buflen ) +{ + BOOL ret = FALSE; + object_header_t *hdr; + + TRACE("%p, %u, %p, %p\n", handle, option, buffer, buflen); + + if (!(hdr = grab_object( handle ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return FALSE; + } + + ret = query_option( hdr, option, buffer, buflen ); + + release_object( hdr ); + return ret; +} + +static BOOL set_option( object_header_t *hdr, DWORD option, LPVOID buffer, DWORD buflen ) +{ + BOOL ret = FALSE; + + switch (option) + { + case WINHTTP_OPTION_CONTEXT_VALUE: + { + hdr->context = *(DWORD_PTR *)buffer; + return TRUE; + } + default: + { + if (hdr->vtbl->set_option) ret = hdr->vtbl->set_option( hdr, option, buffer, buflen ); + else FIXME("unimplemented option %u\n", option); + } + } + return ret; +} + +/*********************************************************************** + * WinHttpSetOption (winhttp.@) + */ +BOOL WINAPI WinHttpSetOption( HINTERNET handle, DWORD option, LPVOID buffer, DWORD buflen ) +{ + BOOL ret = FALSE; + object_header_t *hdr; + + TRACE("%p, %u, %p, %u\n", handle, option, buffer, buflen); + + if (!(hdr = grab_object( handle ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return FALSE; + } + + ret = set_option( hdr, option, buffer, buflen ); + + release_object( hdr ); + return ret; +} + /*********************************************************************** * WinHttpDetectAutoProxyConfigUrl (winhttp.@) */ diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 6bd6949..04dd7dc 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -41,7 +41,7 @@ typedef struct _object_header_t object_header_t; typedef struct { void (*destroy)( object_header_t * ); - BOOL (*query_option)( object_header_t *, DWORD, void *, DWORD *, BOOL ); + BOOL (*query_option)( object_header_t *, DWORD, void *, DWORD * ); BOOL (*set_option)( object_header_t *, DWORD, void *, DWORD ); } object_vtbl_t;

1 0

Hans Leidekker : winhttp: Allow reusing a secure connection.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 20d06b2a4cade847d8f4f7c252b5f6e1762dbb2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d06b2a4cade847d8f4f7c25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 3 12:30:08 2008 +0200 winhttp: Allow reusing a secure connection. --- dlls/winhttp/net.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 90950cb..498e5ac 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -277,10 +277,8 @@ BOOL netconn_close( netconn_t *conn ) pSSL_shutdown( conn->ssl_conn ); pSSL_free( conn->ssl_conn ); - pSSL_CTX_free( conn->ssl_ctx ); conn->ssl_conn = NULL; - conn->ssl_ctx = NULL; conn->secure = FALSE; } #endif

1 0

Hans Leidekker : winhttp: WinHttpCrackUrl and InternetCrackUrlW use different scheme constants.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 9f8d4fe082349a9079a666d7be0a2c2fd208b233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8d4fe082349a9079a666d7b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 3 12:30:32 2008 +0200 winhttp: WinHttpCrackUrl and InternetCrackUrlW use different scheme constants. --- dlls/winhttp/main.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 2d3ec2f..5ea3994 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -27,6 +27,8 @@ #include "wine/debug.h" +#include "winhttp_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(winhttp); /****************************************************************** @@ -105,6 +107,9 @@ BOOL WINAPI WinHttpSetOption (HINTERNET hInternet, DWORD dwOption, LPVOID lpBuff return FALSE; } +#define SCHEME_HTTP 3 +#define SCHEME_HTTPS 4 + BOOL WINAPI InternetCrackUrlW( LPCWSTR, DWORD, DWORD, LPURL_COMPONENTSW ); BOOL WINAPI InternetCreateUrlW( LPURL_COMPONENTS, DWORD, LPWSTR, LPDWORD ); @@ -113,8 +118,22 @@ BOOL WINAPI InternetCreateUrlW( LPURL_COMPONENTS, DWORD, LPWSTR, LPDWORD ); */ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW components ) { + BOOL ret; + TRACE("%s, %d, %x, %p\n", debugstr_w(url), len, flags, components); - return InternetCrackUrlW( url, len, flags, components ); + + if ((ret = InternetCrackUrlW( url, len, flags, components ))) + { + /* fix up an incompatibility between wininet and winhttp */ + if (components->nScheme == SCHEME_HTTP) components->nScheme = INTERNET_SCHEME_HTTP; + else if (components->nScheme == SCHEME_HTTPS) components->nScheme = INTERNET_SCHEME_HTTPS; + else + { + set_last_error( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); + return FALSE; + } + } + return ret; } /***********************************************************************

1 0

Hans Leidekker : winhttp: Move handling of default request parameters into build_request_string().
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 8063f5cbd4332b8d66d4adc2a390f76d1875fd7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8063f5cbd4332b8d66d4adc2a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 3 12:30:44 2008 +0200 winhttp: Move handling of default request parameters into build_request_string(). --- dlls/winhttp/request.c | 14 +++++++++++--- dlls/winhttp/session.c | 14 +++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b0b81f0..66d2abd 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -458,17 +458,25 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD return ret; } -static WCHAR *build_request_string( request_t *request, LPCWSTR verb, LPCWSTR path, LPCWSTR version ) +static WCHAR *build_request_string( request_t *request ) { static const WCHAR space[] = {' ',0}; static const WCHAR crlf[] = {'\r','\n',0}; static const WCHAR colon[] = {':',' ',0}; static const WCHAR twocrlf[] = {'\r','\n','\r','\n',0}; + static const WCHAR get[] = {'G','E','T',0}; + static const WCHAR slash[] = {'/',0}; + static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0}; WCHAR *ret; const WCHAR **headers, **p; + const WCHAR *verb = get, *path = slash, *version = http1_1; unsigned int len, i = 0, j; + if (request->verb && request->verb[0]) verb = request->verb; + if (request->path && request->path[0]) path = request->path; + if (request->version && request->version[0]) version = request->version; + /* allocate space for an array of all the string pointers to be added */ len = request->num_headers * 4 + 7; if (!(headers = heap_alloc( len * sizeof(LPCWSTR) ))) return NULL; @@ -537,7 +545,7 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID DWORD len; if (request_only) - headers = build_request_string( request, request->verb, request->path, request->version ); + headers = build_request_string( request ); else headers = request->raw_headers; @@ -752,7 +760,7 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len } if (!(ret = open_connection( request ))) goto end; - if (!(req = build_request_string( request, request->verb, request->path, request->version ))) goto end; + if (!(req = build_request_string( request ))) goto end; if (!(req_ascii = strdupWA( req ))) goto end; TRACE("full request: %s\n", debugstr_a(req_ascii)); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 9b66dcc..885a4a4 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -232,10 +232,6 @@ static const object_vtbl_t request_vtbl = HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR object, LPCWSTR version, LPCWSTR referrer, LPCWSTR *types, DWORD flags ) { - static const WCHAR get[] = {'G','E','T',0}; - static const WCHAR slash[] = {'/',0}; - static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0}; - request_t *request; connect_t *connect; HINTERNET hrequest = NULL; @@ -272,13 +268,9 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end; - if (!verb || !*verb) verb = get; - if (!object || !*object) object = slash; - if (!version || !*version) version = http1_1; - - if (!(request->verb = strdupW( verb ))) goto end; - if (!(request->path = strdupW( object ))) goto end; - if (!(request->version = strdupW( version ))) goto end; + if (verb && !(request->verb = strdupW( verb ))) goto end; + if (object && !(request->path = strdupW( object ))) goto end; + if (version && !(request->version = strdupW( version ))) goto end; if (!(hrequest = alloc_handle( &request->hdr ))) goto end; request->hdr.handle = hrequest;

1 0

Jeff Latimer : user32/tests: Deregister the class created by create_dde_window.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: a251a8f166191c10957f82c7642cea2f4e766bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a251a8f166191c10957f82c76… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Sep 2 20:46:51 2008 +1000 user32/tests: Deregister the class created by create_dde_window. --- dlls/user32/tests/dde.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index d41ccdd..5785ff0 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -73,6 +73,12 @@ static void create_dde_window(HWND *hwnd, LPCSTR name, WNDPROC wndproc) assert(*hwnd); } +static void destroy_dde_window(HWND *hwnd, LPCSTR name) +{ + DestroyWindow(*hwnd); + UnregisterClass(name, GetModuleHandleA(0)); +} + static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { UINT_PTR lo, hi; @@ -243,7 +249,7 @@ static void test_msg_server(HANDLE hproc, HANDLE hthread) while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } - DestroyWindow(hwnd); + destroy_dde_window(&hwnd, "dde_server"); GetExitCodeProcess( hproc, &res ); ok( !res, "client failed with %u error(s)\n", res ); } @@ -1107,7 +1113,7 @@ static void test_msg_client() flush_events(); - DestroyWindow(client_hwnd); + destroy_dde_window(&client_hwnd, "dde_client"); } static LRESULT WINAPI hook_dde_client_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)

1 0

Jeff Zaroyko : kernel32: Add some tests for DeleteFile.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 1b5873accc6cdc35e9697ca0346d19b4a2514086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5873accc6cdc35e9697ca03… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sun Aug 31 21:53:48 2008 +1000 kernel32: Add some tests for DeleteFile. --- dlls/kernel32/tests/file.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 5b8b00d..fce3fad 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2,6 +2,7 @@ * Unit tests for file functions in Wine * * Copyright (c) 2002, 2004 Jakob Eriksson + * Copyright (c) 2008 Jeff Zaroyko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -841,6 +842,10 @@ static void test_DeleteFileA( void ) static void test_DeleteFileW( void ) { BOOL ret; + WCHAR pathW[MAX_PATH]; + WCHAR pathsubW[MAX_PATH]; + static const WCHAR dirW[] = {'d','e','l','e','t','e','f','i','l','e',0}; + static const WCHAR subdirW[] = {'\\','s','u','b',0}; static const WCHAR emptyW[]={'\0'}; ret = DeleteFileW(NULL); @@ -852,6 +857,35 @@ static void test_DeleteFileW( void ) ret = DeleteFileW(emptyW); ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, "DeleteFileW(\"\") returned ret=%d error=%d\n",ret,GetLastError()); + + /* test DeleteFile on empty directory */ + ret = GetTempPathW(MAX_PATH, pathW); + if (ret + sizeof(dirW)/sizeof(WCHAR)-1 + sizeof(subdirW)/sizeof(WCHAR)-1 >= MAX_PATH) + { + ok(0, "MAX_PATH exceeded in constructing paths"); + return; + } + lstrcatW(pathW, dirW); + lstrcpyW(pathsubW, pathW); + lstrcatW(pathsubW, subdirW); + ret = CreateDirectoryW(pathW, NULL); + ok(ret == TRUE, "couldn't create directory deletefile\n"); + ret = DeleteFileW(pathW); + todo_wine ok(ret == FALSE, "DeleteFile should fail for empty directories\n"); + ret = RemoveDirectoryW(pathW); + todo_wine ok(ret == TRUE, "expected to remove directory deletefile\n"); + + /* test DeleteFile on non-empty directory */ + ret = CreateDirectoryW(pathW, NULL); + ok(ret == TRUE, "couldn't create directory deletefile\n"); + ret = CreateDirectoryW(pathsubW, NULL); + ok(ret == TRUE, "couldn't create directory deletefile\\sub\n"); + ret = DeleteFileW(pathW); + todo_wine ok(ret == FALSE, "DeleteFile should fail for non-empty directories\n"); + ret = RemoveDirectoryW(pathsubW); + ok(ret == TRUE, "expected to remove directory deletefile\\sub\n"); + ret = RemoveDirectoryW(pathW); + ok(ret == TRUE, "expected to remove directory deletefile\n"); } #define IsDotDir(x) ((x[0] == '.') && ((x[1] == 0) || ((x[1] == '.') && (x[2] == 0))))

1 0

Jeff Zaroyko : ntdll: Add some tests for NtDeleteFile.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: a2022c898a03000519176b3ef881bbec66fd555a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2022c898a03000519176b3ef… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sun Aug 31 21:54:03 2008 +1000 ntdll: Add some tests for NtDeleteFile. --- dlls/ntdll/tests/file.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ae0bcef..b58b1a7 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2,6 +2,7 @@ * * Copyright 2007 Jeff Latimer * Copyright 2007 Andrey Turkin + * Copyright 2008 Jeff Zaroyko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,9 +39,12 @@ #define IO_COMPLETION_ALL_ACCESS 0x001F0003 #endif +static NTSTATUS (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); +static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); static NTSTATUS (WINAPI *pNtCreateMailslotFile)( PHANDLE, ULONG, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, ULONG, ULONG, ULONG, PLARGE_INTEGER ); +static NTSTATUS (WINAPI *pNtDeleteFile)(POBJECT_ATTRIBUTES ObjectAttributes); static NTSTATUS (WINAPI *pNtReadFile)(HANDLE hFile, HANDLE hEvent, PIO_APC_ROUTINE apc, void* apc_user, PIO_STATUS_BLOCK io_status, void* buffer, ULONG length, @@ -136,6 +140,68 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) ok( !reserved, "reserved is not 0: %x\n", reserved ); } +static void delete_file_test(void) +{ + NTSTATUS ret; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + WCHAR pathW[MAX_PATH]; + WCHAR pathsubW[MAX_PATH]; + static const WCHAR testdirW[] = {'n','t','d','e','l','e','t','e','f','i','l','e',0}; + static const WCHAR subdirW[] = {'\\','s','u','b',0}; + + ret = GetTempPathW(MAX_PATH, pathW); + if (!ret) + { + ok(0, "couldn't get temp dir\n"); + return; + } + if (ret + sizeof(testdirW)/sizeof(WCHAR)-1 + sizeof(subdirW)/sizeof(WCHAR)-1 >= MAX_PATH) + { + ok(0, "MAX_PATH exceeded in constructing paths\n"); + return; + } + + lstrcatW(pathW, testdirW); + lstrcpyW(pathsubW, pathW); + lstrcatW(pathsubW, subdirW); + + ret = CreateDirectoryW(pathW, NULL); + ok(ret == TRUE, "couldn't create directory ntdeletefile\n"); + if (!pRtlDosPathNameToNtPathName_U(pathW, &nameW, NULL, NULL)) + { + ok(0,"RtlDosPathNametoNtPathName_U failed\n"); + return; + } + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &nameW; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + /* test NtDeleteFile on an empty directory */ + ret = pNtDeleteFile(&attr); + ok(ret == STATUS_SUCCESS, "NtDeleteFile should succeed in removing an empty directory\n"); + ret = RemoveDirectoryW(pathW); + ok(ret == FALSE, "expected to fail removing directory, NtDeleteFile should have removed it\n"); + + /* test NtDeleteFile on a non-empty directory */ + ret = CreateDirectoryW(pathW, NULL); + ok(ret == TRUE, "couldn't create directory ntdeletefile ?!\n"); + ret = CreateDirectoryW(pathsubW, NULL); + ok(ret == TRUE, "couldn't create directory subdir\n"); + ret = pNtDeleteFile(&attr); + ok(ret == STATUS_SUCCESS, "expected NtDeleteFile to ret STATUS_SUCCESS\n"); + ret = RemoveDirectoryW(pathsubW); + ok(ret == TRUE, "expected to remove directory ntdeletefile\\sub\n"); + ret = RemoveDirectoryW(pathW); + ok(ret == TRUE, "expected to remove directory ntdeletefile, NtDeleteFile failed.\n"); + + pRtlFreeUnicodeString( &nameW ); +} + static void read_file_test(void) { const char text[] = "foobar"; @@ -623,8 +689,11 @@ START_TEST(file) return; } + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); + pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile"); + pNtDeleteFile = (void *)GetProcAddress(hntdll, "NtDeleteFile"); pNtReadFile = (void *)GetProcAddress(hntdll, "NtReadFile"); pNtWriteFile = (void *)GetProcAddress(hntdll, "NtWriteFile"); pNtClose = (void *)GetProcAddress(hntdll, "NtClose"); @@ -635,6 +704,7 @@ START_TEST(file) pNtSetIoCompletion = (void *)GetProcAddress(hntdll, "NtSetIoCompletion"); pNtSetInformationFile = (void *)GetProcAddress(hntdll, "NtSetInformationFile"); + delete_file_test(); read_file_test(); nt_mailslot_test(); test_iocompletion();

1 0

Hans Leidekker : winhttp: Avoid testing errno when it isn't set.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 567e21e13255f24cf6318024c93be94180ad7b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=567e21e13255f24cf6318024c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 3 12:29:45 2008 +0200 winhttp: Avoid testing errno when it isn't set. --- dlls/winhttp/net.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d367723..90950cb 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -524,9 +524,10 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) { if (poll( &pfd, 1, DEFAULT_RECEIVE_TIMEOUT * 1000 ) > 0) { - if (recv( conn->socket, &buffer[recvd], 1, 0 ) <= 0) + int res; + if ((res = recv( conn->socket, &buffer[recvd], 1, 0 )) <= 0) { - set_last_error( sock_get_error( errno ) ); + if (res == -1) set_last_error( sock_get_error( errno ) ); break; } if (buffer[recvd] == '\n')

1 0

Jim Cameron : ntoskrnl.exe: Add stub for IoRegisterDriverReinitialization() .
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 9a4d1d15cf76c4fd1aa861cd6868c48353e0345f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4d1d15cf76c4fd1aa861cd6… Author: Jim Cameron <jim_24601(a)btinternet.com> Date: Thu Aug 28 23:31:58 2008 +0100 ntoskrnl.exe: Add stub for IoRegisterDriverReinitialization(). --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fca424d..beaa6ad 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -31,7 +31,7 @@ #include "windef.h" #include "winternl.h" #include "excpt.h" -#include "ddk/wdm.h" +#include "ddk/ntddk.h" #include "wine/unicode.h" #include "wine/server.h" #include "wine/debug.h" @@ -471,6 +471,15 @@ PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject( PFILE_OBJECT obj ) /*********************************************************************** + * IoRegisterDriverReinitialization (NTOSKRNL.EXE.@) + */ +void WINAPI IoRegisterDriverReinitialization( PDRIVER_OBJECT obj, PDRIVER_REINITIALIZE reinit, PVOID context ) +{ + FIXME( "stub: %p %p %p\n", obj, reinit, context ); +} + + +/*********************************************************************** * IofCompleteRequest (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c370004..6fa960b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -426,7 +426,7 @@ @ stub IoReadTransferCount @ stub IoRegisterBootDriverReinitialization @ stub IoRegisterDeviceInterface -@ stub IoRegisterDriverReinitialization +@ stdcall IoRegisterDriverReinitialization(ptr ptr ptr) @ stub IoRegisterFileSystem @ stub IoRegisterFsRegistrationChange @ stub IoRegisterLastChanceShutdownNotification diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 47b6b1e..b93b51e 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -46,4 +46,8 @@ typedef enum _BUS_DATA_TYPE MaximumBusDataType } BUS_DATA_TYPE, *PBUS_DATA_TYPE; +typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); + +void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); + #endif

1 0