October 2020 - Wine-commits

Austin English : dplaysvr: Add stub program.
by Alexandre Julliard 23 Oct '20

23 Oct '20

Module: wine Branch: master Commit: 73afd2648c003fbddb657fc8a3f8f53a86754dcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=73afd2648c003fbddb657fc8… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 20 04:02:01 2020 -0500 dplaysvr: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/dplaysvr/Makefile.in | 8 ++++++++ programs/dplaysvr/main.c | 33 +++++++++++++++++++++++++++++++++ programs/dplaysvr/version.rc | 26 ++++++++++++++++++++++++++ 5 files changed, 70 insertions(+) diff --git a/configure b/configure index 5672688a0d7..816e12f75ab 100755 --- a/configure +++ b/configure @@ -1760,6 +1760,7 @@ enable_conhost enable_control enable_cscript enable_dism +enable_dplaysvr enable_dpnsvr enable_dxdiag enable_eject @@ -21218,6 +21219,7 @@ wine_fn_config_makefile programs/conhost/tests enable_tests wine_fn_config_makefile programs/control enable_control wine_fn_config_makefile programs/cscript enable_cscript wine_fn_config_makefile programs/dism enable_dism +wine_fn_config_makefile programs/dplaysvr enable_dplaysvr wine_fn_config_makefile programs/dpnsvr enable_dpnsvr wine_fn_config_makefile programs/dxdiag enable_dxdiag wine_fn_config_makefile programs/eject enable_eject diff --git a/configure.ac b/configure.ac index a57697a0ddf..bd7acca29c6 100644 --- a/configure.ac +++ b/configure.ac @@ -3965,6 +3965,7 @@ WINE_CONFIG_MAKEFILE(programs/conhost/tests) WINE_CONFIG_MAKEFILE(programs/control) WINE_CONFIG_MAKEFILE(programs/cscript) WINE_CONFIG_MAKEFILE(programs/dism) +WINE_CONFIG_MAKEFILE(programs/dplaysvr) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dxdiag) WINE_CONFIG_MAKEFILE(programs/eject) diff --git a/programs/dplaysvr/Makefile.in b/programs/dplaysvr/Makefile.in new file mode 100644 index 00000000000..9c8eda44513 --- /dev/null +++ b/programs/dplaysvr/Makefile.in @@ -0,0 +1,8 @@ +MODULE = dplaysvr.exe + +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/programs/dplaysvr/main.c b/programs/dplaysvr/main.c new file mode 100644 index 00000000000..1de98684760 --- /dev/null +++ b/programs/dplaysvr/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2020 Austin English + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplaysvr); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/programs/dplaysvr/version.rc b/programs/dplaysvr/version.rc new file mode 100644 index 00000000000..4a84f681116 --- /dev/null +++ b/programs/dplaysvr/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dplaysvr" +#define WINE_FILENAME_STR "dplaysvr.exe" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : dpvsetup: Add stub program.
by Alexandre Julliard 23 Oct '20

23 Oct '20

Module: wine Branch: master Commit: 9b8188a96079de29d4fb10ccc44cc12d53bdacfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b8188a96079de29d4fb10cc… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 20 04:02:02 2020 -0500 dpvsetup: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/dpvsetup/Makefile.in | 8 ++++++++ programs/dpvsetup/main.c | 33 +++++++++++++++++++++++++++++++++ programs/dpvsetup/version.rc | 26 ++++++++++++++++++++++++++ 5 files changed, 70 insertions(+) diff --git a/configure b/configure index 816e12f75ab..1afc057f3e9 100755 --- a/configure +++ b/configure @@ -1762,6 +1762,7 @@ enable_cscript enable_dism enable_dplaysvr enable_dpnsvr +enable_dpvsetup enable_dxdiag enable_eject enable_expand @@ -21221,6 +21222,7 @@ wine_fn_config_makefile programs/cscript enable_cscript wine_fn_config_makefile programs/dism enable_dism wine_fn_config_makefile programs/dplaysvr enable_dplaysvr wine_fn_config_makefile programs/dpnsvr enable_dpnsvr +wine_fn_config_makefile programs/dpvsetup enable_dpvsetup wine_fn_config_makefile programs/dxdiag enable_dxdiag wine_fn_config_makefile programs/eject enable_eject wine_fn_config_makefile programs/expand enable_expand diff --git a/configure.ac b/configure.ac index bd7acca29c6..372785ee0fd 100644 --- a/configure.ac +++ b/configure.ac @@ -3967,6 +3967,7 @@ WINE_CONFIG_MAKEFILE(programs/cscript) WINE_CONFIG_MAKEFILE(programs/dism) WINE_CONFIG_MAKEFILE(programs/dplaysvr) WINE_CONFIG_MAKEFILE(programs/dpnsvr) +WINE_CONFIG_MAKEFILE(programs/dpvsetup) WINE_CONFIG_MAKEFILE(programs/dxdiag) WINE_CONFIG_MAKEFILE(programs/eject) WINE_CONFIG_MAKEFILE(programs/expand) diff --git a/programs/dpvsetup/Makefile.in b/programs/dpvsetup/Makefile.in new file mode 100644 index 00000000000..189da196c8c --- /dev/null +++ b/programs/dpvsetup/Makefile.in @@ -0,0 +1,8 @@ +MODULE = dpvsetup.exe + +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/programs/dpvsetup/main.c b/programs/dpvsetup/main.c new file mode 100644 index 00000000000..d72ede7e4ab --- /dev/null +++ b/programs/dpvsetup/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2020 Austin English + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpvsetup); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/programs/dpvsetup/version.rc b/programs/dpvsetup/version.rc new file mode 100644 index 00000000000..ed2ada993f9 --- /dev/null +++ b/programs/dpvsetup/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dpvsetup" +#define WINE_FILENAME_STR "dpvsetup.exe" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Alexandre Julliard : Release 5.20.
by Alexandre Julliard 23 Oct '20

23 Oct '20

Module: wine Branch: master Commit: 6373792eec0f122295723cae77b0115e6c96c3e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6373792eec0f122295723cae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 21:24:14 2020 +0200 Release 5.20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 933 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 454 insertions(+), 501 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6373792eec0f12229572…

1 0

Tag wine-5.20 : Alexandre Julliard : Release 5.20
by Alexandre Julliard 23 Oct '20

23 Oct '20

Module: wine Branch: refs/tags/wine-5.20 Tag: 9e85717088c324698e0e66b3eac2ec1239fc80b6 URL: https://source.winehq.org/git/wine.git/?a=tag;h=9e85717088c324698e0e66b3eac… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 21:24:14 2020 +0200 Release 5.20

1 0

Ziqing Hui : gdiplus/tests: Add tests for GdipMeasureString with StringFormatFlagsNoWrap.
by Alexandre Julliard 23 Oct '20

23 Oct '20

Module: wine Branch: master Commit: 3f228497a891fd135cbad4674f23afed0119fe72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f228497a891fd135cbad467… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Oct 23 10:22:00 2020 +0800 gdiplus/tests: Add tests for GdipMeasureString with StringFormatFlagsNoWrap. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 55 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 1dbb0ae279f..24fc91a1bfe 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4449,8 +4449,9 @@ static void test_measure_string(void) { static const WCHAR tahomaW[] = { 'T','a','h','o','m','a',0 }; static const WCHAR string[] = { 'A','0','1',0 }; + static const WCHAR string2[] = { 'M',' ','M','M',0 }; HDC hdc; - GpStringFormat *format; + GpStringFormat *format, *format_no_wrap; CharacterRange range; GpRegion *region; GpGraphics *graphics; @@ -4458,7 +4459,7 @@ static void test_measure_string(void) GpFont *font; GpStatus status; RectF bounds, rect; - REAL width, height, width_1, width_2; + REAL width, height, width_1, width_2, width_MM, width_M_M; REAL margin_x, margin_y, width_rgn, height_rgn; int lines, glyphs; @@ -4856,6 +4857,55 @@ todo_wine expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); + /* Measure "MM" */ + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureString(graphics, string2 + 2, 2, font, &rect, NULL, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(2, glyphs); + expect(1, lines); + width_MM = bounds.Width; + + /* Measure "M M" */ + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureString(graphics, string2, 3, font, &rect, NULL, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); + width_M_M = bounds.Width; + + /* With wrap */ + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_M_M; + rect.Height = 32000.0; + status = GdipMeasureString(graphics, string2, -1, font, &rect, NULL, &bounds, &glyphs, &lines); + expect(Ok, status); + expectf_(width_MM, bounds.Width, 0.1); + expect(4, glyphs); + expect(2, lines); + + /* Without wrap */ + status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format_no_wrap); + expect(Ok, status); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_M_M; + rect.Height = 32000.0; + status = GdipMeasureString(graphics, string2, -1, font, &rect, format_no_wrap, &bounds, &glyphs, &lines); + expect(Ok, status); + todo_wine { + expectf_(width_M_M, bounds.Width, 0.1); + expect(3, glyphs); + } + expect(1, lines); + status = GdipDeleteFont(font); expect(Ok, status); @@ -4866,6 +4916,7 @@ todo_wine GdipDeleteFontFamily(family); GdipDeleteRegion(region); GdipDeleteStringFormat(format); + GdipDeleteStringFormat(format_no_wrap); } static void test_measured_extra_space(void)

1 0

Ziqing Hui : gdiplus: Support StringFormatNoWrap for GdipMeasureString.
by Alexandre Julliard 23 Oct '20

23 Oct '20

Module: wine Branch: master Commit: c509060f52eb2c2e8f95111046c5010f9686eb31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c509060f52eb2c2e8f951110… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Oct 23 10:22:10 2020 +0800 gdiplus: Support StringFormatNoWrap for GdipMeasureString. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 190f45d64a2..291f6a94b9d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5270,7 +5270,7 @@ GpStatus gdip_format_string(HDC hdc, if(*(stringdup + sum + fit) == ' ') while(*(stringdup + sum + fit) == ' ') fit++; - else + else if (!(format->attr & StringFormatFlagsNoWrap)) while(*(stringdup + sum + fit - 1) != ' '){ fit--; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 24fc91a1bfe..d1022b1af5b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4900,10 +4900,8 @@ todo_wine rect.Height = 32000.0; status = GdipMeasureString(graphics, string2, -1, font, &rect, format_no_wrap, &bounds, &glyphs, &lines); expect(Ok, status); - todo_wine { expectf_(width_M_M, bounds.Width, 0.1); expect(3, glyphs); - } expect(1, lines); status = GdipDeleteFont(font);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 23 Oct '20

23 Oct '20

Module: wine Branch: master Commit: 3f2ff588bae7d580d8c726162c732f5e176b1f3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2ff588bae7d580d8c72616… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Oct 23 07:47:27 2020 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 150 +++++++++++++++++++-------------------------------------------- 1 file changed, 45 insertions(+), 105 deletions(-) diff --git a/po/fi.po b/po/fi.po index 6bfb480ee59..846a3149b1f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5025,11 +5025,11 @@ msgstr "DLL:n alustus epäonnistui.\n" #: dlls/kernel32/winerror.mc:1373 msgid "Shutdown in progress.\n" -msgstr "Sulkeminen meneillään.\n" +msgstr "Sammutus meneillään.\n" #: dlls/kernel32/winerror.mc:1378 msgid "No shutdown in progress.\n" -msgstr "Sulkeminen ei meneillään.\n" +msgstr "Ei sammutusta meneillään.\n" #: dlls/kernel32/winerror.mc:1383 msgid "I/O device error.\n" @@ -6924,16 +6924,12 @@ msgid "No Signature found in file.\n" msgstr "Tiedostosta ei löytynyt allekirjoitusta.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Taso ei kelpaa.\n" +msgstr "Kutsu ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Arvo ei saatavilla.\n" +msgstr "Resurssi ei ole nyt saatavilla.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7107,11 +7103,11 @@ msgstr "Objektia tai arvoa ei löydy.\n" #: dlls/mferror/mferror.mc:235 msgid "Value is not available.\n" -msgstr "Arvo ei saatavilla.\n" +msgstr "Arvo ei ole saatavilla.\n" #: dlls/mferror/mferror.mc:242 msgid "Clock is not available.\n" -msgstr "Kello ei saatavilla.\n" +msgstr "Kello ei ole saatavilla.\n" #: dlls/mferror/mferror.mc:263 msgid "Multiple subscribers are not supported.\n" @@ -10032,16 +10028,12 @@ msgid "Line Islands Daylight Time" msgstr "Linesaarten kesäaika" #: dlls/tzres/tzres.rc:90 -#, fuzzy -#| msgid "China Standard Time" msgid "Cuba Standard Time" -msgstr "Kiinan normaaliaika" +msgstr "Kuuban normaaliaika" #: dlls/tzres/tzres.rc:91 -#, fuzzy -#| msgid "China Daylight Time" msgid "Cuba Daylight Time" -msgstr "Kiinan kesäaika" +msgstr "Kuuban kesäaika" #: dlls/tzres/tzres.rc:134 msgid "Jordan Standard Time" @@ -10240,16 +10232,12 @@ msgid "US Eastern Daylight Time" msgstr "Itäinen kesäaika (USA)" #: dlls/tzres/tzres.rc:176 -#, fuzzy -#| msgid "Korea Standard Time" msgid "North Korea Standard Time" -msgstr "Korean normaaliaika" +msgstr "Pohjois-Korean normaaliaika" #: dlls/tzres/tzres.rc:177 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "North Korea Daylight Time" -msgstr "Korean kesäaika" +msgstr "Pohjois-Korean kesäaika" #: dlls/tzres/tzres.rc:212 msgid "Tasmania Standard Time" @@ -10564,16 +10552,12 @@ msgid "Egypt Daylight Time" msgstr "Egyptin kesäaika" #: dlls/tzres/tzres.rc:104 -#, fuzzy -#| msgid "Central Standard Time (Mexico)" msgid "Eastern Standard Time (Mexico)" -msgstr "Keskinen normaaliaika (Meksiko)" +msgstr "Itäinen normaaliaika (Meksiko)" #: dlls/tzres/tzres.rc:105 -#, fuzzy -#| msgid "Central Daylight Time (Mexico)" msgid "Eastern Daylight Time (Mexico)" -msgstr "Keskinen kesäaika (Meksiko)" +msgstr "Itäinen kesäaika (Meksiko)" #: dlls/tzres/tzres.rc:148 msgid "Mauritius Standard Time" @@ -10778,153 +10762,115 @@ msgstr "&Lisää ikkunoita..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Ylivuoto" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "Muisti ei riitä." +msgstr "Muisti ei riitä" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" -msgstr "" +msgstr "Tämä taulukko on kiinteä tai väliaikaisesti lukittu" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Tietotyyppi ei täsmää.\n" +msgstr "Tyyppi ei täsmää" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "I/O-laitteen virhe.\n" +msgstr "Laitteen I/O-virhe" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "Tiedosto on jo olemassa.\n" +msgstr "Tiedosto on jo olemassa" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "Levy täynnä.\n" +msgstr "Levy täynnä" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Liian monta avointa tiedostoa.\n" +msgstr "Liian monta tiedostoa" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "Pääsy estetty.\n" +msgstr "Pääsy estetty" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" -msgstr "" +msgstr "Polun-/tiedostonkäyttövirhe" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "Polkua ei löydy.\n" +msgstr "Polkua ei löydy" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy -#| msgid "(value not set)" msgid "Object variable not set" -msgstr "(arvoa ei asetettu)" +msgstr "Objektimuuttujaa ei ole asetettu" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "Annettu puskuri ei kelpaa.\n" +msgstr "Null-arvon käyttö ei kelpaa" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "Tarvittavaa väliaikaistiedostoa ei voida luoda" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "Automaatiopalvelin ei voi luoda objektia" +msgstr "ActiveX-komponentti ei voi luoda objektia" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "Objekti ei tue tätä toimintoa" +msgstr "Luokka ei tue automaatiota" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" -msgstr "" +msgstr "Tiedostonimeä tai luokan nimeä ei löydy automaatio-operaatiossa" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "Objekti ei tue tätä toimintoa" +msgstr "Objekti ei tue nimettyjä argumentteja" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" -msgstr "Objekti ei tue tätä toimintoa" +msgstr "Objekti ei tue nykyistä alueellista asetusta" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "Elementtiä ei löydy.\n" +msgstr "Nimettyä argumenttia ei löydy" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" -msgstr "" +msgstr "Väärä määrä argumentteja tai virhe ominaisuuden asettamisessa" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Objektiluokkarikkomus" +msgstr "Objekti ei ole kokoelma" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "Viestistä ei löytynyt määriteltyä kontrollia" +msgstr "Määriteltyä DLL-funktiota ei löydy" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" -msgstr "" +msgstr "Muuttuja käyttää automaatiotyyppiä, jota VBScript ei tue" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" -msgstr "" +msgstr "Etäpalvelinta ei ole tai se ei ole tavoitettavissa" #: dlls/vbscript/vbscript.rc:60 msgid "Invalid or unqualified reference" -msgstr "" +msgstr "Viallinen tai määrittämätön viittaus" #: dlls/vbscript/vbscript.rc:62 -#, fuzzy -#| msgid "Microsoft JScript compilation error" msgid "Microsoft VBScript compilation error" -msgstr "Microsoft JScript -käännösvirhe" +msgstr "Microsoft VBScript -käännösvirhe" #: dlls/vbscript/vbscript.rc:63 -#, fuzzy -#| msgid "Microsoft JScript runtime error" msgid "Microsoft VBScript runtime error" -msgstr "Microsoft JScript -suoritusvirhe" +msgstr "Microsoft VBScript -suoritusvirhe" #: dlls/winemac.drv/winemac.rc:33 msgid "Hide %@" @@ -11022,33 +10968,27 @@ msgstr "" #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "Voimaantulopäiväys" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "Turvallisuus" +msgstr "Salausprotokolla" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" msgstr "Allekirjoitus" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Tiedostojärjestelmän salaus" +msgstr "Salauksen tyyppi" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" -msgstr "" +msgstr "Yksityisyyden vahvuus" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "bittiä" #: dlls/wininet/winineterror.mc:26 msgid "The request has timed out.\n"

1 0

Hans Leidekker : wbemprox: Also return system properties from IWbemClassObject::GetNames.
by Alexandre Julliard 23 Oct '20

23 Oct '20

Module: wine Branch: master Commit: b1ceb7853cf0d7abe99fd917e65a22507795f7de URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ceb7853cf0d7abe99fd917… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 21:25:49 2020 +0200 wbemprox: Also return system properties from IWbemClassObject::GetNames. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50038 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 61 ++++++++++++++++++++++++++++++--------------- dlls/wbemprox/tests/query.c | 17 +++++++++++++ 2 files changed, 58 insertions(+), 20 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 525381d88d2..3d60825f24e 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1375,40 +1375,61 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR HRESULT get_properties( const struct view *view, UINT index, LONG flags, SAFEARRAY **props ) { + static const WCHAR * const system_props[] = + { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__SERVER", L"__NAMESPACE", L"__PATH" }; SAFEARRAY *sa; BSTR str; - UINT i, table_index, result_index, num_props; + UINT i, table_index, result_index, count = 0; struct table *table; HRESULT hr; - LONG j; + LONG j = 0; if ((hr = map_view_index( view, index, &table_index, &result_index )) != S_OK) return hr; - - num_props = count_result_properties( view, table_index ); - if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, num_props ))) return E_OUTOFMEMORY; - table = view->table[table_index]; - for (i = 0, j = 0; i < table->num_cols; i++) - { - BOOL is_system; - if (is_method( table, i )) continue; - if (!is_result_prop( view, table->columns[i].name )) continue; + if (!(flags & WBEM_FLAG_NONSYSTEM_ONLY)) count += ARRAY_SIZE(system_props); + if (!(flags & WBEM_FLAG_SYSTEM_ONLY)) + { + for (i = 0; i < table->num_cols; i++) + { + if (!is_method( table, i ) && is_result_prop( view, table->columns[i].name )) count++; + } + } - is_system = is_system_prop( table->columns[i].name ); - if ((flags & WBEM_FLAG_NONSYSTEM_ONLY) && is_system) continue; - else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue; + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, count ))) return E_OUTOFMEMORY; - str = SysAllocString( table->columns[i].name ); - if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + if (!(flags & WBEM_FLAG_NONSYSTEM_ONLY)) + { + for (j = 0; j < ARRAY_SIZE(system_props); j++) + { + str = SysAllocString( system_props[j] ); + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + { + SysFreeString( str ); + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } + SysFreeString( str ); + } + } + if (!(flags & WBEM_FLAG_SYSTEM_ONLY)) + { + for (i = 0; i < table->num_cols; i++) { + if (is_method( table, i ) || !is_result_prop( view, table->columns[i].name )) continue; + + str = SysAllocString( table->columns[i].name ); + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + { + SysFreeString( str ); + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } SysFreeString( str ); - SafeArrayDestroy( sa ); - return E_OUTOFMEMORY; + j++; } - SysFreeString( str ); - j++; } + *props = sa; return S_OK; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index d1ce42d64cb..7ba55dffdfb 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -460,6 +460,8 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) IWbemClassObject *process, *sig_in, *out; IWbemQualifierSet *qualifiers; VARIANT retval, val; + SAFEARRAY *names; + LONG bound, i; DWORD full_path_len = 0; LONG flavor; CIMTYPE type; @@ -484,6 +486,21 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) win_skip( "Win32_Process not available\n" ); return; } + names = NULL; + hr = IWbemClassObject_GetNames( process, NULL, 0, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( names != NULL, "names not set\n" ); + hr = SafeArrayGetUBound( names, 1, &bound ); + ok( hr == S_OK, "got %08x\n", hr ); + for (i = 0; i <= bound; i++) + { + BSTR str; + hr = SafeArrayGetElement( names, &i, &str ); + ok( hr == S_OK, "%d: got %08x\n", i, hr ); + SysFreeString( str ); + } + SafeArrayDestroy( names ); + sig_in = (void*)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, L"GetOwner", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr );

1 0

Hans Leidekker : wbemprox: Implement IWbemClassObject::GetMethodQualifierSet.
by Alexandre Julliard 23 Oct '20

23 Oct '20

Module: wine Branch: master Commit: 09e32f57b713a55bcb7487c1e1dff987d02438d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e32f57b713a55bcb7487c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 23 11:15:56 2020 +0200 wbemprox: Implement IWbemClassObject::GetMethodQualifierSet. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index e048fb3db82..d24d8cbb5ca 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -971,8 +971,11 @@ static HRESULT WINAPI class_object_GetMethodQualifierSet( LPCWSTR wszMethod, IWbemQualifierSet **ppQualSet) { - FIXME("%p, %s, %p\n", iface, debugstr_w(wszMethod), ppQualSet); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p, %s, %p\n", iface, debugstr_w(wszMethod), ppQualSet); + + return WbemQualifierSet_create( co->name, wszMethod, (void **)ppQualSet ); } static HRESULT WINAPI class_object_GetMethodOrigin(

1 0

Zebediah Figura : quartz/tests: Use compare_double() to test IBasicVideo::get_AvgTimePerFrame().
by Alexandre Julliard 23 Oct '20

23 Oct '20

Module: wine Branch: master Commit: f4b04e2e84e55d2e35d183c7c8a22b0a2e3bb9e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4b04e2e84e55d2e35d183c7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 22 15:16:42 2020 -0500 quartz/tests: Use compare_double() to test IBasicVideo::get_AvgTimePerFrame(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index f1b19aa6634..d7eafe53be8 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdint.h> #define COBJMACROS #include "dshow.h" #include "d3d9.h" @@ -65,6 +66,23 @@ static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TY && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); } +static BOOL compare_double(double f, double g, unsigned int ulps) +{ + uint64_t x = *(ULONGLONG *)&f; + uint64_t y = *(ULONGLONG *)&g; + + if (f < 0) + x = ~x + 1; + else + x |= ((ULONGLONG)1)<<63; + if (g < 0) + y = ~y + 1; + else + y |= ((ULONGLONG)1)<<63; + + return (x>y ? x-y : y-x) <= ulps; +} + static IFilterGraph2 *create_graph(void) { IFilterGraph2 *ret; @@ -2707,7 +2725,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime); + ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime); l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l);

1 0