June 2008 - Wine-commits - list.winehq.org

Á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

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

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

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 : 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

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 : 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

Austin English : README: A few more updates.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 1b81ee33be1a20ad5267ff4fba168cec5f4a39c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b81ee33be1a20ad5267ff4fb… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 30 11:44:24 2008 -0500 README: A few more updates. --- README | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/README b/README index 46a4b1e..baa4929 100644 --- a/README +++ b/README @@ -29,8 +29,8 @@ especially the wealth of information found at http://www.winehq.org. To compile and run Wine, you must have one of the following: Linux version 2.0.36 or above - FreeBSD 6.2 or later - Solaris x86 2.5 or later + FreeBSD 7.0 or later + Solaris x86 9 or later NetBSD-current Mac OS X 10.4 or later @@ -44,12 +44,9 @@ Linux info: it's best to have a current kernel such as 2.4.x or 2.6.x. FreeBSD info: - Wine should build on FreeBSD 5.x, but versions before FreeBSD 7.0 will - generally not work properly. FreeBSD 6.3 has patches available to allow - Wine to run. See <http://wiki.freebsd.org/Wine> for more information. - - More information can be found in the FreeBSD ports tree at - <ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports/emulators/wine/>. + Wine will generally not work properly on versions before FreeBSD + 7.0. FreeBSD 6.3 has patches available to allow Wine to run. See + <http://wiki.freebsd.org/Wine> for more information. Solaris info: You will most likely need to build Wine with the GNU toolchain @@ -112,7 +109,7 @@ file). Then do a "make clean", and patch the release with: bunzip2 -c patch-file | patch -p1 where "patch-file" is the name of the patch file (something like -wine-0.9.x.diff.bz2). You can then re-run "./configure", and then +wine-1.0.x.diff.bz2). You can then re-run "./configure", and then run "make depend && make". @@ -135,16 +132,16 @@ Support area at http://www.winehq.org/ for configuration hints. When invoking Wine, you may specify the entire path to the executable, or a filename only. -For example: to run Solitaire: +For example: to run Notepad: - wine sol (using the search Path as specified in - wine sol.exe the config file to locate the file) + wine notepad (using the search Path as specified in + wine notepad.exe the config file to locate the file) - wine c:\\windows\\sol.exe (using DOS filename syntax) + wine c:\\windows\\notepad.exe (using DOS filename syntax) - wine ~/.wine/drive_c/windows/sol.exe (using Unix filename syntax) + wine ~/.wine/drive_c/windows/notepad.exe (using Unix filename syntax) - wine sol.exe /parameter1 -parameter2 parameter3 + wine notepad.exe /parameter1 -parameter2 parameter3 (calling program with parameters) Wine is not yet complete, so several programs may crash. In that crash

1 0

Hans Leidekker : wininet: Return success from the InternetSetOption( INTERNET_OPTION_DISABLE_AUTODIAL) stub.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: a6dc4a9a442f7fcbe36d33eb71c7efda7c7f7b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6dc4a9a442f7fcbe36d33eb7… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat May 31 21:47:01 2008 +0200 wininet: Return success from the InternetSetOption(INTERNET_OPTION_DISABLE_AUTODIAL) stub. --- dlls/wininet/internet.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a7a28c1..1ae8cce 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2323,6 +2323,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_SECURITY_FLAGS: FIXME("Option INTERNET_OPTION_SECURITY_FLAGS; STUB\n"); break; + case INTERNET_OPTION_DISABLE_AUTODIAL: + FIXME("Option INTERNET_OPTION_DISABLE_AUTODIAL; STUB\n"); + break; case 86: FIXME("86\n"); break;

1 0

Hans Leidekker : wininet: Don' t send a handle closing callback for session handles created with InternetOpenUrl .
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 9d55252d41f2c6b578c76716c1d113588d700c0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d55252d41f2c6b578c76716c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat May 31 21:46:34 2008 +0200 wininet: Don't send a handle closing callback for session handles created with InternetOpenUrl. --- dlls/wininet/internet.c | 10 +++++++--- dlls/wininet/tests/http.c | 20 +++++++++++++++----- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d4734a4..a7a28c1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -181,9 +181,13 @@ BOOL WININET_Release( LPWININETHANDLEHEADER info ) TRACE( "closing connection %p\n", info); info->vtbl->CloseConnection( info ); } - INTERNET_SendCallback(info, info->dwContext, - INTERNET_STATUS_HANDLE_CLOSING, &info->hInternet, - sizeof(HINTERNET)); + /* Don't send a callback if this is a session handle created with InternetOpenUrl */ + if (info->htype != WH_HHTTPSESSION || !(info->dwInternalFlags & INET_OPENURL)) + { + INTERNET_SendCallback(info, info->dwContext, + INTERNET_STATUS_HANDLE_CLOSING, &info->hInternet, + sizeof(HINTERNET)); + } TRACE( "destroying object %p\n", info); if ( info->htype != WH_HINIT ) list_remove( &info->entry ); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ccaf324..cd2aba2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1809,18 +1809,25 @@ struct context static void WINAPI cb(HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID info, DWORD size) { + INTERNET_ASYNC_RESULT *result = info; + struct context *ctx = (struct context *)context; + trace("%p 0x%08lx %u %p 0x%08x\n", handle, context, status, info, size); if (status == INTERNET_STATUS_REQUEST_COMPLETE) { - INTERNET_ASYNC_RESULT *result = info; - struct context *ctx = (struct context *)context; - trace("request handle: 0x%08lx\n", result->dwResult); - ctx->req = (HINTERNET)result->dwResult; SetEvent(ctx->event); } + if (status == INTERNET_STATUS_HANDLE_CLOSING) + { + DWORD type = INTERNET_HANDLE_TYPE_CONNECT_HTTP, size = sizeof(type); + + if (InternetQueryOption(handle, INTERNET_OPTION_HANDLE_TYPE, &type, &size)) + ok(type != INTERNET_HANDLE_TYPE_CONNECT_HTTP, "unexpected callback\n"); + SetEvent(ctx->event); + } } static void test_open_url_async(void) @@ -1857,9 +1864,12 @@ static void test_open_url_async(void) ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "HttpQueryInfo failed\n"); ok(size > 0, "expected size > 0\n"); - CloseHandle(ctx.event); + ResetEvent(ctx.event); InternetCloseHandle(ctx.req); + WaitForSingleObject(ctx.event, INFINITE); + InternetCloseHandle(ses); + CloseHandle(ctx.event); } #define STATUS_STRING(status) \

1 0