wine-commits June 2008

wine-commits@winehq.org

3 participants
944 discussions

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman 02 Jun '08

02 Jun '08

Module: website Branch: master Commit: b69515ffb9abf3ddf19a9b19230bb912e79b8092 URL: http://source.winehq.org/git/website.git/?a=commit;h=b69515ffb9abf3ddf19a9b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 2 15:30:58 2008 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Ángel Guzmán Maeso : output path of config file on not found error
by Jeremy Newman 02 Jun '08

02 Jun '08

Module: website Branch: master Commit: f04a829ce505eb5534d2956f8d06dedc08f72000 URL: http://source.winehq.org/git/website.git/?a=commit;h=f04a829ce505eb5534d295… Author: Ángel Guzmán Maeso <shakaran(a)gmail.com> Date: Mon Jun 2 15:30:09 2008 -0500 output path of config file on not found error --- include/config.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/config.php b/include/config.php index a5f1fe2..2a3b837 100644 --- a/include/config.php +++ b/include/config.php @@ -22,7 +22,7 @@ class config // exit if config not found if (!file_exists($path)) { - echo 'config file not found!'; + echo "config file {$path} not found!"; exit(); }

1 0

Francois Gouget : wordpad: Remove extraneous spaces in '...'.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: b4bf3553c4071a2a6979f1df08ae75aadde94b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bf3553c4071a2a6979f1df0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 2 12:46:26 2008 +0200 wordpad: Remove extraneous spaces in '...'. --- programs/wordpad/Ru.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 91f6467..e155f77 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -27,9 +27,9 @@ BEGIN MENUITEM "&��\tCtrl+S", ID_FILE_SAVE MENUITEM "�� &��...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&�� . . .\tCtrl+P", ID_PRINT - MENUITEM "��&�� . . .", ID_PREVIEW - MENUITEM "&�� . . .", ID_PRINTSETUP + MENUITEM "&��...\tCtrl+P", ID_PRINT + MENUITEM "��&�� ...", ID_PREVIEW + MENUITEM "&�� ...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "�&��", ID_FILE_EXIT END @@ -44,9 +44,9 @@ BEGIN MENUITEM "&��\tDEL", ID_EDIT_CLEAR MENUITEM "�� &��\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&�� . . .\tCrtl+F", ID_FIND + MENUITEM "&��...\tCrtl+F", ID_FIND MENUITEM "��&�� \tF3", ID_FIND_NEXT - MENUITEM "&�� . . .\tCtrl+H", ID_REPLACE + MENUITEM "&��...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "&�� ", ID_EDIT_READONLY MENUITEM "&��", ID_EDIT_MODIFIED @@ -67,18 +67,18 @@ BEGIN MENUITEM "&��", ID_TOGGLE_RULER MENUITEM "&�� ", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&�� . . .", ID_VIEWPROPERTIES + MENUITEM "&��...", ID_VIEWPROPERTIES END POPUP "��&��" BEGIN - MENUITEM "&�� . . .", ID_DATETIME + MENUITEM "&�� ...", ID_DATETIME END POPUP "��&��" BEGIN - MENUITEM "&�� . . .", ID_FONTSETTINGS + MENUITEM "&��...", ID_FONTSETTINGS MENUITEM "&��" ID_BULLET - MENUITEM "&�� . . ." ID_PARAFORMAT - MENUITEM "&�� . . ." ID_TABSTOPS + MENUITEM "&��..." ID_PARAFORMAT + MENUITEM "&��..." ID_TABSTOPS POPUP "&��" BEGIN MENUITEM "&��\tCtrl+1", ID_BACK_1 @@ -100,7 +100,7 @@ BEGIN MENUITEM "��&��", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&��" ID_BULLET - MENUITEM "&�� . . ." ID_PARAFORMAT + MENUITEM "&��..." ID_PARAFORMAT END END

1 0

Francois Gouget : regedit: Update the French translation.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 4cff95351c8ebcd8894461cdc3d10d2d3347ca95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cff95351c8ebcd8894461cdc… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 2 12:45:36 2008 +0200 regedit: Update the French translation. --- programs/regedit/Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Fr.rc b/programs/regedit/Fr.rc index 6734b83..cd10d4d 100644 --- a/programs/regedit/Fr.rc +++ b/programs/regedit/Fr.rc @@ -108,6 +108,7 @@ BEGIN MENUITEM "&Supprimer\tDel", ID_EDIT_DELETE MENUITEM "Ren&ommer\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Exporter...", ID_EDIT_EXPORT MENUITEM "&Copier le nom de la cl�", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Rechercher\tCtrl+F", ID_EDIT_FIND, GRAYED

1 0

Francois Gouget : reg: Add French resources.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 71941a8f78092ef4a53d7f8df276ad1a414ce194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71941a8f78092ef4a53d7f8df… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 2 12:44:35 2008 +0200 reg: Add French resources. --- programs/reg/Fr.rc | 30 ++++++++++++++++++++++++++++++ programs/reg/rsrc.rc | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/programs/reg/Fr.rc b/programs/reg/Fr.rc new file mode 100644 index 0000000..e37850a --- /dev/null +++ b/programs/reg/Fr.rc @@ -0,0 +1,30 @@ +/* + * REG.EXE - Wine-compatible reg program. + * French language support + * + * Copyright 2008 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "La syntaxe de cette commande est:\n\nREG [ ADD | DELETE | QUERY ]\nREG commande /?\n" + STRING_ADD_USAGE, "REG ADD nom_de_cl� [/v nom_de_valeur | /ve] [/t type] [/s separateur] [/d donn�e] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nom_de_cl� [/v nom_de_valeur | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nom_de_cl� [/v nom_de_valeur | /ve] [/s]\n" +} diff --git a/programs/reg/rsrc.rc b/programs/reg/rsrc.rc index dfeee04..03c4e63 100644 --- a/programs/reg/rsrc.rc +++ b/programs/reg/rsrc.rc @@ -25,6 +25,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Da.rc" #include "De.rc" #include "En.rc" +#include "Fr.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc"

1 0

Alexandre Julliard : user32/tests: Fix race condition in DDE server startup .
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: e0c35a8582b9cc748b04661d0549f611f2ec35ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c35a8582b9cc748b04661d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 2 14:13:01 2008 +0200 user32/tests: Fix race condition in DDE server startup. --- dlls/user32/tests/dde.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index eb875e3..f64e61d 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -227,12 +227,13 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA return DefWindowProcA(hwnd, msg, wparam, lparam); } -static void test_msg_server(HANDLE hproc) +static void test_msg_server(HANDLE hproc, HANDLE hthread) { MSG msg; HWND hwnd; DWORD res; + ResumeThread( hthread ); create_dde_window(&hwnd, "dde_server", dde_server_wndproc); while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) @@ -2091,9 +2092,9 @@ START_TEST(dde) startup.wShowWindow = SW_SHOWNORMAL; CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - 0, NULL, NULL, &startup, &proc); + CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - test_msg_server(proc.hProcess); + test_msg_server(proc.hProcess, proc.hThread); sprintf(buffer, "%s dde msg", argv[0]); CreateProcessA(NULL, buffer, NULL, NULL, FALSE,

1 0

Francois Gouget : winefile: Fix the French translation ( with some help from Michael Stefaniuc).
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 133ada79704dd7c55762dac72818759f7a5f34be URL: http://source.winehq.org/git/wine.git/?a=commit;h=133ada79704dd7c55762dac72… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 2 12:45:46 2008 +0200 winefile: Fix the French translation (with some help from Michael Stefaniuc). --- programs/winefile/Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/Fr.rc b/programs/winefile/Fr.rc index c6294b5..73d7c8e 100644 --- a/programs/winefile/Fr.rc +++ b/programs/winefile/Fr.rc @@ -191,7 +191,7 @@ BEGIN CONTROL "&Autres fichiers",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 CONTROL "Montrer les fichiers cach�s/&syst�me",IDC_VIEW_TYPE_HIDDEN, - "Bouton",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 DEFPUSHBUTTON "OK",IDOK,104,7,50,14 PUSHBUTTON "Annuler",IDCANCEL,104,24,50,14 END

1 0

Hans Leidekker : wininet: Don't send a "Connection: Close" header.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 656a035821e0d070d0f55351fcad576a682b13f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=656a035821e0d070d0f55351f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat May 31 21:47:24 2008 +0200 wininet: Don't send a "Connection: Close" header. --- dlls/wininet/http.c | 9 ++--- dlls/wininet/tests/http.c | 68 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2326a7a..b973a79 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3156,7 +3156,6 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, INT responseLen; BOOL loop_next; INTERNET_ASYNC_RESULT iar; - static const WCHAR szClose[] = { 'C','l','o','s','e',0 }; static const WCHAR szPost[] = { 'P','O','S','T',0 }; static const WCHAR szContentLength[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 }; @@ -3211,10 +3210,10 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, } HTTP_FixURL(lpwhr); - HTTP_ProcessHeader(lpwhr, szConnection, - lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION ? szKeepAlive : szClose, - HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); - + if (lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION) + { + HTTP_ProcessHeader(lpwhr, szConnection, szKeepAlive, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + } HTTP_InsertAuthorization(lpwhr, lpwhr->pAuthInfo, szAuthorization); HTTP_InsertAuthorization(lpwhr, lpwhr->pProxyAuthInfo, szProxy_Authorization); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cd2aba2..9ad9790 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1394,7 +1394,6 @@ static DWORD CALLBACK server_thread(LPVOID param) buffer[i-3] == '\r' && buffer[i-1] == '\r') break; } - if (strstr(buffer, "GET /test1")) { if (!strstr(buffer, "Content-Length: 0")) @@ -1405,7 +1404,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } - if (strstr(buffer, "/test2")) { if (strstr(buffer, "Proxy-Authorization: Basic bWlrZToxMTAx")) @@ -1416,7 +1414,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, proxymsg, sizeof proxymsg-1, 0); } - if (strstr(buffer, "/test3")) { if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) @@ -1424,7 +1421,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, noauthmsg, sizeof noauthmsg-1, 0); } - if (strstr(buffer, "/test4")) { if (strstr(buffer, "Connection: Close")) @@ -1432,7 +1428,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } - if (strstr(buffer, "POST /test5")) { if (strstr(buffer, "Content-Length: 0")) @@ -1443,7 +1438,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } - if (strstr(buffer, "GET /test6")) { send(c, contmsg, sizeof contmsg-1, 0); @@ -1451,7 +1445,6 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, okmsg, sizeof okmsg-1, 0); send(c, page1, sizeof page1-1, 0); } - if (strstr(buffer, "POST /test7")) { if (strstr(buffer, "Content-Length: 100")) @@ -1462,7 +1455,22 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } - + if (strstr(buffer, "/test8")) + { + if (!strstr(buffer, "Connection: Close") && + strstr(buffer, "Connection: Keep-Alive")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "/test9")) + { + if (!strstr(buffer, "Connection: Close") && + !strstr(buffer, "Connection: Keep-Alive")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg-1, 0); @@ -1686,6 +1694,49 @@ static void test_header_handling_order(int port) InternetCloseHandle(session); } +static void test_connection_header(int port) +{ + HINTERNET ses, con, req; + DWORD size, status; + BOOL ret; + + ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequest(con, NULL, "/test8", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); + ok(ret, "HttpQueryInfo failed\n"); + ok(status == 200, "request failed with status %u\n", status); + + InternetCloseHandle(req); + + req = HttpOpenRequest(con, NULL, "/test9", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); + ok(ret, "HttpQueryInfo failed\n"); + ok(status == 200, "request failed with status %u\n", status); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_http_connection(void) { struct server_info si; @@ -1709,6 +1760,7 @@ static void test_http_connection(void) test_header_handling_order(si.port); test_basic_request(si.port, "POST", "/test5"); test_basic_request(si.port, "GET", "/test6"); + test_connection_header(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Jon Griffiths : oleaut32/tests: Fix memory leaks reported by valgrind.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 7cdc50fede94e42f8cf795330c247e89c0578e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdc50fede94e42f8cf795330… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Fri May 30 07:32:37 2008 -0700 oleaut32/tests: Fix memory leaks reported by valgrind. --- dlls/oleaut32/tests/vartest.c | 89 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7cdc50fede94e42f8cf79…

1 0

Jonathan Ernst : shell32: Updated French translation.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 992e3edc4bb75e936719d4935baf9f14a7c681d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992e3edc4bb75e936719d4935… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 2 09:02:08 2008 +0200 shell32: Updated French translation. --- dlls/shell32/shell32_Fr.rc | 126 ++++++++++++++++++++++++++------------------ 1 files changed, 74 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=992e3edc4bb75e936719d…

1 0

← Newer
1
...
88
89
90
91
92
93
94
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2008