June 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : wine.inf: Avoid creating empty registry values.
by Alexandre Julliard June 10, 2010

June 10, 2010

Module: wine Branch: master Commit: 314171535cf6fa86511ca950831a4c0648fec08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=314171535cf6fa86511ca9508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 10 17:10:19 2010 +0200 wine.inf: Avoid creating empty registry values. --- tools/wine.inf.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 8a1a871..b8f4a82 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -483,10 +483,10 @@ HKCU,%Desktop%,"LowPowerActive",,"0" HKCU,%Desktop%,"MenuShowDelay",2,"400" [DotNet] -HKLM,Software\Microsoft\.NETFramework\policy\v1.0 -HKLM,Software\Microsoft\.NETFramework\policy\v1.1 -HKLM,Software\Microsoft\.NETFramework\policy\v2.0 -HKLM,Software\Microsoft\.NETFramework\policy\v3.0 +HKLM,Software\Microsoft\.NETFramework\policy\v1.0,,16 +HKLM,Software\Microsoft\.NETFramework\policy\v1.1,,16 +HKLM,Software\Microsoft\.NETFramework\policy\v2.0,,16 +HKLM,Software\Microsoft\.NETFramework\policy\v3.0,,16 HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,SP,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Install,0x10003,1

1 0

Marcus Meissner : wininet: Fixed buffer lengths in InternetCrackUrlW tests.
by Alexandre Julliard June 10, 2010

June 10, 2010

Module: wine Branch: master Commit: 3d5a3a32ce7536041fce9b07e265404c2e112b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5a3a32ce7536041fce9b07e… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Jun 10 13:52:33 2010 +0200 wininet: Fixed buffer lengths in InternetCrackUrlW tests. --- dlls/wininet/tests/url.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 1f012f0..6dc1369 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -200,7 +200,7 @@ static void test_crack_url(const crack_url_test_t *test) urlw.dwUrlPathLength = 1; urlw.dwExtraInfoLength = 1; - MultiByteToWideChar(CP_ACP, 0, test->url, -1, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, test->url, -1, buf, sizeof(buf)/sizeof(buf[0])); b = InternetCrackUrlW(buf, lstrlenW(buf), 0, &urlw); if(!b && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("InternetCrackUrlW is not implemented\n"); @@ -416,19 +416,19 @@ static void InternetCrackUrlW_test(void) user[0]=0; pwd[0]=0; memset(&comp, 0, sizeof comp); - comp.dwStructSize = sizeof comp; + comp.dwStructSize = sizeof(comp); comp.lpszScheme = scheme; - comp.dwSchemeLength = sizeof scheme; + comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]); comp.lpszHostName = host; - comp.dwHostNameLength = sizeof host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); comp.lpszUserName = user; - comp.dwUserNameLength = sizeof user; + comp.dwUserNameLength = sizeof(user)/sizeof(user[0]); comp.lpszPassword = pwd; - comp.dwPasswordLength = sizeof pwd; + comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); comp.lpszExtraInfo = extra; - comp.dwExtraInfoLength = sizeof extra; + comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); SetLastError(0xdeadbeef); r = InternetCrackUrlW(NULL, 0, 0, &comp ); @@ -471,9 +471,9 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszHostName = host; - comp.dwHostNameLength = sizeof host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); r = InternetCrackUrlW(url, 0, 0, &comp ); ok( r, "failed to crack url\n"); @@ -493,11 +493,11 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszHostName = host; - comp.dwHostNameLength = sizeof host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); comp.lpszExtraInfo = NULL; - comp.dwExtraInfoLength = sizeof extra; + comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); r = InternetCrackUrlW(url, 0, 0, &comp ); ok( r, "failed to crack url\n"); @@ -547,17 +547,17 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszScheme = scheme; - comp.dwSchemeLength = sizeof scheme; + comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]); comp.lpszHostName = host; - comp.dwHostNameLength = sizeof host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); comp.lpszUserName = user; - comp.dwUserNameLength = sizeof user; + comp.dwUserNameLength = sizeof(user)/sizeof(user[0]); comp.lpszPassword = pwd; - comp.dwPasswordLength = sizeof pwd; + comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); comp.lpszExtraInfo = extra; - comp.dwExtraInfoLength = sizeof extra; + comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); r = InternetCrackUrlW(url3, 0, 0, &comp ); ok( r, "InternetCrackUrlW failed unexpectedly\n"); ok( host[0] == 'x', "host should be x.org\n");

1 0

Alexandre Julliard : advapi32: Fix Unicode string lengths in LsaLookupSids.
by Alexandre Julliard June 10, 2010

June 10, 2010

Module: wine Branch: master Commit: ffb29fd3351f5181a8418de3245753e15dc0119d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb29fd3351f5181a8418de32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 9 20:52:13 2010 +0200 advapi32: Fix Unicode string lengths in LsaLookupSids. Found by Louis Lenders. --- dlls/advapi32/lsa.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 50877cc..e12e312 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -491,9 +491,9 @@ NTSTATUS WINAPI LsaLookupSids( if (domain_size) { - domain.Length = domain_size*sizeof(WCHAR); + domain.Length = (domain_size - 1) * sizeof(WCHAR); domain.MaximumLength = domain_size*sizeof(WCHAR); - domain.Buffer = HeapAlloc(GetProcessHeap(),0,domain.Length); + domain.Buffer = HeapAlloc(GetProcessHeap(),0,domain.MaximumLength); } else { @@ -503,7 +503,7 @@ NTSTATUS WINAPI LsaLookupSids( } (*Names)[i].Use = use; - (*Names)[i].Name.Length = name_size * sizeof(WCHAR); + (*Names)[i].Name.Length = (name_size - 1) * sizeof(WCHAR); (*Names)[i].Name.MaximumLength = name_size * sizeof(WCHAR); (*Names)[i].Name.Buffer = HeapAlloc(GetProcessHeap(),0,name_size * sizeof(WCHAR)); LookupAccountSidW(NULL, Sids[i], (*Names)[i].Name.Buffer, &name_size, domain.Buffer, &domain_size, &use);

1 0

Alexandre Julliard : xcopy: Do not ignore errors caused by processing parameters.
by Alexandre Julliard June 10, 2010

June 10, 2010

Module: wine Branch: master Commit: b7da23eb29a3f68b6acf0d0e884e54f546241bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7da23eb29a3f68b6acf0d0e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 10 11:24:06 2010 +0200 xcopy: Do not ignore errors caused by processing parameters. --- programs/xcopy/xcopy.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index f996144..4572374 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -261,11 +261,13 @@ int wmain (int argc, WCHAR *argvW[]) WINE_TRACE("Destination : '%s'\n", wine_dbgstr_w(supplieddestination)); /* Extract required information from source specification */ - XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags); + rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags); + if (rc != RC_OK) return rc; /* Extract required information from destination specification */ - XCOPY_ProcessDestParm(supplieddestination, destinationstem, + rc = XCOPY_ProcessDestParm(supplieddestination, destinationstem, destinationspec, sourcespec, flags); + if (rc != RC_OK) return rc; /* Trace out the resulting information */ WINE_TRACE("Resolved parameters:\n");

1 0

Jose Rostagno : reg: Add Spanish translation.
by Alexandre Julliard June 10, 2010

June 10, 2010

Module: wine Branch: master Commit: 294f4e2ff1a795d74fc5d437e0ed37dd02b5144f URL: http://source.winehq.org/git/wine.git/?a=commit;h=294f4e2ff1a795d74fc5d437e… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Wed Jun 9 17:46:33 2010 -0300 reg: Add Spanish translation. --- programs/reg/Es.rc | 40 ++++++++++++++++++++++++++++++++++++++++ programs/reg/Makefile.in | 1 + 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/programs/reg/Es.rc b/programs/reg/Es.rc new file mode 100644 index 0000000..9155327 --- /dev/null +++ b/programs/reg/Es.rc @@ -0,0 +1,40 @@ +/* + * REG.EXE - Wine-compatible reg program. + * Spanish language support + * + * Copyright 2010 José Rostagno + * + * 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 + */ + +#include "reg.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "La sintaxis de este comando es:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n" + STRING_ADD_USAGE, "REG ADD nombre_clave [/v nombre_valor | /ve] [/t tipo] [/s separador] [/d datos] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nombre_clave [/v nombre_valor | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nombre_clave [/v nombre_valor | /ve] [/s]\n" + STRING_SUCCESS, "La operación finalizó con éxito\n" + STRING_INVALID_KEY, "Error: nombre de clave no válido\n" + STRING_INVALID_CMDLINE, "Error: parámetros de línea de comandos inválidos\n" + STRING_NO_REMOTE, "Error: No se puede agregar claves al equipo remoto\n" + STRING_CANNOT_FIND, "Error: El sistema no pudo encontrar la clave o el valor del Registro especificado\n" +} diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index c746d0f..90ae143 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -14,6 +14,7 @@ RC_SRCS = \ Da.rc \ De.rc \ En.rc \ + Es.rc \ Fr.rc \ It.rc \ Ja.rc \

1 0

Łukasz Wojniłowicz : oleacc: Update the Polish translation.
by Alexandre Julliard June 10, 2010

June 10, 2010

Module: wine Branch: master Commit: c52a4c5314fc360099613c831c486e92f2836774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52a4c5314fc360099613c831… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Wed Jun 9 21:36:31 2010 +0200 oleacc: Update the Polish translation. --- dlls/oleacc/oleacc_Pl.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/oleacc/oleacc_Pl.rc b/dlls/oleacc/oleacc_Pl.rc index 5d45368..4248577 100644 --- a/dlls/oleacc/oleacc_Pl.rc +++ b/dlls/oleacc/oleacc_Pl.rc @@ -28,7 +28,7 @@ STRINGTABLE DISCARDABLE ROLE_SYSTEM_TITLEBAR "pasek tytu�u" ROLE_SYSTEM_MENUBAR "pasek menu" ROLE_SYSTEM_SCROLLBAR "pasek przewijania" - ROLE_SYSTEM_GRIP "grip" + ROLE_SYSTEM_GRIP "uchwyt" ROLE_SYSTEM_SOUND "d�wi�k" ROLE_SYSTEM_CURSOR "kursor" ROLE_SYSTEM_CARET "daszek" @@ -40,7 +40,7 @@ STRINGTABLE DISCARDABLE ROLE_SYSTEM_TOOLTIP "podpowied�" ROLE_SYSTEM_APPLICATION "aplikacja" ROLE_SYSTEM_DOCUMENT "dokument" - ROLE_SYSTEM_PANE "pane" + ROLE_SYSTEM_PANE "wycinek" ROLE_SYSTEM_CHART "wykres" ROLE_SYSTEM_DIALOG "dialog" ROLE_SYSTEM_BORDER "obramowanie" @@ -54,14 +54,14 @@ STRINGTABLE DISCARDABLE ROLE_SYSTEM_COLUMN "kolumna" ROLE_SYSTEM_ROW "wiersz" ROLE_SYSTEM_CELL "kom�rka" - ROLE_SYSTEM_LINK "link" + ROLE_SYSTEM_LINK "dowi�zanie" ROLE_SYSTEM_HELPBALLOON "dymek pomocy" ROLE_SYSTEM_CHARACTER "znak" ROLE_SYSTEM_LIST "lista" ROLE_SYSTEM_LISTITEM "element listy" ROLE_SYSTEM_OUTLINE "zarys" ROLE_SYSTEM_OUTLINEITEM "element zarysu" - ROLE_SYSTEM_PAGETAB "page tab" + ROLE_SYSTEM_PAGETAB "zak�adka strony" ROLE_SYSTEM_PROPERTYPAGE "strona w�a�ciwo�ci" ROLE_SYSTEM_INDICATOR "wska�nik" ROLE_SYSTEM_GRAPHIC "grafika" @@ -73,10 +73,10 @@ STRINGTABLE DISCARDABLE ROLE_SYSTEM_COMBOBOX "pole kombi" ROLE_SYSTEM_DROPLIST "lista rozwijana" ROLE_SYSTEM_PROGRESSBAR "pasek post�pu" - ROLE_SYSTEM_DIAL "dial" - ROLE_SYSTEM_HOTKEYFIELD "hot key field" + ROLE_SYSTEM_DIAL "wybieranie" + ROLE_SYSTEM_HOTKEYFIELD "pole gor�cego klawisza" ROLE_SYSTEM_SLIDER "suwak" - ROLE_SYSTEM_SPINBUTTON "spin box" + ROLE_SYSTEM_SPINBUTTON "pole przewijane" ROLE_SYSTEM_DIAGRAM "diagram" ROLE_SYSTEM_ANIMATION "animacja" ROLE_SYSTEM_EQUATION "r�wnanie" @@ -84,7 +84,7 @@ STRINGTABLE DISCARDABLE ROLE_SYSTEM_BUTTONMENU "przycisk menu" ROLE_SYSTEM_BUTTONDROPDOWNGRID "siatka przycisk�w rozwijanych" ROLE_SYSTEM_WHITESPACE "bia�a spacja" - ROLE_SYSTEM_PAGETABLIST "page tab list" + ROLE_SYSTEM_PAGETABLIST "lista zak�adek stron" ROLE_SYSTEM_CLOCK "zegar" ROLE_SYSTEM_SPLITBUTTON "przycisk rozdzielania" ROLE_SYSTEM_IPADDRESS "adres IP"

1 0

Frédéric Delanoy : cmd: Update French translation .
by Alexandre Julliard June 10, 2010

June 10, 2010

Module: wine Branch: master Commit: f8db2a8ef858d428d671b438323cef7d41252e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8db2a8ef858d428d671b4383… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jun 9 23:04:06 2010 +0200 cmd: Update French translation. --- programs/cmd/Fr.rc | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc index 1f3837c..6ee1e1d 100644 --- a/programs/cmd/Fr.rc +++ b/programs/cmd/Fr.rc @@ -4,6 +4,7 @@ * * Copyright 2003 Sylvain Petreolle * Copyright 2007 Jonathan Ernst + * Copyright 2009-2010 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,7 +30,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { - WCMD_ATTRIB, "Aide d'ATTRIB\n" + WCMD_ATTRIB, "ATTRIB affiche ou modifie les attributs de fichiers DOS.\n" WCMD_CALL, "CALL <fichierbatch> sert à appeler un fichier batch\n\ depuis un autre fichier batch. Quand le fichier batch sort, le contrôle revient\n\ @@ -39,17 +40,18 @@ de la procédure appelée.\n\ Les changements de répertoire courant, de variables d'environnement etc. faits\n\ dans une procédure appelée sont transmis à l'appelant.\n" - WCMD_CD, "Aide de CD\n" - WCMD_CHDIR, "Aide de CHDIR\n" + WCMD_CD, "CD <rép> est la version courte de CHDIR. Elle change le\ +répertoire courant par défaut.\n" + WCMD_CHDIR, "CHDIR <rép> change le répertoire courant par défaut.\n" WCMD_CLS, -"CLS efface l'écran de la console\n" +"CLS efface l'écran de la console.\n" - WCMD_COPY, "Aide de COPY\n" - WCMD_CTTY, "Aide de CTTY\n" - WCMD_DATE, "Aide de DATE\n" - WCMD_DEL, "Aide de DEL\n" - WCMD_DIR, "Aide de DIR\n" + WCMD_COPY, "COPY copie un ou plusieurs fichiers.\n" + WCMD_CTTY, "CTTY change le périphérique d'entrée/sortie.\n" + WCMD_DATE, "DATE affiche ou modifie la date système.\n" + WCMD_DEL, "DEL <fichiers> efface un fichier ou un groupe de fichiers.\n" + WCMD_DIR, "DIR liste le contenu d'un répertoire.\n" WCMD_ECHO, "ECHO <chaîne> affiche <chaîne> sur la console courante.\n\ @@ -61,7 +63,7 @@ ECHO OFF annule l'effet de tout ECHO ON antérieur (ECHO est OFF par\n\ défaut). On peut empêcher l'affichage de ECHO OFF en le faisant\n\ précéder d'un signe @.\n" - WCMD_ERASE, "Aide de ERASE\n" + WCMD_ERASE, "ERASE <fichiers> efface un ou plusieurs fichiers.\n" WCMD_FOR, "La commande FOR sert à exécuter une commande pour chaque fichier d'un groupe de fichiers.\n\ @@ -101,8 +103,8 @@ Syntaxe : LABEL [lecteur:]\n\ La commande demande le nouveau nom de volume pour le lecteur spécifié.\n\ Vous pouvez afficher le nom de volume avec la commande VOL.\n" - WCMD_MD, "Aide de MD\n" - WCMD_MKDIR, "Aide de MKDIR\n" + WCMD_MD, "MD est la version courte de MKDIR. Elle crée un répertoire.\n" + WCMD_MKDIR, "MKDIR <rép> crée un répertoire.\n" WCMD_MOVE, "MOVE déplace un fichier, un groupe de fichiers ou un répertoire\n\ à un autre endroit dans le système de fichiers. Si l'objet déplacé est un répertoire, alors\n\ @@ -150,10 +152,10 @@ L'invite peut aussi être adaptée en modifiant la variable d'environnement\n\ "Une ligne de commande commençant par REM (suivi d'une espace) n'engendre\n\ aucune action, et peut donc servir de commentaire dans un fichier batch.\n" - WCMD_REN, "Aide de REN\n" - WCMD_RENAME, "Aide de RENAME\n" - WCMD_RD, "Aide de RD.\n" - WCMD_RMDIR, "Aide de RMDIR.\n" + WCMD_REN, "REN est la version courte de RENAME. Elle renomme un fichier.\n" + WCMD_RENAME, "RENAME renomme un fichier.\n" + WCMD_RD, "RD est la version courte de RMDIR. Elle efface un répertoire.\n" + WCMD_RMDIR, "RMDIR efface un sous-répertoire.\n" WCMD_SET, "SET affiche ou change les variables d'environnement de cmd.\n\ @@ -178,7 +180,7 @@ n'est pas possible de modifier l'environnement du système d'exploitation dans c liste ; ainsi, le paramètre 2 devient paramètre 1 et ainsi de suite. Il est sans effet\n\ s'il est appelé depuis la ligne de commande.\n" - WCMD_TIME, "Aide de TIME\n" + WCMD_TIME, "TIME règle ou affiche l'heure système courante.\n" WCMD_TITLE, "Définit le titre de la fenêtre pour la session cmd, Syntaxe : TITLE [chaîne]\n"

1 0

Eric Pouech : winhelp: Implemented ExecFile macro.
by Alexandre Julliard June 10, 2010

June 10, 2010

Module: wine Branch: master Commit: d18d25115bf4a17976cea51ded33c022989feacf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18d25115bf4a17976cea51de… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Jun 9 21:22:22 2010 +0200 winhelp: Implemented ExecFile macro. --- programs/winhlp32/macro.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 0e48ca8..cd497ef 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -25,6 +25,7 @@ #include "windows.h" #include "commdlg.h" +#include "shellapi.h" #include "winhelp.h" #include "wine/debug.h" @@ -64,6 +65,9 @@ static WINHELP_BUTTON** MACRO_LookupButton(WINHELP_WINDOW* win, LPCSTR na return b; } +/******* some forward declarations *******/ +static void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id); + /******* real macro implementation *******/ void CALLBACK MACRO_CreateButton(LPCSTR id, LPCSTR name, LPCSTR macro) @@ -352,9 +356,20 @@ static void CALLBACK MACRO_EndMPrint(void) WINE_FIXME("()\n"); } -static void CALLBACK MACRO_ExecFile(LPCSTR str1, LPCSTR str2, LONG u, LPCSTR str3) +static void CALLBACK MACRO_ExecFile(LPCSTR pgm, LPCSTR args, LONG cmd_show, LPCSTR topic) { - WINE_FIXME("(\"%s\", \"%s\", %u, \"%s\")\n", str1, str2, u, str3); + HINSTANCE ret; + + WINE_TRACE("(%s, %s, %u, %s)\n", + wine_dbgstr_a(pgm), wine_dbgstr_a(args), cmd_show, wine_dbgstr_a(topic)); + + ret = ShellExecuteA(Globals.active_win ? Globals.active_win->hMainWnd : NULL, "open", + pgm, args, ".", cmd_show); + if ((DWORD_PTR)ret < 32) + { + WINE_WARN("Failed with %p\n", ret); + if (topic) MACRO_JumpID(NULL, topic); + } } static void CALLBACK MACRO_ExecProgram(LPCSTR str, LONG u)

1 0

Alexandre Julliard : msi: Don' t allow entering text in a scroll text richedit control.
by Alexandre Julliard June 10, 2010

June 10, 2010

Module: wine Branch: master Commit: 04a6a14c1ff47d71b5a1a0edfd98328e121dea0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a6a14c1ff47d71b5a1a0edf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 10 14:48:28 2010 +0200 msi: Don't allow entering text in a scroll text richedit control. --- dlls/msi/dialog.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 1b129e0..e0e27d1 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1010,6 +1010,8 @@ MSIScrollText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) switch( msg ) { + case WM_GETDLGCODE: + return DLGC_WANTARROWS; case WM_NCDESTROY: msi_free( info ); RemovePropW( hWnd, szButtonData );

1 0

Alexandru Băluț : Removed references to obsolete bugzilla keywords: tasklet, tasklist
by Jeremy Newman June 10, 2010

June 10, 2010

Module: website Branch: master Commit: 2ca6afbabf71f16fcfc55fd4d52be6ad5ee42857 URL: http://source.winehq.org/git/website.git/?a=commit;h=2ca6afbabf71f16fcfc55f… Author: Alexandru Băluț <alexandru.balut(a)gmail.com> Date: Thu Jun 10 10:22:11 2010 +0200 Removed references to obsolete bugzilla keywords: tasklet, tasklist --001485eb01d047e1d60488a8b90a Content-Type: text/plain; charset=UTF-8 <br> >From ce608421f31f4db7046aac53448a1a0a7422e49d Mon Sep 17 00:00:00 2001 From: Alex Balut <alexandru.balut(a)gmail.com> Date: Thu, 10 Jun 2010 09:57:25 +0200 Subject: Removed references to obsolete bugzilla keywords: tasklet, tasklist --- templates/de/contributing.template | 64 ------------------------------------ templates/en/contributing.template | 58 -------------------------------- templates/en/status/todo.template | 2 - templates/pt/contributing.template | 28 ---------------- 4 files changed, 0 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=2ca6afbabf71f16fcf…

1 0