wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Eric Pouech : kernel32: Only reset the console mode when it has been previously changed.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: eabe3b34b23fe62f6cfb1552d1e021ef32efcc6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eabe3b34b23fe62f6cfb1552d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Sep 24 21:25:06 2010 +0200 kernel32: Only reset the console mode when it has been previously changed. --- dlls/kernel32/console.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 45e6089..129c4a8 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -230,7 +230,8 @@ static BOOL restore_console_mode(HANDLE hin) int fd; BOOL ret; - if (RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != KERNEL32_CONSOLE_SHELL) + if (!S_termios_raw || + RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != KERNEL32_CONSOLE_SHELL) return TRUE; if ((fd = get_console_bare_fd(hin)) == -1) return FALSE; ret = tcsetattr(fd, TCSANOW, &S_termios) >= 0;

1 0

Lauri Kenttä : shell32: Update Finnish translation.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 1264ec931e999b45a02fc8d833e1f1b3f32b8c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1264ec931e999b45a02fc8d83… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Sep 25 23:40:55 2010 +0300 shell32: Update Finnish translation. --- dlls/shell32/shell32_Fi.rc | 93 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 88 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32_Fi.rc b/dlls/shell32/shell32_Fi.rc index fff38b4..98d9361 100644 --- a/dlls/shell32/shell32_Fi.rc +++ b/dlls/shell32/shell32_Fi.rc @@ -1,5 +1,6 @@ /* * Copyright 2005 Kimmo Myllyvirta + * Copyright 2010 Lauri Kentt� * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -129,6 +130,37 @@ FONT 8, "MS Shell Dlg" 4, 40, 180, 120 } +SHNEWBRSFORFOLDER_MSGBOX DIALOG 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Valitse kansio" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDD_TITLE, 10, 8, 198, 24 + LTEXT "", IDD_STATUS, 10, 25, 198, 12 + LTEXT "Kansio:", IDD_FOLDER, 10, 156, 40, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 12, 38, 194, 105 + EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Luo uusi kansio", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Peruuta", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP +} + +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Viesti" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&Kyll�", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Kyll� k&aikkiin", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ei", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Peruuta", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +} + SHELL_ABOUT_MSGBOX DIALOG 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Tietoja ohjelmasta %s" @@ -174,10 +206,15 @@ STRINGTABLE IDS_SHV_COLUMN11 "Ryhm�" IDS_SHV_COLUMN_DELFROM "Alkuper�inen sijainti" IDS_SHV_COLUMN_DELDATE "Poistoaika" + IDS_SHV_COL_DOCS "Asiakirjat" + IDS_SHV_COL_STATUS "Tila" + IDS_SHV_COL_LOCATION "Sijainti" + IDS_SHV_COL_MODEL "Malli" /* special folders */ IDS_DESKTOP "Ty�p�yt�" IDS_MYCOMPUTER "Oma tietokone" + IDS_RECYCLEBIN_FOLDER_NAME "Roskakori" IDS_CONTROLPANEL "Ohjauspaneeli" /* context menus */ @@ -211,6 +248,12 @@ STRINGTABLE IDS_SHUTDOWN_TITLE "Sammuta" IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine-istunnon?" + /* Run File dialog */ + IDS_RUNDLG_ERROR "Suorita tiedosto -valintaikkunaa ei voida n�ytt�� (sis�inen virhe)" + IDS_RUNDLG_BROWSE_ERROR "Selaa-valintaikkunaa ei voida n�ytt�� (sis�inen virhe)" + IDS_RUNDLG_BROWSE_CAPTION "Selaa" + IDS_RUNDLG_BROWSE_FILTER "Suoritettavat tiedostot\0*.exe\0Kaikki tiedostot\0*.*\0\0" + /* shell folder path default values */ IDS_PROGRAMS "K�ynnist�-valikko\\Ohjelmat" IDS_PERSONAL "Omat tiedostot" @@ -231,18 +274,58 @@ STRINGTABLE IDS_COOKIES "Ev�steet" IDS_HISTORY "Paikalliset asetukset\\Historia" IDS_PROGRAM_FILES "Ohjelmatiedostot" + IDS_PROGRAM_FILESX86 "Ohjelmatiedostot (x86)" IDS_MYPICTURES "Omat kuvatiedostot" IDS_PROGRAM_FILES_COMMON "Ohjelmatiedostot\\Yhteiset tiedostot" - IDS_COMMON_DOCUMENTS "Dokumentit" + IDS_PROGRAM_FILES_COMMONX86 "Ohjelmatiedostot (x86)\\Yhteiset tiedostot" + IDS_COMMON_DOCUMENTS "Tiedostot" IDS_ADMINTOOLS "K�ynnist�-valikko\\Ohjelmat\\Hallintaty�kalut" - IDS_COMMON_MUSIC "Dokumentit\\Omat musiikkitiedostot" - IDS_COMMON_PICTURES "Dokumentit\\Omat kuvatiedostot" - IDS_COMMON_VIDEO "Dokumentit\\Omat videotiedostot" + IDS_COMMON_MUSIC "Musiikki" + IDS_COMMON_PICTURES "Kuvat" + IDS_COMMON_VIDEO "Videot" IDS_CDBURN_AREA "Paikalliset asetukset\\Ohjelmien tiedot\\Microsoft\\CD Burning" + IDS_CONTACTS "Kontaktit" + IDS_LINKS "Linkit" + IDS_PHOTO_ALBUMS "Kuvat\\Diaesitykset" + IDS_PLAYLISTS "Musiikki\\Soittolistat" + IDS_PUBLIC_DOWNLOADS "Lataukset" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Libraries" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Soitto��net" + IDS_SAMPLE_MUSIC "Musiikki\\Esimerkkimusiikki" + IDS_SAMPLE_PICTURES "Kuvat\\Esimerkkikuvat" + IDS_SAMPLE_PLAYLISTS "Musiikki\\Esimerkkisoittolistat" + IDS_SAMPLE_VIDEOS "Videot\\Esimerkkivideot" + IDS_SAVED_GAMES "Tallennetut pelit" + IDS_SAVED_SEARCHES "Haut" + IDS_USER_PROFILES "K�ytt�j�t" + IDS_COMMON_OEM_LINKS "OEM Links" + IDS_DOCUMENTS "Tiedostot" + IDS_DOWNLOADS "Lataukset" + IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow" - IDS_NEWFOLDER "Uusi hakemisto" + IDS_NEWFOLDER "Uusi kansio" IDS_CPANEL_TITLE "Winen Ohjauspaneeli" IDS_CPANEL_NAME "Nimi" IDS_CPANEL_DESCRIPTION "Kuvaus" + + IDS_SHLEXEC_NOASSOC "T�m�n tiedostotyypin avaamiseen ei ole kytketty mit��n Windows-ohjelmaa." +} + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "Winen lisenssi" +IDS_LICENSE, +"Wine 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.\n\n\ +Wine 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.\n\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with Wine; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." }

1 0

Lauri Kenttä : comdlg32: Update Finnish translation.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 488e2bbcaf4bb503d49565dd83578a6842be2851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=488e2bbcaf4bb503d49565dd8… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Sep 24 21:57:04 2010 +0300 comdlg32: Update Finnish translation. --- dlls/comdlg32/cdlg_Fi.rc | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/comdlg32/cdlg_Fi.rc b/dlls/comdlg32/cdlg_Fi.rc index 19f61a9..e5ea674 100644 --- a/dlls/comdlg32/cdlg_Fi.rc +++ b/dlls/comdlg32/cdlg_Fi.rc @@ -136,7 +136,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "OK",IDOK,218,6,40,14,WS_GROUP PUSHBUTTON "Peruuta", IDCANCEL,218,23,40,14,WS_GROUP PUSHBUTTON "&Ota k�ytt��n", psh3,218,40,40,14,WS_GROUP - PUSHBUTTON "&Ohje" , pshHelp,218,57,40,14,WS_GROUP + PUSHBUTTON "O&hje" , pshHelp,218,57,40,14,WS_GROUP GROUPBOX "Efektit", grp1,6,72,84,34,WS_GROUP CHECKBOX "Yli&viivattu", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "A&lleviivattu", chx2, 10,94,50,10, BS_AUTOCHECKBOX @@ -145,7 +145,7 @@ FONT 8, "MS Shell Dlg" CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "N�yte",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 + LTEXT "Merk&ist�:",stc7 ,98,114,80,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -354,14 +354,14 @@ FONT 8, "MS Shell Dlg" STRINGTABLE { - IDS_ABOUTBOX "&Tietoja FolderPicker Test:st�" + IDS_ABOUTBOX "&Tietoja FolderPicker-testist�" IDS_DOCUMENTFOLDERS "Dokumenttikansiot" - IDS_PERSONAL "Omat Dokumentit" + IDS_PERSONAL "Omat tiedostot" IDS_FAVORITES "Suosikit" IDS_PATH "J�rjestelm�kansio" IDS_DESKTOP "Ty�p�yt�" IDS_FONTS "Fontit" - IDS_MYCOMPUTER "Oma Tietokone" + IDS_MYCOMPUTER "Oma tietokone" } STRINGTABLE @@ -370,7 +370,7 @@ STRINGTABLE IDS_LOCALHARDRIVES "Paikalliset kiintolevyt" IDS_FILENOTFOUND "Tiedostoa ei l�ydy" IDS_VERIFYFILE "Varmista, ett� tiedoston nimi on oikein" - IDS_CREATEFILE "Tiedostoa ei ole olemassa\nHaluatko luoda tiedoston" + IDS_CREATEFILE "Tiedostoa ei ole olemassa.\nHaluatko luoda sen?" IDS_OVERWRITEFILE "Tiedosto on jo olemassa.\nHaluatko ylikirjoitaa sen?" IDS_INVALID_FILENAME_TITLE "Kansio sis�lt�� ep�kelpoja merkkej�" IDS_INVALID_FILENAME "Tiedoston nimi ei voi sis�lt�� n�it� merkkej�:\n / : < > |" @@ -380,11 +380,11 @@ STRINGTABLE STRINGTABLE { - IDS_UPFOLDER "Kansio Yl�sp�in" - IDS_NEWFOLDER "Luo Uusi Kansio" + IDS_UPFOLDER "Ylempi kansio" + IDS_NEWFOLDER "Luo uusi kansio" IDS_LISTVIEW "Lista" IDS_REPORTVIEW "Tiedot" - IDS_TODESKTOP "Selaa Ty�p�yt��" + IDS_TODESKTOP "Ty�p�yt�" } STRINGTABLE @@ -403,14 +403,13 @@ STRINGTABLE PD32_OUT_OF_MEMORY "Muisti loppu." PD32_GENERIC_ERROR "Virhe." PD32_DRIVER_UNKNOWN "Tuntematon tulostinajuri." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "Jotta voisit k�ytt�� tulostimia tai muokata niiden asetuksia, \ +sinun t�ytyy ensin asentaa jokin tulostin." PD32_DEFAULT_PRINTER "Oletustulostin; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Jonossa on %d dokumenttia" - PD32_MARGINS_IN_INCHES "Marginaalit [inches]" - PD32_MARGINS_IN_MILLIMETERS "Marginaalit [mm]" + PD32_MARGINS_IN_INCHES "Marginaalit (tuumina)" + PD32_MARGINS_IN_MILLIMETERS "Marginaalit (mm)" PD32_MILLIMETERS "mm" PD32_PRINTER_STATUS_READY "Valmis" @@ -422,17 +421,17 @@ Please install one and retry." PD32_PRINTER_STATUS_MANUAL_FEED "Sy�t� paperi k�sin; " PD32_PRINTER_STATUS_PAPER_PROBLEM "Ongelma paperin kanssa; " PD32_PRINTER_STATUS_OFFLINE "Ei yhteytt� tulostimeen; " - PD32_PRINTER_STATUS_IO_ACTIVE "I/O Toiminnassa; " + PD32_PRINTER_STATUS_IO_ACTIVE "Tiedonsiirto meneill��n; " PD32_PRINTER_STATUS_BUSY "Varattu; " PD32_PRINTER_STATUS_PRINTING "Tulostaa; " - PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Paperin luovutustaso on t�ynn�; " PD32_PRINTER_STATUS_NOT_AVAILABLE "Ei saatavilla; " PD32_PRINTER_STATUS_WAITING "Odottaa; " PD32_PRINTER_STATUS_PROCESSING "K�sitell��n; " PD32_PRINTER_STATUS_INITIALIZING "Alustetaan; " PD32_PRINTER_STATUS_WARMING_UP "L�mmitet��n; " PD32_PRINTER_STATUS_TONER_LOW "V�riaine v�hiss�; " - PD32_PRINTER_STATUS_NO_TONER "Ei v�ri�ainetta; " + PD32_PRINTER_STATUS_NO_TONER "Ei v�riainetta; " PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " PD32_PRINTER_STATUS_USER_INTERVENTION "K�ytt�j�n keskeytt�m�; " PD32_PRINTER_STATUS_OUT_OF_MEMORY "Muisti loppu; " @@ -468,5 +467,5 @@ STRINGTABLE IDS_SAVE_IN "&Kansioon:" IDS_SAVE "Tallenna" IDS_SAVE_AS "Tallenna nimell�" - IDS_OPEN_FILE "Avaa Tiedosto" + IDS_OPEN_FILE "Avaa tiedosto" }

1 0

Alexandre Julliard : configure: Support specifying a .rules. in file as dependency.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 9dd743fddc67d57ba4b087ebf093e3940548d2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd743fddc67d57ba4b087ebf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 25 12:19:31 2010 +0200 configure: Support specifying a .rules.in file as dependency. --- aclocal.m4 | 14 ++++++++++---- configure | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f9abe4c..021159d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -166,11 +166,17 @@ wine_fn_all_dir_rules () { ac_dir=$[1] ac_alldeps=$[2] + ac_makedep="\$(MAKEDEP)" + ac_input=Make.vars.in:$ac_dir/Makefile.in if test $ac_dir != tools then dnl makedep is in tools so tools makefile cannot depend on it - ac_alldeps="$[2] \$(MAKEDEP)" + ac_alldeps="$[2] $ac_makedep" fi + case $[2] in + *.in) ac_input=$ac_input:$[2] ;; + *) ac_makedep="$[2] $ac_makedep" ;; + esac wine_fn_append_file ALL_DIRS $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ @@ -180,11 +186,11 @@ $ac_dir/__clean__: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) clean \$(RM) $ac_dir/Makefile $ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend + @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend depend: $ac_dir/__depend__ .PHONY: $ac_dir/__depend__ -$ac_dir/__depend__: $[2] \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend" +$ac_dir/__depend__: $ac_makedep dummy + @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend" } wine_fn_config_makefile () diff --git a/configure b/configure index 36807fc..f1f9435 100755 --- a/configure +++ b/configure @@ -14127,10 +14127,16 @@ wine_fn_all_dir_rules () { ac_dir=$1 ac_alldeps=$2 + ac_makedep="\$(MAKEDEP)" + ac_input=Make.vars.in:$ac_dir/Makefile.in if test $ac_dir != tools then - ac_alldeps="$2 \$(MAKEDEP)" + ac_alldeps="$2 $ac_makedep" fi + case $2 in + *.in) ac_input=$ac_input:$2 ;; + *) ac_makedep="$2 $ac_makedep" ;; + esac wine_fn_append_file ALL_DIRS $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ @@ -14140,11 +14146,11 @@ $ac_dir/__clean__: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) clean \$(RM) $ac_dir/Makefile $ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend + @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend depend: $ac_dir/__depend__ .PHONY: $ac_dir/__depend__ -$ac_dir/__depend__: $2 \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && cd $ac_dir && \$(MAKE) depend" +$ac_dir/__depend__: $ac_makedep dummy + @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend" } wine_fn_config_makefile ()

1 0

Alexandre Julliard : configure: Make the ac_dir variable contain the full directory name for all types of make rules .
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 52c9e85b198e13e8ce95c25d797d4595960c0e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c9e85b198e13e8ce95c25d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 25 12:01:14 2010 +0200 configure: Make the ac_dir variable contain the full directory name for all types of make rules. --- aclocal.m4 | 123 ++++++++++++++++++++++++++++++----------------------------- configure | 123 ++++++++++++++++++++++++++++++----------------------------- 2 files changed, 126 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52c9e85b198e13e8ce95c…

1 0

Alexandre Julliard : configure: Automatically append the makedep dependency to all makefile rules.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: c57aa38e862cf6b3cc3a88816237a46e594ae390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c57aa38e862cf6b3cc3a88816… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 25 11:56:33 2010 +0200 configure: Automatically append the makedep dependency to all makefile rules. --- aclocal.m4 | 29 +++++++++++++++-------------- configure | 27 ++++++++++++++------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index af6b03c..539c397 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -164,6 +164,13 @@ wine_fn_append_rule () wine_fn_all_dir_rules () { + ac_makedep="" + if test "$[1]" != tools + then + dnl makedep is in tools so tools makefile cannot depend on it + ac_makedep=" \$(MAKEDEP)" + fi + wine_fn_append_file ALL_DIRS $[1] wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__clean__: $[1]/__clean__ @@ -171,11 +178,11 @@ wine_fn_all_dir_rules () $[1]/__clean__: $[1]/Makefile @cd $[1] && \$(MAKE) clean \$(RM) $[1]/Makefile -$[1]/Makefile: $[1]/Makefile.in Make.vars.in config.status $[2] +$[1]/Makefile: $[1]/Makefile.in Make.vars.in config.status $[2]$ac_makedep @./config.status --file $[1]/Makefile:Make.vars.in:$[1]/Makefile.in && cd $[1] && \$(MAKE) depend depend: $[1]/__depend__ .PHONY: $[1]/__depend__ -$[1]/__depend__: $[2] dummy +$[1]/__depend__: $[2] \$(MAKEDEP) dummy @./config.status --file $[1]/Makefile:Make.vars.in:$[1]/Makefile.in && cd $[1] && \$(MAKE) depend" } @@ -185,7 +192,7 @@ wine_fn_config_makefile () ac_enable=$[2] AS_VAR_IF([$ac_enable],[no],[return 0]) - wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" + wine_fn_all_dir_rules $ac_dir Make.rules wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: $ac_dir .PHONY: $ac_dir @@ -205,7 +212,7 @@ wine_fn_config_lib () { ac_name=$[1] ac_dir=dlls/$ac_name - wine_fn_all_dir_rules $ac_dir "dlls/Makeimplib.rules \$(MAKEDEP)" + wine_fn_all_dir_rules $ac_dir dlls/Makeimplib.rules wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all __builddeps__: $ac_dir $ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy @@ -230,7 +237,7 @@ wine_fn_config_dll () *16) ac_implibflags=" -m16" ;; esac - wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)" + wine_fn_all_dir_rules dlls/$ac_dir dlls/Makedll.rules AS_VAR_IF([$ac_enable],[no], dnl enable_win16 is special in that it disables import libs too @@ -308,7 +315,7 @@ wine_fn_config_program () ac_dir=$[1] ac_enable=$[2] ac_install=$[3] - wine_fn_all_dir_rules programs/$ac_dir "programs/Makeprog.rules \$(MAKEDEP)" + wine_fn_all_dir_rules programs/$ac_dir programs/Makeprog.rules AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: programs/$ac_dir @@ -343,7 +350,7 @@ wine_fn_config_test () $ac_name.rc: echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" >\$[@] || (\$(RM) \$[@] && false) $ac_name.res: $ac_name.rc $ac_name.exe" - wine_fn_all_dir_rules $ac_dir "Maketest.rules \$(MAKEDEP)" + wine_fn_all_dir_rules $ac_dir Maketest.rules AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all programs/winetest: $ac_dir @@ -370,13 +377,7 @@ $ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy wine_fn_config_tool () { ac_dir=$[1] - ac_deps="Make.rules" - if test "$ac_dir" != tools - then - dnl makedep is in tools so tools makefile cannot depend on it - ac_deps="$ac_deps \$(MAKEDEP)" - fi - wine_fn_all_dir_rules $ac_dir "$ac_deps" + wine_fn_all_dir_rules $ac_dir Make.rules AS_VAR_IF([enable_tools],[no],,[case $ac_dir in dnl tools directory has both install-lib and install-dev diff --git a/configure b/configure index 4937577..0035834 100755 --- a/configure +++ b/configure @@ -14125,6 +14125,12 @@ wine_fn_append_rule () wine_fn_all_dir_rules () { + ac_makedep="" + if test "$1" != tools + then + ac_makedep=" \$(MAKEDEP)" + fi + wine_fn_append_file ALL_DIRS $1 wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__clean__: $1/__clean__ @@ -14132,11 +14138,11 @@ wine_fn_all_dir_rules () $1/__clean__: $1/Makefile @cd $1 && \$(MAKE) clean \$(RM) $1/Makefile -$1/Makefile: $1/Makefile.in Make.vars.in config.status $2 +$1/Makefile: $1/Makefile.in Make.vars.in config.status $2$ac_makedep @./config.status --file $1/Makefile:Make.vars.in:$1/Makefile.in && cd $1 && \$(MAKE) depend depend: $1/__depend__ .PHONY: $1/__depend__ -$1/__depend__: $2 dummy +$1/__depend__: $2 \$(MAKEDEP) dummy @./config.status --file $1/Makefile:Make.vars.in:$1/Makefile.in && cd $1 && \$(MAKE) depend" } @@ -14148,7 +14154,7 @@ wine_fn_config_makefile () return 0 fi - wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" + wine_fn_all_dir_rules $ac_dir Make.rules wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: $ac_dir .PHONY: $ac_dir @@ -14168,7 +14174,7 @@ wine_fn_config_lib () { ac_name=$1 ac_dir=dlls/$ac_name - wine_fn_all_dir_rules $ac_dir "dlls/Makeimplib.rules \$(MAKEDEP)" + wine_fn_all_dir_rules $ac_dir dlls/Makeimplib.rules wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all __builddeps__: $ac_dir $ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy @@ -14193,7 +14199,7 @@ wine_fn_config_dll () *16) ac_implibflags=" -m16" ;; esac - wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)" + wine_fn_all_dir_rules dlls/$ac_dir dlls/Makedll.rules if eval test \"x\$"$ac_enable"\" = x"no"; then : test "$ac_enable" != enable_win16 || return 0 @@ -14272,7 +14278,7 @@ wine_fn_config_program () ac_dir=$1 ac_enable=$2 ac_install=$3 - wine_fn_all_dir_rules programs/$ac_dir "programs/Makeprog.rules \$(MAKEDEP)" + wine_fn_all_dir_rules programs/$ac_dir programs/Makeprog.rules if eval test \"x\$"$ac_enable"\" = x"no"; then : @@ -14311,7 +14317,7 @@ wine_fn_config_test () $ac_name.rc: echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" >\$@ || (\$(RM) \$@ && false) $ac_name.res: $ac_name.rc $ac_name.exe" - wine_fn_all_dir_rules $ac_dir "Maketest.rules \$(MAKEDEP)" + wine_fn_all_dir_rules $ac_dir Maketest.rules if test "x$enable_tests" = x""no; then : @@ -14342,12 +14348,7 @@ fi wine_fn_config_tool () { ac_dir=$1 - ac_deps="Make.rules" - if test "$ac_dir" != tools - then - ac_deps="$ac_deps \$(MAKEDEP)" - fi - wine_fn_all_dir_rules $ac_dir "$ac_deps" + wine_fn_all_dir_rules $ac_dir Make.rules if test "x$enable_tools" = x""no; then :

1 0

Lauri Kenttä : msi: Update Finnish translation.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 57a64040e3108e8b628d0843c094089b59c56dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a64040e3108e8b628d0843c… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Sep 24 19:17:33 2010 +0300 msi: Update Finnish translation. --- dlls/msi/msi_Fi.rc | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/msi/msi_Fi.rc b/dlls/msi/msi_Fi.rc index 7769a8a..8984172 100644 --- a/dlls/msi/msi_Fi.rc +++ b/dlls/msi/msi_Fi.rc @@ -24,39 +24,39 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." + 4 "Annettua asennuspakettia ei voitu avata. Tarkista tiedoston polku ja yrit� uudelleen." 5 "Polkua %s ei l�ydy." 9 "Anna levy %s" 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ + "K�ytt�:\n" \ + "msiexec komento {pakollinen parametri} [valinnainen parametri]\n\n" \ + "Asenna tuote:\n" \ + "\t/i {paketti|tuotekoodi} [ominaisuus]\n" \ + "\t/package {paketti|tuotekoodi} [ominaisuus]\n" \ + "\t/a {paketti} [ominaisuus]\n" \ + "Korjaa asennus:\n" \ + "\t/f[p|o|e|d|c|a|u|m|s|v] {paketti|tuotekoodi}\n" \ + "Poista tuote:\n" \ + "\t/uninstall {paketti|tuotekoodi} [ominaisuus]\n" \ + "\t/x {paketti|tuotekoodi} [ominaisuus]\n" \ + "Mainosta (advertise) tuotetta:\n" \ + "\t/j[u|m] paketti [/t muunnos] [/g kielitunnus]\n" \ + "Asenna korjaus:\n" \ + "\t/p korjauspaketti [ominaisuus]\n" \ + "\t/p korjauspaketti /a paketti [ominaisuus]\n" \ + "Loki- ja k�ytt�liittym�asetukset edellisille komennoille:\n" \ + "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] lokitiedosto\n" \ "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ + "Rekister�i MSI-palvelu:\n" \ "\t/y\n" \ - "Unregister MSI Service:\n" \ + "Peru MSI-palvelun rekister�inti:\n" \ "\t/z\n" \ - "Display this help:\n" \ + "N�yt� t�m� ohje:\n" \ "\t/help\n" \ "\t/?\n" - 11 "Anna kansio, joka sis�lt�� %s" + 11 "Anna kansio, jossa on %s" 12 "Ominaisuuden asennusl�hde puuttuu." 13 "Ominaisuuden verkkolevy puuttuu." 14 "Ominaisuus:" - 15 "Valitse kansio, joka sis�lt�� %s" + 15 "Valitse kansio, jossa on %s" }

1 0

Lauri Kenttä : shlwapi: Update Finnish translation.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 842c5693cf8ab56d0b57eaa5d08fdf8726b5ce42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=842c5693cf8ab56d0b57eaa5d… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Sep 24 18:41:49 2010 +0300 shlwapi: Update Finnish translation. --- dlls/shlwapi/shlwapi_Fi.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/shlwapi_Fi.rc b/dlls/shlwapi/shlwapi_Fi.rc index 13dff2c..a18326d 100644 --- a/dlls/shlwapi/shlwapi_Fi.rc +++ b/dlls/shlwapi/shlwapi_Fi.rc @@ -38,8 +38,8 @@ FONT 8, "MS Shell Dlg" STRINGTABLE { - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" + IDS_BYTES_FORMAT "%ld tavua" + IDS_TIME_INTERVAL_HOURS " h" IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" + IDS_TIME_INTERVAL_SECONDS " s" }

1 0

Lauri Kenttä : wininet: Update Finnish translation.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 93b5779b30cceb78afb9784b74344ba49b3e97e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b5779b30cceb78afb9784b7… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Sep 24 19:15:49 2010 +0300 wininet: Update Finnish translation. --- dlls/wininet/wininet_Fi.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/wininet_Fi.rc b/dlls/wininet/wininet_Fi.rc index 1300064..1738329 100644 --- a/dlls/wininet/wininet_Fi.rc +++ b/dlls/wininet/wininet_Fi.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Anna Verkon Salasana" +CAPTION "Anna verkon salasana" FONT 8, "MS Shell Dlg" { LTEXT "Anna k�ytt�j�n nimi ja salasana:", -1, 40, 6, 150, 15

1 0

Hans Leidekker : msi: Set some missing system folder properties.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: cce01d98e77751fd61cd3e797329dd8913c85b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce01d98e77751fd61cd3e797… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 24 17:09:38 2010 +0200 msi: Set some missing system folder properties. --- dlls/msi/package.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 9ca344a..749018c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -711,6 +711,9 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szSystemLangID[] = {'S','y','s','t','e','m','L','a','n','g','u','a','g','e','I','D',0}; static const WCHAR szProductState[] = {'P','r','o','d','u','c','t','S','t','a','t','e',0}; static const WCHAR szLogonUser[] = {'L','o','g','o','n','U','s','e','r',0}; + static const WCHAR szNetHoodFolder[] = {'N','e','t','H','o','o','d','F','o','l','d','e','r',0}; + static const WCHAR szPrintHoodFolder[] = {'P','r','i','n','t','H','o','o','d','F','o','l','d','e','r',0}; + static const WCHAR szRecentFolder[] = {'R','e','c','e','n','t','F','o','l','d','e','r',0}; /* * Other things that probably should be set: @@ -761,6 +764,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) strcatW(pth, szBackSlash); msi_set_property(package->db, DF, pth); + /* FIXME: set to AllUsers profile path if ALLUSERS is set */ SHGetFolderPathW(NULL,CSIDL_PROGRAMS,NULL,0,pth); strcatW(pth, szBackSlash); msi_set_property(package->db, PMF, pth); @@ -794,6 +798,18 @@ static VOID set_installer_properties(MSIPACKAGE *package) strcatW(pth, szBackSlash); msi_set_property(package->db, WF, pth); + SHGetFolderPathW(NULL, CSIDL_PRINTHOOD, NULL, 0, pth); + strcatW(pth, szBackSlash); + msi_set_property(package->db, szPrintHoodFolder, pth); + + SHGetFolderPathW(NULL, CSIDL_NETHOOD, NULL, 0, pth); + strcatW(pth, szBackSlash); + msi_set_property(package->db, szNetHoodFolder, pth); + + SHGetFolderPathW(NULL, CSIDL_RECENT, NULL, 0, pth); + strcatW(pth, szBackSlash); + msi_set_property(package->db, szRecentFolder, pth); + /* Physical Memory is specified in MB. Using total amount. */ msex.dwLength = sizeof(msex); GlobalMemoryStatusEx( &msex );

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
86
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 September 2010