November 2011 - Wine-Commits

Frédéric Delanoy : winebuild: Avoid dead code in BuildCallFrom16Core (Coverity).
by Alexandre Julliard Nov. 28, 2011

Nov. 28, 2011

Module: wine Branch: master Commit: 355a0aef8b6a728784faa078b6c7beb1d6af024c URL: http://source.winehq.org/git/wine.git/?a=commit;h=355a0aef8b6a728784faa078b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 26 10:10:16 2011 +0100 winebuild: Avoid dead code in BuildCallFrom16Core (Coverity). --- tools/winebuild/relay.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 4fa256f..cc7dd37 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -224,6 +224,7 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) output( "\t.byte 0x66\n" ); output( "\tlret\n" ); + output_function_size( "__wine_call_from_16_thunk" ); return; } @@ -333,6 +334,8 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) output( "\tpopl %%ds\n" ); output( "\tpopfl\n" ); output( "\tlret\n" ); + + output_function_size( "__wine_call_from_16_regs" ); } else { @@ -352,10 +355,9 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) /* Return to return stub which will return to caller */ output( "\tlret $12\n" ); + + output_function_size( "__wine_call_from_16" ); } - if (thunk) output_function_size( "__wine_call_from_16_thunk" ); - else if (reg_func) output_function_size( "__wine_call_from_16_regs" ); - else output_function_size( "__wine_call_from_16" ); }

1 0

Alexandre Julliard : wineps: Don't crash on missing loca OTF table.
by Alexandre Julliard Nov. 28, 2011

Nov. 28, 2011

Module: wine Branch: master Commit: 62cf70d36383aee854db6e775d4fc086f57ca13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=62cf70d36383aee854db6e775… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 26 16:29:50 2011 +0100 wineps: Don't crash on missing loca OTF table. --- dlls/wineps.drv/type1.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index fbda3de..01c9c7e 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -226,11 +226,20 @@ static BOOL get_glyf_pos(HDC hdc, DWORD index, DWORD *start, DWORD *end) *start = *end = 0; len = GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0); + if (len == GDI_ERROR) return FALSE; head = HeapAlloc(GetProcessHeap(), 0, len); GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, head, len); loca_format = get_be_word(head + 50); len = GetFontData(hdc, MS_MAKE_TAG('l','o','c','a'), 0, NULL, 0); + if (len == GDI_ERROR) + { + len = GetFontData(hdc, MS_MAKE_TAG('C','F','F',' '), 0, NULL, 0); + if (len != GDI_ERROR) FIXME( "CFF tables not supported yet\n" ); + else ERR( "loca table not found\n" ); + HeapFree(GetProcessHeap(), 0, head); + return FALSE; + } loca = HeapAlloc(GetProcessHeap(), 0, len); GetFontData(hdc, MS_MAKE_TAG('l','o','c','a'), 0, loca, len);

1 0

Francois Gouget : cmd: Use WCMD_output_asis*() for strings that are not supposed to contain formating directives.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 3b729284644c4183958735009f328ca9ea1d0ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b729284644c4183958735009… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 24 00:30:23 2011 +0100 cmd: Use WCMD_output_asis*() for strings that are not supposed to contain formating directives. --- programs/cmd/builtins.c | 12 ++++++------ programs/cmd/directory.c | 10 +++++----- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6703cef..5197297 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -361,7 +361,7 @@ void WCMD_choice (const WCHAR * command) { ptr = strchrW(opt_c, answer[0]); if (ptr) { WCMD_output_asis(answer); - WCMD_output(newline); + WCMD_output_asis(newline); if (have_console) SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode); @@ -964,7 +964,7 @@ void WCMD_echo (const WCHAR *command) echo_mode = FALSE; else { WCMD_output_asis (command); - WCMD_output (newline); + WCMD_output_asis (newline); } HeapFree(GetProcessHeap(), 0, trimmed); } @@ -1777,7 +1777,7 @@ void WCMD_pause (void) if (have_console) SetConsoleMode(hIn, 0); - WCMD_output(anykey); + WCMD_output_asis(anykey); WCMD_ReadFile(hIn, &key, 1, &count); if (have_console) SetConsoleMode(hIn, oldmode); @@ -2114,7 +2114,7 @@ void WCMD_setshow_default (const WCHAR *command) { GetCurrentDirectoryW(sizeof(cwd)/sizeof(WCHAR), cwd); if (strlenW(command) == 0) { strcatW (cwd, newline); - WCMD_output (cwd); + WCMD_output_asis (cwd); } else { /* Remove any double quotes, which may be in the @@ -2325,7 +2325,7 @@ void WCMD_setshow_env (WCHAR *s) { /* Output the prompt */ *p++ = '\0'; - if (strlenW(p) != 0) WCMD_output(p); + if (strlenW(p) != 0) WCMD_output_asis(p); /* Read the reply */ WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); @@ -2697,7 +2697,7 @@ void WCMD_verify (const WCHAR *command) { void WCMD_version (void) { - WCMD_output (version_string); + WCMD_output_asis (version_string); } diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 03cb952..a5447f5 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -326,7 +326,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* Output the results */ if (!bare) { - if (level != 0 && (entry_count > 0)) WCMD_output (newline); + if (level != 0 && (entry_count > 0)) WCMD_output_asis (newline); if (!recurse || ((entry_count > 0) && done_header==FALSE)) { static const WCHAR headerW[] = {'D','i','r','e','c','t','o','r','y',' ','o','f', ' ','%','s','\n','\n','\0'}; @@ -430,13 +430,13 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le strcatW(&temp[toWrite], space); toWrite++; if (toWrite > 99) { - WCMD_output(temp); + WCMD_output_asis(temp); toWrite = 0; strcpyW(temp, nullW); } padding--; } - WCMD_output(temp); + WCMD_output_asis(temp); } } else if ((fd+i)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -472,7 +472,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le } } } - if (addNewLine) WCMD_output (newline); + if (addNewLine) WCMD_output_asis (newline); cur_width = 0; } @@ -949,7 +949,7 @@ void WCMD_directory (WCHAR *cmd) } } else { static const WCHAR newLine2[] = {'\n','\n','\0'}; - if (!bare) WCMD_output (newLine2); + if (!bare) WCMD_output_asis (newLine2); } /* Clear any errors from previous invocations, and process it */ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 090a6f1..5bcdbca 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1512,7 +1512,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, WCMD_type (p); break; case WCMD_VER: - WCMD_output(newline); + WCMD_output_asis(newline); WCMD_version (); break; case WCMD_VERIFY:

1 0

Marcus Meissner : d3d9: Check that surface is allocated (Coverity).
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: d255efbde1e827140e0edfb326148a253c8eb094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d255efbde1e827140e0edfb32… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 24 18:12:32 2011 +0100 d3d9: Check that surface is allocated (Coverity). --- dlls/d3d9/tests/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index eb6e65c..80d8199 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -725,12 +725,14 @@ static void test_surface_lockrect_blocks(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "IDirect3DTexture9_GetSurfaceLevel failed (%08x)\n", hr); IDirect3DTexture9_Release(texture); } + if (FAILED(hr)) continue; break; case D3DPOOL_SCRATCH: hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, formats[i].fmt, pools[j].pool, &surface, 0); ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (%08x)\n", hr); + if (FAILED(hr)) continue; break; default:

1 0

Hans Leidekker : winhttp: Resolve the server name only on the first request .
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 7d8730f8c5d36dbe450ba415d1d3a0ba119289e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8730f8c5d36dbe450ba415d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 25 14:55:13 2011 +0100 winhttp: Resolve the server name only on the first request. --- dlls/winhttp/request.c | 63 +++++++++++++++++++++++-------------- dlls/winhttp/session.c | 6 ++-- dlls/winhttp/tests/notification.c | 59 ++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 1 + 4 files changed, 102 insertions(+), 27 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a56572d..f610dde 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -909,53 +909,68 @@ static BOOL secure_proxy_connect( request_t *request ) #define INET6_ADDRSTRLEN 46 #endif +static WCHAR *addr_to_str( const struct sockaddr *addr ) +{ + char buf[INET6_ADDRSTRLEN]; + const void *src; + + switch (addr->sa_family) + { + case AF_INET: + src = &((struct sockaddr_in *)addr)->sin_addr; + break; + case AF_INET6: + src = &((struct sockaddr_in6 *)addr)->sin6_addr; + break; + default: + WARN("unsupported address family %d\n", addr->sa_family); + return NULL; + } + if (!inet_ntop( addr->sa_family, src, buf, sizeof(buf) )) return NULL; + return strdupAW( buf ); +} + static BOOL open_connection( request_t *request ) { connect_t *connect; - const void *addr; - char address[INET6_ADDRSTRLEN]; - WCHAR *addressW; + WCHAR *addressW = NULL; INTERNET_PORT port; socklen_t slen; + struct sockaddr *saddr; + DWORD len; if (netconn_connected( &request->netconn )) return TRUE; connect = request->connect; port = connect->serverport ? connect->serverport : (request->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); + saddr = (struct sockaddr *)&connect->sockaddr; + slen = sizeof(struct sockaddr); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, connect->servername, strlenW(connect->servername) + 1 ); - - slen = sizeof(connect->sockaddr); - if (!netconn_resolve( connect->servername, port, (struct sockaddr *)&connect->sockaddr, &slen, request->resolve_timeout )) return FALSE; - switch (connect->sockaddr.ss_family) + if (!connect->resolved) { - case AF_INET: - addr = &((struct sockaddr_in *)&connect->sockaddr)->sin_addr; - break; - case AF_INET6: - addr = &((struct sockaddr_in6 *)&connect->sockaddr)->sin6_addr; - break; - default: - WARN("unsupported address family %d\n", connect->sockaddr.ss_family); - return FALSE; - } - inet_ntop( connect->sockaddr.ss_family, addr, address, sizeof(address) ); - addressW = strdupAW( address ); + len = strlenW( connect->servername ) + 1; + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, connect->servername, len ); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, addressW, strlenW(addressW) + 1 ); + if (!netconn_resolve( connect->servername, port, saddr, &slen, request->resolve_timeout )) return FALSE; + connect->resolved = TRUE; - TRACE("connecting to %s:%u\n", address, port); + if (!(addressW = addr_to_str( saddr ))) return FALSE; + len = strlenW( addressW ) + 1; + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, addressW, len ); + } + if (!addressW && !(addressW = addr_to_str( saddr ))) return FALSE; + TRACE("connecting to %s:%u\n", debugstr_w(addressW), port); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, 0 ); - if (!netconn_create( &request->netconn, connect->sockaddr.ss_family, SOCK_STREAM, 0 )) + if (!netconn_create( &request->netconn, saddr->sa_family, SOCK_STREAM, 0 )) { heap_free( addressW ); return FALSE; } netconn_set_timeout( &request->netconn, TRUE, request->send_timeout ); netconn_set_timeout( &request->netconn, FALSE, request->recv_timeout ); - if (!netconn_connect( &request->netconn, (struct sockaddr *)&connect->sockaddr, slen, request->connect_timeout )) + if (!netconn_connect( &request->netconn, saddr, slen, request->connect_timeout )) { netconn_close( &request->netconn ); heap_free( addressW ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 110de80..0f9e782 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -423,7 +423,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT session->proxy_server, colon - session->proxy_server - 1 )) { heap_free( connect->servername ); - connect->sockaddr.ss_family = 0xffff; + connect->resolved = FALSE; if (!(connect->servername = heap_alloc( (colon - session->proxy_server + 1) * sizeof(WCHAR) ))) { @@ -445,7 +445,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT session->proxy_server )) { heap_free( connect->servername ); - connect->sockaddr.ss_family = 0xffff; + connect->resolved = FALSE; if (!(connect->servername = strdupW( session->proxy_server ))) { ret = FALSE; @@ -458,7 +458,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT else if (server) { heap_free( connect->servername ); - connect->sockaddr.ss_family = 0xffff; + connect->resolved = FALSE; if (!(connect->servername = strdupW( server ))) { ret = FALSE; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 7ceede7..84a3569 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -135,6 +135,16 @@ static const struct notification cache_test[] = { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, + { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, 0 }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0 }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0 }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } }; @@ -190,6 +200,32 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); + + setup_test( &info, winhttp_open_request, __LINE__ ); + req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); + ok(ret, "failed to set context value %u\n", GetLastError()); + + setup_test( &info, winhttp_send_request, __LINE__ ); + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok(ret, "failed to send request %u\n", GetLastError()); + + setup_test( &info, winhttp_receive_response, __LINE__ ); + 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); + + setup_test( &info, winhttp_close_handle, __LINE__ ); + WinHttpCloseHandle( req ); + + setup_test( &info, winhttp_close_handle, __LINE__ ); + WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); @@ -231,6 +267,29 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); + + setup_test( &info, winhttp_open_request, __LINE__ ); + req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); + ok(ret, "failed to set context value %u\n", GetLastError()); + + setup_test( &info, winhttp_send_request, __LINE__ ); + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok(ret, "failed to send request %u\n", GetLastError()); + + setup_test( &info, winhttp_receive_response, __LINE__ ); + 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); + + setup_test( &info, winhttp_close_handle, __LINE__ ); + WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index fbd5032..7105553 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -119,6 +119,7 @@ typedef struct INTERNET_PORT hostport; INTERNET_PORT serverport; struct sockaddr_storage sockaddr; + BOOL resolved; } connect_t; typedef struct

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: c724a6155d6d5658addfc22b98e472e3e419c6ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c724a6155d6d5658addfc22b9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 24 23:06:39 2011 +0100 po: Update French translation. --- po/fr.po | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/po/fr.po b/po/fr.po index c6e5401..8a0edc9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5681,7 +5681,7 @@ msgstr "Entrez le mot de passe réseau" #: mpr.rc:35 msgid "Please enter your username and password:" -msgstr "Veuillez saisir votre nom d'utilisateur et votre mot de passe :" +msgstr "Veuillez saisir vos nom d'utilisateur et mot de passe :" #: mpr.rc:36 msgid "Proxy" @@ -9396,7 +9396,6 @@ msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" #: notepad.rc:99 -#, fuzzy msgid "" "%1\n" "This file contains Unicode characters which will be lost if\n" @@ -9405,9 +9404,9 @@ msgid "" "one of the Unicode options in the Encoding drop down list.\n" "Continue?" msgstr "" -"%s\n" +"%1\n" "Ce fichier contient des caractères Unicode qui seront perdus si\n" -"vous le sauvez dans le codage %s.\n" +"vous le sauvez dans le codage %2.\n" "Pour conserver ces caractères, cliquez sur Annuler et sélectionnez\n" "une des alternatives Unicode dans la liste déroulante Codage.\n" "Continuer ?" @@ -11240,9 +11239,8 @@ msgid "Processes: %d" msgstr "Processus : %d" #: taskmgr.rc:267 -#, fuzzy msgid "Mem Usage: %1!u!kB / %2!u!kB" -msgstr "Utilisation mémoire : %dK / %dK" +msgstr "Utilisation mémoire : %1!u! ko / %2!u! ko" #: taskmgr.rc:272 msgid "Image Name" @@ -12577,17 +12575,17 @@ msgstr "%1 libres sur %2" #: winefile.rc:121 msgctxt "unit kilobyte" msgid "kB" -msgstr "kB" +msgstr "ko" #: winefile.rc:122 msgctxt "unit megabyte" msgid "MB" -msgstr "MB" +msgstr "Mo" #: winefile.rc:123 msgctxt "unit gigabyte" msgid "GB" -msgstr "GB" +msgstr "Go" #: winemine.rc:34 msgid "&Game"

1 0

Jacek Caban : urlmon: Rename are_equal_simple to compare_uris and make it failable.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 24f4c4e14cffb5e4caf91869120f5dbd160feed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24f4c4e14cffb5e4caf918691… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 15:58:07 2011 +0100 urlmon: Rename are_equal_simple to compare_uris and make it failable. --- dlls/urlmon/uri.c | 58 +++++++++++++++++++++++++++------------------------- 1 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 661e1bc..22fe3fe 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3870,16 +3870,20 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, * the properties of each Uri directly without the need to go * through the "IUri_Get*" interface calls. */ -static BOOL are_equal_simple(const Uri *a, const Uri *b) { +static HRESULT compare_uris(const Uri *a, const Uri *b, BOOL *ret) { const BOOL known_scheme = a->scheme_type != URL_SCHEME_UNKNOWN; const BOOL are_hierarchical = a->authority_start > -1 && b->authority_start > -1; + *ret = FALSE; + if(a->scheme_type != b->scheme_type) - return FALSE; + return S_OK; if(a->scheme_type == URL_SCHEME_FILE) { - if(a->canon_len == b->canon_len) - return !StrCmpIW(a->canon_uri, b->canon_uri); + if(a->canon_len == b->canon_len) { + *ret = !StrCmpIW(a->canon_uri, b->canon_uri); + return S_OK; + } } /* Only compare the scheme names (if any) if their unknown scheme types. */ @@ -3888,20 +3892,20 @@ static BOOL are_equal_simple(const Uri *a, const Uri *b) { (a->scheme_len == b->scheme_len)) { /* Make sure the schemes are the same. */ if(StrCmpNW(a->canon_uri+a->scheme_start, b->canon_uri+b->scheme_start, a->scheme_len)) - return FALSE; + return S_OK; } else if(a->scheme_len != b->scheme_len) /* One of the Uri's has a scheme name, while the other doesn't. */ - return FALSE; + return S_OK; } /* If they have a userinfo component, perform case sensitive compare. */ if((a->userinfo_start > -1 && b->userinfo_start > -1) && (a->userinfo_len == b->userinfo_len)) { if(StrCmpNW(a->canon_uri+a->userinfo_start, b->canon_uri+b->userinfo_start, a->userinfo_len)) - return FALSE; + return S_OK; } else if(a->userinfo_len != b->userinfo_len) /* One of the Uri's had a userinfo, while the other one doesn't. */ - return FALSE; + return S_OK; /* Check if they have a host name. */ if((a->host_start > -1 && b->host_start > -1) && @@ -3909,19 +3913,19 @@ static BOOL are_equal_simple(const Uri *a, const Uri *b) { /* Perform a case insensitive compare if they are a known scheme type. */ if(known_scheme) { if(StrCmpNIW(a->canon_uri+a->host_start, b->canon_uri+b->host_start, a->host_len)) - return FALSE; + return S_OK; } else if(StrCmpNW(a->canon_uri+a->host_start, b->canon_uri+b->host_start, a->host_len)) - return FALSE; + return S_OK; } else if(a->host_len != b->host_len) /* One of the Uri's had a host, while the other one didn't. */ - return FALSE; + return S_OK; if(a->has_port && b->has_port) { if(a->port != b->port) - return FALSE; + return S_OK; } else if(a->has_port || b->has_port) /* One had a port, while the other one didn't. */ - return FALSE; + return S_OK; /* Windows is weird with how it handles paths. For example * One URI could be "http://google.com" (after canonicalization) @@ -3932,33 +3936,34 @@ static BOOL are_equal_simple(const Uri *a, const Uri *b) { if((a->path_start > -1 && b->path_start > -1) && (a->path_len == b->path_len)) { if(StrCmpNW(a->canon_uri+a->path_start, b->canon_uri+b->path_start, a->path_len)) - return FALSE; + return S_OK; } else if(are_hierarchical && a->path_len == -1 && b->path_len == 0) { if(*(a->canon_uri+a->path_start) != '/') - return FALSE; + return S_OK; } else if(are_hierarchical && b->path_len == 1 && a->path_len == 0) { if(*(b->canon_uri+b->path_start) != '/') - return FALSE; + return S_OK; } else if(a->path_len != b->path_len) - return FALSE; + return S_OK; /* Compare the query strings of the two URIs. */ if((a->query_start > -1 && b->query_start > -1) && (a->query_len == b->query_len)) { if(StrCmpNW(a->canon_uri+a->query_start, b->canon_uri+b->query_start, a->query_len)) - return FALSE; + return S_OK; } else if(a->query_len != b->query_len) - return FALSE; + return S_OK; if((a->fragment_start > -1 && b->fragment_start > -1) && (a->fragment_len == b->fragment_len)) { if(StrCmpNW(a->canon_uri+a->fragment_start, b->canon_uri+b->fragment_start, a->fragment_len)) - return FALSE; + return S_OK; } else if(a->fragment_len != b->fragment_len) - return FALSE; + return S_OK; /* If we get here, the two URIs are equivalent. */ - return TRUE; + *ret = TRUE; + return S_OK; } static void convert_to_dos_path(const WCHAR *path, DWORD path_len, @@ -4944,16 +4949,13 @@ static HRESULT WINAPI Uri_IsEqual(IUri *iface, IUri *pUri, BOOL *pfEqual) } /* Try to convert it to a Uri (allows for a more simple comparison). */ - if((other = get_uri_obj(pUri))) { - TRACE("comparing to %s\n", debugstr_w(other->canon_uri)); - *pfEqual = are_equal_simple(This, other); - }else { - /* Do it the hard way. */ + if(!(other = get_uri_obj(pUri))) { FIXME("(%p)->(%p %p) No support for unknown IUri's yet.\n", iface, pUri, pfEqual); return E_NOTIMPL; } - return S_OK; + TRACE("comparing to %s\n", debugstr_w(other->canon_uri)); + return compare_uris(This, other, pfEqual); } static const IUriVtbl UriVtbl = {

1 0

Marcus Meissner : expand: Initialize a variable (Coverity).
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 56968fb3790ee6ea6027a6ed0db727cfcad76957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56968fb3790ee6ea6027a6ed0… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 24 18:09:35 2011 +0100 expand: Initialize a variable (Coverity). --- programs/expand/expand.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/expand/expand.c b/programs/expand/expand.c index 2bede08..ea7bfdf 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -30,7 +30,7 @@ static int myprintf(const char* format, ...) { va_list va; char tmp[8192]; - DWORD w; + DWORD w = 0; int len; va_start(va, format);

1 0

Jacek Caban : urlmon: Reduce indention in are_equal_simple and move it.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: bb8a05800bf9e3f8b81fee1d4021c55ddd3ec8e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8a05800bf9e3f8b81fee1d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 15:57:47 2011 +0100 urlmon: Reduce indention in are_equal_simple and move it. --- dlls/urlmon/uri.c | 194 ++++++++++++++++++++++++++--------------------------- 1 files changed, 96 insertions(+), 98 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index a36f730..661e1bc 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -428,104 +428,6 @@ static inline BOOL is_hierarchical_uri(const WCHAR **ptr, const parse_data *data return FALSE; } -/* Checks if the two Uri's are logically equivalent. It's a simple - * comparison, since they are both of type Uri, and it can access - * the properties of each Uri directly without the need to go - * through the "IUri_Get*" interface calls. - */ -static BOOL are_equal_simple(const Uri *a, const Uri *b) { - if(a->scheme_type == b->scheme_type) { - const BOOL known_scheme = a->scheme_type != URL_SCHEME_UNKNOWN; - const BOOL are_hierarchical = - (a->authority_start > -1 && b->authority_start > -1); - - if(a->scheme_type == URL_SCHEME_FILE) { - if(a->canon_len == b->canon_len) - return !StrCmpIW(a->canon_uri, b->canon_uri); - } - - /* Only compare the scheme names (if any) if their unknown scheme types. */ - if(!known_scheme) { - if((a->scheme_start > -1 && b->scheme_start > -1) && - (a->scheme_len == b->scheme_len)) { - /* Make sure the schemes are the same. */ - if(StrCmpNW(a->canon_uri+a->scheme_start, b->canon_uri+b->scheme_start, a->scheme_len)) - return FALSE; - } else if(a->scheme_len != b->scheme_len) - /* One of the Uri's has a scheme name, while the other doesn't. */ - return FALSE; - } - - /* If they have a userinfo component, perform case sensitive compare. */ - if((a->userinfo_start > -1 && b->userinfo_start > -1) && - (a->userinfo_len == b->userinfo_len)) { - if(StrCmpNW(a->canon_uri+a->userinfo_start, b->canon_uri+b->userinfo_start, a->userinfo_len)) - return FALSE; - } else if(a->userinfo_len != b->userinfo_len) - /* One of the Uri's had a userinfo, while the other one doesn't. */ - return FALSE; - - /* Check if they have a host name. */ - if((a->host_start > -1 && b->host_start > -1) && - (a->host_len == b->host_len)) { - /* Perform a case insensitive compare if they are a known scheme type. */ - if(known_scheme) { - if(StrCmpNIW(a->canon_uri+a->host_start, b->canon_uri+b->host_start, a->host_len)) - return FALSE; - } else if(StrCmpNW(a->canon_uri+a->host_start, b->canon_uri+b->host_start, a->host_len)) - return FALSE; - } else if(a->host_len != b->host_len) - /* One of the Uri's had a host, while the other one didn't. */ - return FALSE; - - if(a->has_port && b->has_port) { - if(a->port != b->port) - return FALSE; - } else if(a->has_port || b->has_port) - /* One had a port, while the other one didn't. */ - return FALSE; - - /* Windows is weird with how it handles paths. For example - * One URI could be "http://google.com" (after canonicalization) - * and one could be "http://google.com/" and the IsEqual function - * would still evaluate to TRUE, but, only if they are both hierarchical - * URIs. - */ - if((a->path_start > -1 && b->path_start > -1) && - (a->path_len == b->path_len)) { - if(StrCmpNW(a->canon_uri+a->path_start, b->canon_uri+b->path_start, a->path_len)) - return FALSE; - } else if(are_hierarchical && a->path_len == -1 && b->path_len == 0) { - if(*(a->canon_uri+a->path_start) != '/') - return FALSE; - } else if(are_hierarchical && b->path_len == 1 && a->path_len == 0) { - if(*(b->canon_uri+b->path_start) != '/') - return FALSE; - } else if(a->path_len != b->path_len) - return FALSE; - - /* Compare the query strings of the two URIs. */ - if((a->query_start > -1 && b->query_start > -1) && - (a->query_len == b->query_len)) { - if(StrCmpNW(a->canon_uri+a->query_start, b->canon_uri+b->query_start, a->query_len)) - return FALSE; - } else if(a->query_len != b->query_len) - return FALSE; - - if((a->fragment_start > -1 && b->fragment_start > -1) && - (a->fragment_len == b->fragment_len)) { - if(StrCmpNW(a->canon_uri+a->fragment_start, b->canon_uri+b->fragment_start, a->fragment_len)) - return FALSE; - } else if(a->fragment_len != b->fragment_len) - return FALSE; - - /* If we get here, the two URIs are equivalent. */ - return TRUE; - } - - return FALSE; -} - /* Computes the size of the given IPv6 address. * Each h16 component is 16 bits. If there is an IPv4 address, it's * 32 bits. If there's an elision it can be 16 to 128 bits, depending @@ -3963,6 +3865,102 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, return S_OK; } +/* Checks if the two Uri's are logically equivalent. It's a simple + * comparison, since they are both of type Uri, and it can access + * the properties of each Uri directly without the need to go + * through the "IUri_Get*" interface calls. + */ +static BOOL are_equal_simple(const Uri *a, const Uri *b) { + const BOOL known_scheme = a->scheme_type != URL_SCHEME_UNKNOWN; + const BOOL are_hierarchical = a->authority_start > -1 && b->authority_start > -1; + + if(a->scheme_type != b->scheme_type) + return FALSE; + + if(a->scheme_type == URL_SCHEME_FILE) { + if(a->canon_len == b->canon_len) + return !StrCmpIW(a->canon_uri, b->canon_uri); + } + + /* Only compare the scheme names (if any) if their unknown scheme types. */ + if(!known_scheme) { + if((a->scheme_start > -1 && b->scheme_start > -1) && + (a->scheme_len == b->scheme_len)) { + /* Make sure the schemes are the same. */ + if(StrCmpNW(a->canon_uri+a->scheme_start, b->canon_uri+b->scheme_start, a->scheme_len)) + return FALSE; + } else if(a->scheme_len != b->scheme_len) + /* One of the Uri's has a scheme name, while the other doesn't. */ + return FALSE; + } + + /* If they have a userinfo component, perform case sensitive compare. */ + if((a->userinfo_start > -1 && b->userinfo_start > -1) && + (a->userinfo_len == b->userinfo_len)) { + if(StrCmpNW(a->canon_uri+a->userinfo_start, b->canon_uri+b->userinfo_start, a->userinfo_len)) + return FALSE; + } else if(a->userinfo_len != b->userinfo_len) + /* One of the Uri's had a userinfo, while the other one doesn't. */ + return FALSE; + + /* Check if they have a host name. */ + if((a->host_start > -1 && b->host_start > -1) && + (a->host_len == b->host_len)) { + /* Perform a case insensitive compare if they are a known scheme type. */ + if(known_scheme) { + if(StrCmpNIW(a->canon_uri+a->host_start, b->canon_uri+b->host_start, a->host_len)) + return FALSE; + } else if(StrCmpNW(a->canon_uri+a->host_start, b->canon_uri+b->host_start, a->host_len)) + return FALSE; + } else if(a->host_len != b->host_len) + /* One of the Uri's had a host, while the other one didn't. */ + return FALSE; + + if(a->has_port && b->has_port) { + if(a->port != b->port) + return FALSE; + } else if(a->has_port || b->has_port) + /* One had a port, while the other one didn't. */ + return FALSE; + + /* Windows is weird with how it handles paths. For example + * One URI could be "http://google.com" (after canonicalization) + * and one could be "http://google.com/" and the IsEqual function + * would still evaluate to TRUE, but, only if they are both hierarchical + * URIs. + */ + if((a->path_start > -1 && b->path_start > -1) && + (a->path_len == b->path_len)) { + if(StrCmpNW(a->canon_uri+a->path_start, b->canon_uri+b->path_start, a->path_len)) + return FALSE; + } else if(are_hierarchical && a->path_len == -1 && b->path_len == 0) { + if(*(a->canon_uri+a->path_start) != '/') + return FALSE; + } else if(are_hierarchical && b->path_len == 1 && a->path_len == 0) { + if(*(b->canon_uri+b->path_start) != '/') + return FALSE; + } else if(a->path_len != b->path_len) + return FALSE; + + /* Compare the query strings of the two URIs. */ + if((a->query_start > -1 && b->query_start > -1) && + (a->query_len == b->query_len)) { + if(StrCmpNW(a->canon_uri+a->query_start, b->canon_uri+b->query_start, a->query_len)) + return FALSE; + } else if(a->query_len != b->query_len) + return FALSE; + + if((a->fragment_start > -1 && b->fragment_start > -1) && + (a->fragment_len == b->fragment_len)) { + if(StrCmpNW(a->canon_uri+a->fragment_start, b->canon_uri+b->fragment_start, a->fragment_len)) + return FALSE; + } else if(a->fragment_len != b->fragment_len) + return FALSE; + + /* If we get here, the two URIs are equivalent. */ + return TRUE; +} + static void convert_to_dos_path(const WCHAR *path, DWORD path_len, WCHAR *output, DWORD *output_len) {

1 0

Jacek Caban : urlmon: Properly compare file URIs.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: e0f6b95d44f8208d2dce75278eb88e6eb57fe744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f6b95d44f8208d2dce75278… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 15:58:37 2011 +0100 urlmon: Properly compare file URIs. --- dlls/urlmon/uri.c | 59 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index c0233bf..55488d9 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3859,6 +3859,49 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, return S_OK; } +static HRESULT compare_file_paths(const Uri *a, const Uri *b, BOOL *ret) +{ + WCHAR *canon_path_a, *canon_path_b; + DWORD len_a, len_b; + + if(!a->path_len) { + *ret = !b->path_len; + return S_OK; + } + + if(!b->path_len) { + *ret = FALSE; + return S_OK; + } + + /* Fast path */ + if(a->path_len == b->path_len && !memicmpW(a->canon_uri+a->path_start, b->canon_uri+b->path_start, a->path_len)) { + *ret = TRUE; + return S_OK; + } + + len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, NULL); + len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, NULL); + + canon_path_a = heap_alloc(len_a*sizeof(WCHAR)); + if(!canon_path_a) + return E_OUTOFMEMORY; + canon_path_b = heap_alloc(len_b*sizeof(WCHAR)); + if(!canon_path_b) { + heap_free(canon_path_a); + return E_OUTOFMEMORY; + } + + len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, canon_path_a); + len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, canon_path_b); + + *ret = len_a == len_b && !memicmpW(canon_path_a, canon_path_b, len_a); + + heap_free(canon_path_a); + heap_free(canon_path_b); + return S_OK; +} + /* Checks if the two Uri's are logically equivalent. It's a simple * comparison, since they are both of type Uri, and it can access * the properties of each Uri directly without the need to go @@ -3867,19 +3910,13 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, static HRESULT compare_uris(const Uri *a, const Uri *b, BOOL *ret) { const BOOL known_scheme = a->scheme_type != URL_SCHEME_UNKNOWN; const BOOL are_hierarchical = a->authority_start > -1 && b->authority_start > -1; + HRESULT hres; *ret = FALSE; if(a->scheme_type != b->scheme_type) return S_OK; - if(a->scheme_type == URL_SCHEME_FILE) { - if(a->canon_len == b->canon_len) { - *ret = !StrCmpIW(a->canon_uri, b->canon_uri); - return S_OK; - } - } - /* Only compare the scheme names (if any) if their unknown scheme types. */ if(!known_scheme) { if((a->scheme_start > -1 && b->scheme_start > -1) && @@ -3927,7 +3964,13 @@ static HRESULT compare_uris(const Uri *a, const Uri *b, BOOL *ret) { * would still evaluate to TRUE, but, only if they are both hierarchical * URIs. */ - if((a->path_start > -1 && b->path_start > -1) && + if(a->scheme_type == URL_SCHEME_FILE) { + BOOL cmp; + + hres = compare_file_paths(a, b, &cmp); + if(FAILED(hres) || !cmp) + return hres; + } else if((a->path_start > -1 && b->path_start > -1) && (a->path_len == b->path_len)) { if(StrCmpNW(a->canon_uri+a->path_start, b->canon_uri+b->path_start, a->path_len)) return S_OK;

1 0