July 2009 - Wine-commits - list.winehq.org

Vladimir Pankratov : uninstaller: Convert the Russian resources to UTF-8.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 98035890d8255e4d2630226b69f6ded3bea4b32f URL: http://source.winehq.org/git/wine.git/?a=commit;h=98035890d8255e4d2630226b6… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:33:18 2009 +0500 uninstaller: Convert the Russian resources to UTF-8. --- programs/uninstaller/Ru.rc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/Ru.rc b/programs/uninstaller/Ru.rc index 512b8f6..4e74ee8 100644 --- a/programs/uninstaller/Ru.rc +++ b/programs/uninstaller/Ru.rc @@ -20,9 +20,12 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_APPNAME, "�� WINE" - IDS_UNINSTALLFAILED, "�� '%s', �� -�� .\r\n�� ?" + IDS_APPNAME, "Удаление приложений WINE" + IDS_UNINSTALLFAILED, "Ошибка выполнения команды удаления '%s', возможно из-за потери файлов приложения.\r\nУдалить информацию об установке из реестра?" }

1 0

Vladimir Pankratov : view: Convert the Russian resources to UTF-8.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: e6f1619209cf9287a03a9c3df8ed665c65767c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f1619209cf9287a03a9c3df… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:33:25 2009 +0500 view: Convert the Russian resources to UTF-8. --- programs/view/Ru.rc | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/programs/view/Ru.rc b/programs/view/Ru.rc index 9d4d39e..c914434 100644 --- a/programs/view/Ru.rc +++ b/programs/view/Ru.rc @@ -20,6 +20,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* @@ -30,19 +33,19 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT VIEW MENU BEGIN - POPUP "&��" + POPUP "&Файл" BEGIN - MENUITEM "&��", IDM_OPEN - MENUITEM "�&��", IDM_EXIT + MENUITEM "&Открыть", IDM_OPEN + MENUITEM "В&ыход", IDM_EXIT END - POPUP "&��" + POPUP "&Положение" BEGIN - MENUITEM "&�� ", IDM_SET_EXT_TO_WIN + MENUITEM "&Расширить по окну", IDM_SET_EXT_TO_WIN MENUITEM SEPARATOR - MENUITEM "�&��", IDM_LEFT - MENUITEM "�&��", IDM_RIGHT - MENUITEM "�&��", IDM_UP - MENUITEM "�&��", IDM_DOWN + MENUITEM "В&лево", IDM_LEFT + MENUITEM "В&право", IDM_RIGHT + MENUITEM "В&верх", IDM_UP + MENUITEM "В&низ", IDM_DOWN END END @@ -67,5 +70,5 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "�� " + IDS_DESCRIPTION "Просмоторщик обычных метафайлов" END

1 0

Vladimir Pankratov : wineboot: Convert the Russian resources to UTF-8.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 15b5324d6a3d161813cba26e2630da1c00b735ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b5324d6a3d161813cba26e2… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:33:32 2009 +0500 wineboot: Convert the Russian resources to UTF-8. --- programs/wineboot/wineboot_Ru.rc | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/wineboot/wineboot_Ru.rc b/programs/wineboot/wineboot_Ru.rc index b1ab0ca..ef777bc 100644 --- a/programs/wineboot/wineboot_Ru.rc +++ b/programs/wineboot/wineboot_Ru.rc @@ -21,17 +21,20 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Ожидание программы" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "��",IDCANCEL,129,49,50,15 - PUSHBUTTON "�� ",IDOK,51,49,71,15 - LTEXT "�� , �� .", + DEFPUSHBUTTON "Отмена",IDCANCEL,129,49,50,15 + PUSHBUTTON "Завершить Процесс",IDOK,51,49,71,15 + LTEXT "Происходит смена пользователя или выключение, но эта программа не отвечает.", IDC_STATIC,7,7,172,19 - LTEXT "�� , �� .", + LTEXT "Если закрыть программу прямо сейчас, то можно потерять все несохраненные данные.", IDC_STATIC,7,28,172,15 END

1 0

Vladimir Pankratov : taskmgr: Convert the Russian resources to UTF-8.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: c8308d61b593263d9e808b4c6edb336d80264eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8308d61b593263d9e808b4c6… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:32:44 2009 +0500 taskmgr: Convert the Russian resources to UTF-8. --- programs/taskmgr/Ru.rc | 493 ++++++++++++++++++++++++++++-------------------- 1 files changed, 286 insertions(+), 207 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8308d61b593263d9e808…

1 0

Vladimir Pankratov : start: Convert the Russian resources to UTF-8.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: c3e58fc4044e1d3cc430e4530661a2555dccbde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e58fc4044e1d3cc430e4530… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:32:31 2009 +0500 start: Convert the Russian resources to UTF-8. --- programs/start/Ru.rc | 47 +++++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/programs/start/Ru.rc b/programs/start/Ru.rc index f30af43..48248ee 100644 --- a/programs/start/Ru.rc +++ b/programs/start/Ru.rc @@ -20,34 +20,37 @@ #include "resources.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { -STRING_USAGE, "�� ,\n\ -�� .\n\n\ -��:\n\ -start [options] ��_��_�� [...]\n\ -start [options] ��_��_��\n\ +STRING_USAGE, "Запускает программы или открывает документы приложением,\n\ +обычно используемым для файлов с данным расширением.\n\n\ +Использование:\n\ +start [options] имя_файла_программы [...]\n\ +start [options] имя_файла_документа\n\ \n\ -��:\n\ -/M[inimized] �� .\n\ -/MAX[imized] �� .\n\ -/R[estored] �� (�� ).\n\ -/W[ait] �� .\n\ -/Unix �� Unix �� .\n\ +Опции:\n\ +/M[inimized] Запустить программу минимизированной.\n\ +/MAX[imized] Запустить программу максимизированной.\n\ +/R[estored] Запустить программу нормально (не максимизированно и не минимизированно).\n\ +/W[ait] Ожидать завершения запущенной программы и выйти с кодом её выхода.\n\ +/Unix Использовать путь Unix для запуска програмы как виндовс проводник.\n\ /ProgIDOpen Open a document using the following progID.\n\ -/L �� .\n\ +/L Показать лицензию конечного пользователя.\n\ \n\ -start.exe �� 0.2 Copyright (C) 2003, Dan Kegel\n\ -Start �� -�� ; �� /L.\n\ -�� , � �� \n\ -��; �� /L.\n\ +start.exe версия 0.2 Copyright (C) 2003, Dan Kegel\n\ +Start идет БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; подробности при запуске с опцией /L.\n\ +Это свободная программа, и вы можете её распространять на определённых\n\ +условиях; подробности при запуске с опцией /L.\n\ " -STRING_LICENSE, "start.exe �� 0.2 Copyright (C) 2003, Dan Kegel\n\ -�� GNU Lesser Public License\n\ -� �� .\n\ +STRING_LICENSE, "start.exe версия 0.2 Copyright (C) 2003, Dan Kegel\n\ +Это программа распространяется по лицензии GNU Lesser Public License\n\ +и является свободным программным продуктом.\n\ \n\ This program is free software; you can redistribute it and/or\n\ modify it under the terms of the GNU Lesser Public License\n\ @@ -66,7 +69,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\ See the COPYING.LIB file for license information.\n\ " -STRING_EXECFAIL "�� .\n�� ShellExecuteEx ��" +STRING_EXECFAIL "Приложение не может быть запущено или не ассоциировано приложений с типом данного документа.\nВызов ShellExecuteEx провалился" -STRING_UNIXFAIL "�� UNIX � �� DOS." +STRING_UNIXFAIL "Невозможно перевести имя программы UNIX в имя DOS." }

1 0

Vladimir Pankratov : regedit: Convert the Russian resources to UTF-8.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: b989203e357e94e68689315edfe192a946b2c28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b989203e357e94e68689315ed… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:31:59 2009 +0500 regedit: Convert the Russian resources to UTF-8. --- programs/regedit/Ru.rc | 271 ++++++++++++++++++++++++------------------------ 1 files changed, 137 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b989203e357e94e686893…

1 0

Hans Leidekker : wininet: Correct handling of redirected HEAD requests.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: fa4c25ddf4641a77829769dc43ecb0b25d15229d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4c25ddf4641a77829769dc4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 22 11:56:33 2009 +0200 wininet: Correct handling of redirected HEAD requests. --- dlls/wininet/http.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b4f7924..693a44f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -79,6 +79,7 @@ static const WCHAR szProxy_Authorization[] = { 'P','r','o','x','y','-','A','u',' static const WCHAR szStatus[] = { 'S','t','a','t','u','s',0 }; static const WCHAR szKeepAlive[] = {'K','e','e','p','-','A','l','i','v','e',0}; static const WCHAR szGET[] = { 'G','E','T', 0 }; +static const WCHAR szHEAD[] = { 'H','E','A','D', 0 }; static const WCHAR szCrLf[] = {'\r','\n', 0}; static const WCHAR szAccept[] = { 'A','c','c','e','p','t',0 }; @@ -909,9 +910,11 @@ static BOOL HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PTR dwBufferSize=sizeof(szNewLocation); if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_LOCATION, szNewLocation, &dwBufferSize, NULL)) { - /* redirects are always GETs */ - HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); - lpwhr->lpszVerb = heap_strdupW(szGET); + if (strcmpW(lpwhr->lpszVerb, szGET) && strcmpW(lpwhr->lpszVerb, szHEAD)) + { + HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); + lpwhr->lpszVerb = heap_strdupW(szGET); + } HTTP_DrainContent(lpwhr); if ((new_url = HTTP_GetRedirectURL( lpwhr, szNewLocation ))) { @@ -2526,6 +2529,7 @@ static void HTTP_DrainContent(http_request_t *req) NETCON_close(&req->netConnection); return; } + if (!strcmpW(req->lpszVerb, szHEAD)) return; do { @@ -3790,10 +3794,11 @@ BOOL WINAPI HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, if ((dwStatusCode==HTTP_STATUS_REDIRECT || dwStatusCode==HTTP_STATUS_MOVED) && HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) { - /* redirects are always GETs */ - HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); - lpwhr->lpszVerb = heap_strdupW(szGET); - + if (strcmpW(lpwhr->lpszVerb, szGET) && strcmpW(lpwhr->lpszVerb, szHEAD)) + { + HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); + lpwhr->lpszVerb = heap_strdupW(szGET); + } HTTP_DrainContent(lpwhr); if ((new_url = HTTP_GetRedirectURL( lpwhr, szNewLocation ))) {

1 0

Juan Lang : winhttp: Remove no-longer-used #defines.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 336ee2861d4253a1d53917db2f6d5083d803cf94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=336ee2861d4253a1d53917db2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 13:55:58 2009 -0700 winhttp: Remove no-longer-used #defines. --- dlls/winhttp/net.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 50842a8..6f2d5f5 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -58,9 +58,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -#define DEFAULT_SEND_TIMEOUT 30 -#define DEFAULT_RECEIVE_TIMEOUT 30 - #ifndef HAVE_GETADDRINFO /* critical section to protect non-reentrant gethostbyname() */

1 0

Juan Lang : winhttp: Remove calls to SSL_CTX_set_timeout, as they affect the session's lifetime, not the read timeout.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 1229aa723a7e38194beb43f632bf67af8342986c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1229aa723a7e38194beb43f63… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 13:53:54 2009 -0700 winhttp: Remove calls to SSL_CTX_set_timeout, as they affect the session's lifetime, not the read timeout. --- dlls/winhttp/net.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 94bfd89..50842a8 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -100,8 +100,6 @@ MAKE_FUNCPTR( SSL_write ); MAKE_FUNCPTR( SSL_read ); MAKE_FUNCPTR( SSL_get_verify_result ); MAKE_FUNCPTR( SSL_get_peer_certificate ); -MAKE_FUNCPTR( SSL_CTX_get_timeout ); -MAKE_FUNCPTR( SSL_CTX_set_timeout ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); MAKE_FUNCPTR( BIO_new_fp ); @@ -218,8 +216,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_read ); LOAD_FUNCPTR( SSL_get_verify_result ); LOAD_FUNCPTR( SSL_get_peer_certificate ); - LOAD_FUNCPTR( SSL_CTX_get_timeout ); - LOAD_FUNCPTR( SSL_CTX_set_timeout ); LOAD_FUNCPTR( SSL_CTX_set_default_verify_paths ); #undef LOAD_FUNCPTR @@ -482,11 +478,6 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) if (conn->secure) { #ifdef SONAME_LIBSSL - long timeout; - - timeout = pSSL_CTX_get_timeout( ctx ); - pSSL_CTX_set_timeout( ctx, DEFAULT_RECEIVE_TIMEOUT ); - while (recvd < *buflen) { int dummy; @@ -502,7 +493,6 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) } if (buffer[recvd] != '\r') recvd++; } - pSSL_CTX_set_timeout( ctx, timeout ); if (ret) { buffer[recvd++] = 0;

1 0

Juan Lang : winhttp: Use connection' s timeout rather than default timeout when reading a line.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 2418e82810a6caa594a7071dc5d85ef4e73b3ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2418e82810a6caa594a7071dc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 13:53:11 2009 -0700 winhttp: Use connection's timeout rather than default timeout when reading a line. --- dlls/winhttp/net.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 181ff02..94bfd89 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -519,9 +519,16 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) pfd.events = POLLIN; while (recvd < *buflen) { - if (poll( &pfd, 1, DEFAULT_RECEIVE_TIMEOUT * 1000 ) > 0) + int timeout, res; + struct timeval tv; + socklen_t len = sizeof(tv); + + if ((res = getsockopt( conn->socket, SOL_SOCKET, SO_RCVTIMEO, (void*)&tv, &len ) != -1)) + timeout = tv.tv_sec * 1000 + tv.tv_usec / 1000; + else + timeout = -1; + if (poll( &pfd, 1, timeout ) > 0) { - int res; if ((res = recv( conn->socket, &buffer[recvd], 1, 0 )) <= 0) { if (res == -1) set_last_error( sock_get_error( errno ) );

1 0