September 2010 - Wine-commits

Alasdair Sinclair : shell32/test: Prevent crash on cleanup if tests fail.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: e3788512ad888c1da48e469aa6a424d998bfacbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3788512ad888c1da48e469aa… Author: Alasdair Sinclair <alasdairsinc(a)gmail.com> Date: Sat Sep 25 23:14:44 2010 +0100 shell32/test: Prevent crash on cleanup if tests fail. --- dlls/shell32/tests/shlfolder.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 639b092..5ddb973 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2549,7 +2549,7 @@ static void test_SHGetItemFromDataObject(void) static void test_ShellItemCompare(void) { IShellItem *psi[9]; /* a\a, a\b, a\c, b\a, .. */ - IShellItem *psi_a, *psi_b, *psi_c; + IShellItem *psi_a = NULL, *psi_b = NULL, *psi_c = NULL; IShellFolder *psf_desktop, *psf_current; LPITEMIDLIST pidl_cwd; WCHAR curdirW[MAX_PATH]; @@ -2620,7 +2620,6 @@ static void test_ShellItemCompare(void) } /* Generate ShellItems for the folders */ - psi_a = psi_b = psi_c = NULL; hr = IShellItem_GetParent(psi[0], &psi_a); ok(hr == S_OK, "Got 0x%08x\n", hr); if(FAILED(hr)) failed = TRUE;

1 0

Rico Schüller : dxgi: Fix IWineD3DSwapChain_GetParent( ) call.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 4a3da6e1900d380890802b2101b203673e2a963e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3da6e1900d380890802b210… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Sep 26 09:47:59 2010 +0200 dxgi: Fix IWineD3DSwapChain_GetParent() call. --- dlls/dxgi/factory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index fb47364..6b0a681 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -235,7 +235,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory * return hr; } - swapchain = IWineD3DSwapChain_GetParent(wined3d_swapchain); + *swapchain = IWineD3DSwapChain_GetParent(wined3d_swapchain); IUnknown_Release(wined3d_swapchain); /* FIXME? The swapchain is created with refcount 1 by the wined3d device,

1 0

Anders Jonsson : oleacc: Add Swedish translation.
by Alexandre Julliard 27 Sep '10

27 Sep '10

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

Igor Paliychuk : taskkill: Added Ukrainian translation.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 30b09071474d954636d9909208d64f5ff9889c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b09071474d954636d990920… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Mon Sep 27 00:49:42 2010 +0300 taskkill: Added Ukrainian translation. --- programs/taskkill/Makefile.in | 3 +- programs/taskkill/Uk.rc | 45 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletions(-) diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index 7af915e..dbb065c 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -14,6 +14,7 @@ RC_SRCS = \ Lt.rc \ Nl.rc \ Si.rc \ - Sv.rc + Sv.rc \ + Uk.rc @MAKE_PROG_RULES@ diff --git a/programs/taskkill/Uk.rc b/programs/taskkill/Uk.rc new file mode 100644 index 0000000..fe07a1e --- /dev/null +++ b/programs/taskkill/Uk.rc @@ -0,0 +1,45 @@ +/* + * Task termination utility + * Ukrainian language support + * + * Copyright 2010 Andrew Nguyen + * Copyright 2010 Igor Paliychuk + * + * 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 "taskkill.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Використання: taskkill [/?] [/f] [/im Ім'яПроцесу | /pid IDПроцесу]\n" + STRING_INVALID_OPTION, "Помилка: Вказана невідома чи невірна опція командного рядка.\n" + STRING_INVALID_PARAM, "Помилка: Вказано невірний параметр командного рядка.\n" + STRING_MISSING_OPTION, "Помилка: Повинна бути вказана одна з опцій /im чи /pid.\n" + STRING_MISSING_PARAM, "Помилка: Опція %s очікує параметр командного рядка.\n" + STRING_MUTUAL_EXCLUSIVE, "Помилка: Опції /im та /pid є взаємновиключними.\n" + STRING_CLOSE_PID_SEARCH, "Надіслано повідомлення закриття до вікон верхнього рівня процесу з PID %u.\n" + STRING_CLOSE_PROC_SRCH, "Надіслано повідомлення закриття до вікон верхнього рівня процесу \"%s\" з PID %u.\n" + STRING_TERM_PID_SEARCH, "Процес з PID %u був завершений примусово.\n" + STRING_TERM_PROC_SEARCH, "Процес \"%s\" з PID %u був завершений примусово.\n" + STRING_SEARCH_FAILED, "Помилка: Не вдалось знайти процес \"%s\".\n" + STRING_ENUM_FAILED, "Помилка: Неможливо перелічити список процесів.\n" + STRING_TERMINATE_FAILED, "Помилка: Не вдається завершити процес \"%s\".\n" +}

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

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

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

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

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

Hans Leidekker : msi: Avoid accessing memory before the left hand string in compare_substring.
by Alexandre Julliard 24 Sep '10

24 Sep '10

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