September 2010 - Wine-Commits

Eric Pouech : kernel32: Only reset the console mode when it has been previously changed.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

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

Juan Lang : ws2_32: Unpack ioctl codes in WSAIoctl trace.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 1e0999935011122cbac21b201038ffb58d27c904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0999935011122cbac21b201… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 24 14:20:14 2010 -0700 ws2_32: Unpack ioctl codes in WSAIoctl trace. --- dlls/ws2_32/socket.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 78 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6d25881..a4380aa 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2839,6 +2839,82 @@ char* WINAPI WS_inet_ntoa(struct WS_in_addr in) return NULL; } +static const char *debugstr_wsaioctl(DWORD ioctl) +{ + switch(ioctl & 0x18000000) + { + case WS_IOC_UNIX: + { + BYTE size = (ioctl >> 16) & WS_IOCPARM_MASK; + char x = (ioctl & 0xff00) >> 8; + BYTE y = ioctl & 0xff; + const char *buf_type; + char args[14]; + + switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT)) + { + case WS_IOC_VOID: + buf_type = "_IO"; + sprintf(args, "%d, %d", x, y); + break; + case WS_IOC_IN: + buf_type = "_IOW"; + sprintf(args, "'%c', %d, %d", x, y, size); + break; + case WS_IOC_OUT: + buf_type = "_IOR"; + sprintf(args, "'%c', %d, %d", x, y, size); + break; + default: + buf_type = "?"; + sprintf(args, "'%c', %d, %d", x, y, size); + break; + } + return wine_dbg_sprintf("%s(%s)", buf_type, args); + } + default: + { + USHORT code = ioctl & 0xffff; + const char *family, *buf_type; + + /* This switch looks redundant, but isn't: the case WS_IOC_UNIX + * is handled differently than all others. + */ + switch(ioctl & 0x18000000) + { + case WS_IOC_WS2: + family = "IOC_WS2"; + break; + case WS_IOC_PROTOCOL: + family = "IOC_PROTOCOL"; + break; + case WS_IOC_VENDOR: + family = "IOC_VENDOR"; + break; + } + switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT)) + { + case WS_IOC_VOID: + buf_type = "_WSAIO"; + break; + case WS_IOC_INOUT: + buf_type = "_WSAIORW"; + break; + case WS_IOC_IN: + buf_type = "_WSAIOW"; + break; + case WS_IOC_OUT: + buf_type = "_WSAIOR"; + break; + default: + buf_type = "?"; + break; + } + return wine_dbg_sprintf("%s(%s, %d)", buf_type, family, code); + } + } +} + /********************************************************************** * WSAIoctl (WS2_32.50) * @@ -3185,7 +3261,8 @@ INT WINAPI WSAIoctl(SOCKET s, FIXME("WS_SIO_UDP_CONNRESET stub\n"); break; default: - FIXME("unsupported WS_IOCTL cmd (%08x)\n", dwIoControlCode); + FIXME("unsupported WS_IOCTL cmd (%s)\n", + debugstr_wsaioctl(dwIoControlCode)); WSASetLastError(WSAEOPNOTSUPP); return SOCKET_ERROR; }

1 0

Anders Jonsson : oleacc: Add Swedish translation.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: b342744da8619beed4947388c08c14a114b69b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b342744da8619beed4947388c… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Sep 26 22:08:58 2010 +0200 oleacc: Add Swedish translation. --- dlls/oleacc/Makefile.in | 1 + dlls/oleacc/oleacc_Sv.rc | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index a9c01bc..3dce51c 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -19,6 +19,7 @@ RC_SRCS = \ oleacc_Pt.rc \ oleacc_Ro.rc \ oleacc_Si.rc \ + oleacc_Sv.rc \ oleacc_Uk.rc @MAKE_DLL_RULES@ diff --git a/dlls/oleacc/oleacc_Sv.rc b/dlls/oleacc/oleacc_Sv.rc new file mode 100644 index 0000000..24f3747 --- /dev/null +++ b/dlls/oleacc/oleacc_Sv.rc @@ -0,0 +1,94 @@ +/* + * Swedish resources for oleacc + * + * Copyright 2010 Anders Jonsson + * + * 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 "oleacc.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + 0 "okänt objekt" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "titelrad" + ROLE_SYSTEM_MENUBAR "menyrad" + ROLE_SYSTEM_SCROLLBAR "rullningslist" + ROLE_SYSTEM_GRIP "grepp" + ROLE_SYSTEM_SOUND "ljud" + ROLE_SYSTEM_CURSOR "muspekare" + ROLE_SYSTEM_CARET "markör" + ROLE_SYSTEM_ALERT "varning" + ROLE_SYSTEM_WINDOW "fönster" + ROLE_SYSTEM_CLIENT "klient" + ROLE_SYSTEM_MENUPOPUP "popupmeny" + ROLE_SYSTEM_MENUITEM "menypost" + ROLE_SYSTEM_TOOLTIP "tooltip" + ROLE_SYSTEM_APPLICATION "program" + ROLE_SYSTEM_DOCUMENT "dokument" + ROLE_SYSTEM_PANE "ruta" + ROLE_SYSTEM_CHART "diagram" + ROLE_SYSTEM_DIALOG "dialog" + ROLE_SYSTEM_BORDER "kant" + ROLE_SYSTEM_GROUPING "gruppering" + ROLE_SYSTEM_SEPARATOR "avskiljare" + ROLE_SYSTEM_TOOLBAR "verktygsrad" + ROLE_SYSTEM_STATUSBAR "statusrad" + ROLE_SYSTEM_TABLE "tabell" + ROLE_SYSTEM_COLUMNHEADER "kolumnhuvud" + ROLE_SYSTEM_ROWHEADER "radhuvud" + ROLE_SYSTEM_COLUMN "kolumn" + ROLE_SYSTEM_ROW "rad" + ROLE_SYSTEM_CELL "cell" + ROLE_SYSTEM_LINK "länk" + ROLE_SYSTEM_HELPBALLOON "hjälpballong" + ROLE_SYSTEM_CHARACTER "tecken" + ROLE_SYSTEM_LIST "lista" + ROLE_SYSTEM_LISTITEM "listelement" + ROLE_SYSTEM_OUTLINE "disposition" + ROLE_SYSTEM_OUTLINEITEM "dispositionspost" + ROLE_SYSTEM_PAGETAB "bladflik" + ROLE_SYSTEM_PROPERTYPAGE "egenskapssida" + ROLE_SYSTEM_INDICATOR "indikator" + ROLE_SYSTEM_GRAPHIC "grafik" + ROLE_SYSTEM_STATICTEXT "statisk text" + ROLE_SYSTEM_TEXT "text" + ROLE_SYSTEM_PUSHBUTTON "tryckknapp" + ROLE_SYSTEM_CHECKBUTTON "markeringsknapp" + ROLE_SYSTEM_RADIOBUTTON "envalsknapp" + ROLE_SYSTEM_COMBOBOX "kombinationsruta" + ROLE_SYSTEM_DROPLIST "listruta" + ROLE_SYSTEM_PROGRESSBAR "förloppsmätare" + ROLE_SYSTEM_DIAL "mätare" + ROLE_SYSTEM_HOTKEYFIELD "snabbknappsfält" + ROLE_SYSTEM_SLIDER "glidreglage" + ROLE_SYSTEM_SPINBUTTON "snurrknapp" + ROLE_SYSTEM_DIAGRAM "diagram" + ROLE_SYSTEM_ANIMATION "animation" + ROLE_SYSTEM_EQUATION "ekvation" + ROLE_SYSTEM_BUTTONDROPDOWN "listruteknapp" + ROLE_SYSTEM_BUTTONMENU "menyknapp" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "listruteknapp (rutnät)" + ROLE_SYSTEM_WHITESPACE "blanktecken" + ROLE_SYSTEM_PAGETABLIST "bladflikslista" + ROLE_SYSTEM_CLOCK "klocka" + ROLE_SYSTEM_SPLITBUTTON "delad knapp" + ROLE_SYSTEM_IPADDRESS "IP-adress" + ROLE_SYSTEM_OUTLINEBUTTON "dispositionsknapp" +}

1 0

Lauri Kenttä : comdlg32: Update Finnish translation.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

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: Automatically append the makedep dependency to all makefile rules.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

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

Alexandre Julliard : configure: Make the ac_dir variable contain the full directory name for all types of make rules .
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

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

Lauri Kenttä : msi: Update Finnish translation.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

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

Hans Leidekker : msi: Avoid accessing memory before the left hand string in compare_substring.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

Module: wine Branch: master Commit: e58a67e9cd19bc1aef646e8f3fadaf0c490b38de URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58a67e9cd19bc1aef646e8f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 24 17:09:04 2010 +0200 msi: Avoid accessing memory before the left hand string in compare_substring. --- dlls/msi/cond.y | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 9a7a16d..03ea493 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -462,11 +462,21 @@ static INT compare_substring( LPCWSTR a, INT operator, LPCWSTR b ) case COND_LHS: return 0 == strncmpW( a, b, lstrlenW( b ) ); case COND_RHS: - return 0 == lstrcmpW( a + (lstrlenW( a ) - lstrlenW( b )), b ); + { + int l = lstrlenW( a ); + int r = lstrlenW( b ); + if (r > l) return 0; + return 0 == lstrcmpW( a + (l - r), b ); + } case COND_ILHS: return 0 == strncmpiW( a, b, lstrlenW( b ) ); case COND_IRHS: - return 0 == lstrcmpiW( a + (lstrlenW( a ) - lstrlenW( b )), b ); + { + int l = lstrlenW( a ); + int r = lstrlenW( b ); + if (r > l) return 0; + return 0 == lstrcmpiW( a + (l - r), b ); + } default: ERR("invalid substring operator\n"); return 0;

1 0

Hans Leidekker : msi: Set some missing system folder properties.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

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

Lauri Kenttä : shlwapi: Update Finnish translation.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

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