December 2008 - Wine-commits

Aric Stewart : msi: EndDialog with Ignore should not be an error.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: f10eb0bfa2719656b034a70862ca5866d8c8d1df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f10eb0bfa2719656b034a7086… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 16 11:11:51 2008 -0600 msi: EndDialog with Ignore should not be an error. --- dlls/msi/events.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 79e1f66..cb70b69 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -104,7 +104,7 @@ static UINT ControlEvent_EndDialog(MSIPACKAGE* package, LPCWSTR argument, else if (lstrcmpW(argument, szRetry) == 0) package->CurrentInstallState = ERROR_INSTALL_SUSPEND; else if (lstrcmpW(argument, szIgnore) == 0) - package->CurrentInstallState = -1; + package->CurrentInstallState = ERROR_SUCCESS; else if (lstrcmpW(argument, szReturn) == 0) { msi_dialog *parent = msi_dialog_get_parent(dialog);

1 0

Jonathan Ernst : wordpad: Updated French translation.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: bd91afcea4808b93ef9e6e582de58c579de1fad6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd91afcea4808b93ef9e6e582… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Dec 16 19:10:13 2008 +0100 wordpad: Updated French translation. --- programs/wordpad/Fr.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 1345586..23a545c 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -235,4 +235,9 @@ BEGIN "Voulez-vous vraiment continuer�?" STRING_INVALID_NUMBER, "Format de nombre invalide" STRING_OLE_STORAGE_NOT_SUPPORTED, "Les documents conteneur OLE ne sont pas support�s" + STRING_WRITE_FAILED, "Impossible d'enregistrer le fichier." + STRING_WRITE_ACCESS_DENIED, "Vous ne disposez pas des acc�s n�cessaires � l'enregistrement du fichier." + STRING_OPEN_FAILED, "Impossible d'ouvrir le fichier." + STRING_OPEN_ACCESS_DENIED, "Vous ne disposez pas des acc�s n�cessaires � l'ouverture du fichier." + STRING_PRINTING_NOT_IMPLEMENTED, "L'impression n'est pas impl�ment�e" END

1 0

Jonathan Ernst : winhlp32: WINE->Wine.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 70d96c7b73ec32dda9475ccf76d340cb29df97f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d96c7b73ec32dda9475ccf7… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Dec 16 19:13:24 2008 +0100 winhlp32: WINE->Wine. --- programs/winhlp32/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/En.rc b/programs/winhlp32/En.rc index 1276f9c..2a11e1a 100644 --- a/programs/winhlp32/En.rc +++ b/programs/winhlp32/En.rc @@ -61,7 +61,7 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&About WINE", MNID_HELP_WINE + MENUITEM "&About Wine", MNID_HELP_WINE #endif } } @@ -85,7 +85,7 @@ CAPTION "Search" /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT { -STID_WINE_HELP, "WINE Help" +STID_WINE_HELP, "Wine Help" STID_WHERROR, "ERROR" STID_WARNING, "WARNING" STID_INFO, "Information"

1 0

Damjan Jovanovic : winemenubuilder: Create xdg_config_dir if it does not exist.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 2fde3c0f7b13f63b30fc5ac8650e1106fbbec981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fde3c0f7b13f63b30fc5ac86… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Dec 16 16:08:49 2008 +0200 winemenubuilder: Create xdg_config_dir if it does not exist. --- programs/winemenubuilder/winemenubuilder.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 4792d0d..ec7a162 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1708,6 +1708,7 @@ static BOOL init_xdg(void) xdg_config_dir = heap_printf("%s/.config/menus/applications-merged", getenv("HOME")); if (xdg_config_dir) { + create_directories(xdg_config_dir); if (getenv("XDG_DATA_HOME")) xdg_data_dir = heap_printf("%s", getenv("XDG_DATA_HOME")); else

1 0

Marcus Meissner : include: Add prototype for GetConsoleInputExeNameA/W().
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 94b87d08c825ec89c6abe0dea4721d286ff59c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b87d08c825ec89c6abe0dea… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Dec 16 16:31:10 2008 +0100 include: Add prototype for GetConsoleInputExeNameA/W(). --- include/wincon.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wincon.h b/include/wincon.h index 3257c21..5d1e8e7 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -205,6 +205,9 @@ WINBASEAPI BOOL WINAPI FreeConsole(VOID); WINBASEAPI BOOL WINAPI GenerateConsoleCtrlEvent( DWORD,DWORD); WINBASEAPI UINT WINAPI GetConsoleCP(VOID); WINBASEAPI BOOL WINAPI GetConsoleCursorInfo( HANDLE,LPCONSOLE_CURSOR_INFO); +WINBASEAPI BOOL WINAPI GetConsoleInputExeNameA(DWORD,LPSTR); +WINBASEAPI BOOL WINAPI GetConsoleInputExeNameW(DWORD,LPWSTR); +#define GetConsoleInputExeName WINELIB_NAME_AW(GetConsoleInputExeName) WINBASEAPI BOOL WINAPI GetConsoleMode( HANDLE,LPDWORD); WINBASEAPI UINT WINAPI GetConsoleOutputCP(VOID); WINBASEAPI BOOL WINAPI GetConsoleScreenBufferInfo(HANDLE,LPCONSOLE_SCREEN_BUFFER_INFO);

1 0

Hans Leidekker : janitorial: Don' t depend on user32 for the self registration functions.
by Alexandre Julliard 17 Dec '08

17 Dec '08

1 0

Hans Leidekker : janitorial: Remove unneeded user32 imports.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 63aff890d7cdee94fdd8b945798c91b4029c9900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63aff890d7cdee94fdd8b9457… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 16 16:41:16 2008 +0100 janitorial: Remove unneeded user32 imports. --- dlls/amstream/Makefile.in | 2 +- dlls/d3dxof/Makefile.in | 2 +- dlls/dmband/Makefile.in | 2 +- dlls/dmcompos/Makefile.in | 2 +- dlls/dmloader/Makefile.in | 2 +- dlls/dmscript/Makefile.in | 2 +- dlls/dmstyle/Makefile.in | 2 +- dlls/dmsynth/Makefile.in | 2 +- dlls/dmusic/Makefile.in | 2 +- dlls/dpnet/Makefile.in | 2 +- dlls/dsound/Makefile.in | 2 +- dlls/dswave/Makefile.in | 2 +- dlls/inseng/Makefile.in | 2 +- dlls/mlang/Makefile.in | 2 +- dlls/objsel/Makefile.in | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index c74c14d..e141df0 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = amstream.dll -IMPORTS = strmiids uuid ole32 user32 advapi32 kernel32 +IMPORTS = strmiids uuid ole32 advapi32 kernel32 C_SRCS = \ amstream.c \ diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in index 2319c8b..4e0d77c 100644 --- a/dlls/d3dxof/Makefile.in +++ b/dlls/d3dxof/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dxof.dll IMPORTLIB = d3dxof -IMPORTS = dxguid uuid ole32 user32 advapi32 kernel32 +IMPORTS = dxguid uuid ole32 advapi32 kernel32 C_SRCS = \ main.c \ diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in index 26b8976..157ba5e 100644 --- a/dlls/dmband/Makefile.in +++ b/dlls/dmband/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmband.dll -IMPORTS = dxguid uuid ole32 user32 advapi32 kernel32 +IMPORTS = dxguid uuid ole32 advapi32 kernel32 C_SRCS = \ band.c \ diff --git a/dlls/dmcompos/Makefile.in b/dlls/dmcompos/Makefile.in index 4fdb355..9b51cd9 100644 --- a/dlls/dmcompos/Makefile.in +++ b/dlls/dmcompos/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmcompos.dll -IMPORTS = dxguid uuid ole32 user32 advapi32 kernel32 +IMPORTS = dxguid uuid ole32 advapi32 kernel32 C_SRCS = \ chordmap.c \ diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in index 1dde79d..0edebee 100644 --- a/dlls/dmloader/Makefile.in +++ b/dlls/dmloader/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmloader.dll -IMPORTS = dxguid uuid ole32 user32 advapi32 kernel32 +IMPORTS = dxguid uuid ole32 advapi32 kernel32 C_SRCS = \ classfactory.c \ diff --git a/dlls/dmscript/Makefile.in b/dlls/dmscript/Makefile.in index 46ac121..1f99f5c 100644 --- a/dlls/dmscript/Makefile.in +++ b/dlls/dmscript/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmscript.dll -IMPORTS = dxguid uuid ole32 user32 advapi32 kernel32 +IMPORTS = dxguid uuid ole32 advapi32 kernel32 C_SRCS = \ dmscript_main.c \ diff --git a/dlls/dmstyle/Makefile.in b/dlls/dmstyle/Makefile.in index b01f419..c85a76c 100644 --- a/dlls/dmstyle/Makefile.in +++ b/dlls/dmstyle/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmstyle.dll -IMPORTS = dxguid uuid ole32 user32 advapi32 kernel32 +IMPORTS = dxguid uuid ole32 advapi32 kernel32 C_SRCS = \ auditiontrack.c \ diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in index 35cadc5..03db464 100644 --- a/dlls/dmsynth/Makefile.in +++ b/dlls/dmsynth/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmsynth.dll -IMPORTS = dxguid uuid ole32 user32 advapi32 kernel32 +IMPORTS = dxguid uuid ole32 advapi32 kernel32 C_SRCS = \ dmsynth_main.c \ diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index a3c114a..3b1b962 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmusic.dll -IMPORTS = dxguid uuid ole32 user32 advapi32 kernel32 +IMPORTS = dxguid uuid ole32 advapi32 kernel32 C_SRCS = \ buffer.c \ diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 8d6b319..49ce6b6 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dpnet.dll IMPORTLIB = dpnet -IMPORTS = dxguid uuid ole32 user32 advapi32 kernel32 +IMPORTS = dxguid uuid ole32 advapi32 kernel32 C_SRCS = \ address.c \ diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in index e6892c1..bbac7f9 100644 --- a/dlls/dsound/Makefile.in +++ b/dlls/dsound/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dsound.dll IMPORTLIB = dsound -IMPORTS = dxguid uuid winmm ole32 user32 advapi32 kernel32 ntdll +IMPORTS = dxguid uuid winmm ole32 advapi32 kernel32 ntdll C_SRCS = \ buffer.c \ diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in index fb13f1d..fb2e28a 100644 --- a/dlls/dswave/Makefile.in +++ b/dlls/dswave/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dswave.dll -IMPORTS = dxguid uuid ole32 user32 advapi32 kernel32 +IMPORTS = dxguid uuid ole32 advapi32 kernel32 C_SRCS = \ dswave.c \ diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index 4173760..e478479 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = inseng.dll -IMPORTS = uuid ole32 user32 advapi32 kernel32 +IMPORTS = uuid ole32 advapi32 kernel32 EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in index 6bf1661..cc72124 100644 --- a/dlls/mlang/Makefile.in +++ b/dlls/mlang/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mlang.dll IMPORTLIB = mlang -IMPORTS = uuid ole32 user32 gdi32 advapi32 kernel32 +IMPORTS = uuid ole32 gdi32 advapi32 kernel32 DELAYIMPORTS = oleaut32 EXTRADEFS = -DCOM_NO_WINDOWS_H diff --git a/dlls/objsel/Makefile.in b/dlls/objsel/Makefile.in index 6c90bc0..1885c14 100644 --- a/dlls/objsel/Makefile.in +++ b/dlls/objsel/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = objsel.dll -IMPORTS = strmiids uuid ole32 user32 advapi32 kernel32 +IMPORTS = strmiids uuid ole32 advapi32 kernel32 C_SRCS = \ factory.c \

1 0

Paul Vriens : jscript/tests: Fix test failures on Win9x.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: dc8ea1b3e4839df0f33c93eb85cde1db55ac905f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8ea1b3e4839df0f33c93eb8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 16 16:42:50 2008 +0100 jscript/tests: Fix test failures on Win9x. --- dlls/jscript/tests/run.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 926e45e..81de579 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -75,7 +75,9 @@ DEFINE_EXPECT(GetItemInfo_testVal); #define DISPID_GLOBAL_TESTOBJ 0x1006 static const WCHAR testW[] = {'t','e','s','t',0}; +static const CHAR testA[] = "test"; static const WCHAR test_valW[] = {'t','e','s','t','V','a','l',0}; +static const CHAR test_valA[] = "testVal"; static BOOL strict_dispid_check; static const char *test_name = "(null)"; @@ -490,9 +492,9 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC ok(dwReturnMask == SCRIPTINFO_IUNKNOWN, "unexpected dwReturnMask %x\n", dwReturnMask); ok(!ppti, "ppti != NULL\n"); - if(!lstrcmpW(pstrName, test_valW)) + if(!strcmp_wa(pstrName, test_valA)) CHECK_EXPECT(GetItemInfo_testVal); - else if(lstrcmpW(pstrName, testW)) + else if(strcmp_wa(pstrName, testA)) ok(0, "unexpected pstrName %s\n", debugstr_w(pstrName)); *ppiunkItem = (IUnknown*)&Global;

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/bugzilla
by Jeremy Newman 16 Dec '08

16 Dec '08

Module: bugzilla Branch: master Commit: 0b71fcdb8415c4c4dd9e1c7a7d5ee40b7806be66 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=0b71fcdb8415c4c4dd9e1… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 16 09:49:49 2008 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/bugzilla ---

1 0

Jeff Zaroyko : Make the bug reporting instructions more striking.
by Jeremy Newman 16 Dec '08

16 Dec '08

Module: bugzilla Branch: master Commit: 1361de5cc5349794b2a31f77c1f597cdcd665f0e URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=1361de5cc5349794b2a31… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sun Dec 14 14:56:44 2008 +1100 Make the bug reporting instructions more striking. --- images/info.png | Bin 0 -> 7757 bytes template/en/default/bug/create/create.html.tmpl | 2 +- .../en/default/bug/create/user-message.html.tmpl | 16 +++++++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/images/info.png b/images/info.png new file mode 100644 index 0000000..5e5fccc Binary files /dev/null and b/images/info.png differ diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index f1cf461..af92bb3 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -164,7 +164,7 @@ function handleWantsAttachment(wants_attachment) { <table cellspacing="2" cellpadding="0" border="0"> <tr> - <td> </td> + <td><img alt="information" src="images/info.png"></td> <td colspan="3"> [%# Migration note: The following file corresponds to the old Param # 'entryheaderhtml' diff --git a/template/en/default/bug/create/user-message.html.tmpl b/template/en/default/bug/create/user-message.html.tmpl index 1dbfa12..edbd704 100644 --- a/template/en/default/bug/create/user-message.html.tmpl +++ b/template/en/default/bug/create/user-message.html.tmpl @@ -30,10 +30,12 @@ [% PROCESS global/variables.none.tmpl %] -Before reporting [% terms.abug %], please read the -<a href="http://wiki.winehq.org/Bugs"> -[% terms.bug %] writing guidelines</a>, please look at the list of -<a href="duplicates.cgi">most frequently reported [% terms.bugs %]</a>, the -list of <a href="http://wiki.winehq.org/KnownIssues">known issues</a>, and please -<a href="query.cgi">search</a> for the [% terms.bug %] to avoid submitting a -duplicate report. +<h3><u>When reporting [% terms.abug %]</u></h3> +<ul> + <li>read the <a href="http://wiki.winehq.org/Bugs">[% terms.bug %] writing guidelines</a></li> + <li>check the list of <a href="duplicates.cgi">most frequently reported [% terms.bugs %]</a></li> + <li>check the list of <a href="http://wiki.winehq.org/KnownIssues">known issues</a></li> + <li><a href="query.cgi">search</a> for the [% terms.bug %] to avoid submitting a duplicate report</li> + <li>run a <a href="http://wiki.winehq.org/RegressionTesting">regression test</a> <b>before</b> submitting a bug report about a regression</li> +</ul> +<h4>If in doubt - visit the <a href="http://forum.winehq.org">forum</a> or <a href="irc://irc.freenode.net/#winehq">IRC</a> to ask for help.</h4>

1 0