October 2016 - Wine-commits

Andrey Gusev : ext-ms-win-kernel32-package-current-l1-1-0: Add dll.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 0cf2dfd945e879044e67827f309860327cd1de18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf2dfd945e879044e67827f3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Oct 14 14:53:21 2016 +0300 ext-ms-win-kernel32-package-current-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in | 1 + .../ext-ms-win-kernel32-package-current-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index ce756df..8b981ed 100755 --- a/configure +++ b/configure @@ -1162,6 +1162,7 @@ enable_esent enable_evr enable_explorerframe enable_ext_ms_win_gdi_devcaps_l1_1_0 +enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_faultrep enable_fltlib enable_fltmgr_sys @@ -17916,6 +17917,7 @@ wine_fn_config_dll evr enable_evr wine_fn_config_dll explorerframe enable_explorerframe clean wine_fn_config_test dlls/explorerframe/tests explorerframe_test wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 +wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib diff --git a/configure.ac b/configure.ac index 8b67b2b..c624c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -3004,6 +3004,7 @@ WINE_CONFIG_DLL(evr) WINE_CONFIG_DLL(explorerframe,,[clean]) WINE_CONFIG_TEST(dlls/explorerframe/tests) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) diff --git a/dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in b/dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in new file mode 100644 index 0000000..85b8b31 --- /dev/null +++ b/dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-kernel32-package-current-l1-1-0.dll diff --git a/dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec b/dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec new file mode 100644 index 0000000..2156c27 --- /dev/null +++ b/dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId +@ stub GetCurrentPackageInfo diff --git a/tools/make_specfiles b/tools/make_specfiles index 4a2702f..b7b5a7b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -212,6 +212,7 @@ my @dll_groups = "api-ms-win-core-xstate-l2-1-0", "api-ms-win-core-errorhandling-l1-1-2", "api-ms-win-core-util-l1-1-0", + "ext-ms-win-kernel32-package-current-l1-1-0", ], [ "kernel32",

1 0

Alexandre Julliard : Release 1.9.21.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: eb5339edaca1c09d76b4afa32bdb07c1549e6650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5339edaca1c09d76b4afa32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 20:41:09 2016 +0200 Release 1.9.21. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 525 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 296 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb5339edaca1c09d76b4a…

1 0

Tag wine-1.9.21 : Alexandre Julliard : Release 1.9.21
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: refs/tags/wine-1.9.21 Tag: 79914b8b99ba1d017844c5996364042192dd60e5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=79914b8b99ba1d017844c5996364… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 20:41:09 2016 +0200 Release 1.9.21

1 0

Huw Davies : riched20: Initialize the remaining CHARFORMAT2 members.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 3ac78b763bd28fae0d08fc088433e9abc79610bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac78b763bd28fae0d08fc088… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 14 10:05:02 2016 +0100 riched20: Initialize the remaining CHARFORMAT2 members. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 6 ++++-- dlls/riched20/tests/editor.c | 17 +++++++++++++++++ dlls/riched20/tests/richole.c | 1 - 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index d94e213..f050b2e 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -52,11 +52,12 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) GetObjectW(hf, sizeof(LOGFONTW), &lf); ZeroMemory(&cf, sizeof(cf)); cf.cbSize = sizeof(cf); - cf.dwMask = CFM_BACKCOLOR|CFM_COLOR|CFM_FACE|CFM_SIZE|CFM_CHARSET; + cf.dwMask = CFM_ANIMATION|CFM_BACKCOLOR|CFM_CHARSET|CFM_COLOR|CFM_FACE|CFM_KERNING|CFM_LCID|CFM_OFFSET; + cf.dwMask |= CFM_REVAUTHOR|CFM_SIZE|CFM_SPACING|CFM_STYLE|CFM_UNDERLINETYPE|CFM_WEIGHT; cf.dwMask |= CFM_ALLCAPS|CFM_BOLD|CFM_DISABLED|CFM_EMBOSS|CFM_HIDDEN; cf.dwMask |= CFM_IMPRINT|CFM_ITALIC|CFM_LINK|CFM_OUTLINE|CFM_PROTECTED; cf.dwMask |= CFM_REVISED|CFM_SHADOW|CFM_SMALLCAPS|CFM_STRIKEOUT; - cf.dwMask |= CFM_SUBSCRIPT|CFM_UNDERLINETYPE|CFM_WEIGHT; + cf.dwMask |= CFM_SUBSCRIPT|CFM_UNDERLINE; cf.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; lstrcpyW(cf.szFaceName, lf.lfFaceName); @@ -69,6 +70,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) if (lf.lfStrikeOut) cf.dwEffects |= CFE_STRIKEOUT; cf.bPitchAndFamily = lf.lfPitchAndFamily; cf.bCharSet = lf.lfCharSet; + cf.lcid = GetSystemDefaultLCID(); style = ME_MakeStyle(&cf); text->pDefaultStyle = style; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 36e082e..8d7d209 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -764,11 +764,28 @@ static void test_EM_SETCHARFORMAT(void) CHARRANGE cr; LOCALESIGNATURE sig; BOOL rtl; + DWORD expect_effects; rtl = (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && (sig.lsUsb[3] & 0x08000000) != 0); + /* check charformat defaults */ + memset(&cf2, 0, sizeof(CHARFORMAT2A)); + cf2.cbSize = sizeof(CHARFORMAT2A); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2); + ok(cf2.dwMask == CFM_ALL2, "got %08x\n", cf2.dwMask); + expect_effects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; + if (cf2.wWeight > 550) expect_effects |= CFE_BOLD; + ok(cf2.dwEffects == expect_effects, "got %08x\n", cf2.dwEffects); + ok(cf2.yOffset == 0, "got %d\n", cf2.yOffset); + ok(cf2.sSpacing == 0, "got %d\n", cf2.sSpacing); + ok(cf2.lcid == GetSystemDefaultLCID(), "got %x\n", cf2.lcid); + ok(cf2.sStyle == 0, "got %d\n", cf2.sStyle); + ok(cf2.wKerning == 0, "got %d\n", cf2.wKerning); + ok(cf2.bAnimation == 0, "got %d\n", cf2.bAnimation); + ok(cf2.bRevAuthor == 0, "got %d\n", cf2.bRevAuthor); + /* Invalid flags, CHARFORMAT2 structure blanked out */ memset(&cf2, 0, sizeof(cf2)); rc = SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM)0xfffffff0, (LPARAM)&cf2); diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 6da3ce3..656eee1 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1741,7 +1741,6 @@ static void test_GetFont(void) value = 0; hr = ITextFont_GetLanguageID(font, &value); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(value == GetSystemDefaultLCID(), "got lcid %x, user lcid %x\n", value, GetSystemDefaultLCID());

1 0

Huw Davies : riched20: Fix the interaction between CFE_UNDERLINE and bUnderlineType.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: aa57db38dd9cf7afb903e39b64b7274b9e175a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa57db38dd9cf7afb903e39b6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 14 10:05:03 2016 +0100 riched20: Fix the interaction between CFE_UNDERLINE and bUnderlineType. The effect specifies whether underlining is turned on, while bUnderlineType indicates the type of underlining. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 29 +++++++++------- dlls/riched20/paint.c | 2 +- dlls/riched20/para.c | 3 +- dlls/riched20/run.c | 10 ------ dlls/riched20/style.c | 53 ++++++++--------------------- dlls/riched20/tests/editor.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/writer.c | 23 ++++++------- 7 files changed, 124 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa57db38dd9cf7afb903e…

1 0

Huw Davies : riched20: Incrementally update the character format.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 452c9a71249c461bb246164fb9fc4f386b6a9eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=452c9a71249c461bb246164fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 14 10:05:04 2016 +0100 riched20: Incrementally update the character format. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editstr.h | 21 -------- dlls/riched20/writer.c | 140 ++++++++++++++++++++++++++++++------------------ 2 files changed, 88 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=452c9a71249c461bb2461…

1 0

Huw Davies : riched20: Simplify call to ME_StreamOutRTFParaProps().
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: ee68e100b43955a00d21f3f1ccaa55080b245283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee68e100b43955a00d21f3f1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 14 10:05:05 2016 +0100 riched20: Simplify call to ME_StreamOutRTFParaProps(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index fa20215..d5563a1 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1012,7 +1012,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, const ME_Cursor *start, int nChars, int dwFormat) { ME_Cursor cursor = *start; - ME_DisplayItem *prev_para = cursor.pPara; + ME_DisplayItem *prev_para = NULL; ME_Cursor endCur = cursor; ME_MoveCursorChars(editor, &endCur, nChars, TRUE); @@ -1037,9 +1037,6 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, /* TODO: section formatting properties */ - if (!ME_StreamOutRTFParaProps(editor, pStream, cursor.pPara)) - return FALSE; - do { if (cursor.pPara != prev_para) {

1 0

Huw Davies : riched20: Remove the question marks from the generator string.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: a25c6f64b52654b4c9d99432d1596676f5994f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a25c6f64b52654b4c9d99432d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 14 10:05:06 2016 +0100 riched20: Remove the question marks from the generator string. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index d5563a1..44b9246 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1025,8 +1025,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, /* TODO: stylesheet table */ - /* FIXME: maybe emit something smarter for the generator? */ - if (!ME_StreamOutPrint(pStream, "{\\*\\generator Wine Riched20 2.0.????;}")) + if (!ME_StreamOutPrint(pStream, "{\\*\\generator Wine Riched20 2.0;}")) return FALSE; /* TODO: information group */

1 0

Huw Davies : riched20: Remove unnecessary spaces before carriage returns.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: 6e97ddc93039c23f65d4e4f4f7296a54cdcdc21b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e97ddc93039c23f65d4e4f4f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 14 10:05:07 2016 +0100 riched20: Remove unnecessary spaces before carriage returns. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 44b9246..baa2886 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -580,7 +580,7 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, if (!ME_StreamOutPrint(pStream, "\\nestrow}{\\nonesttables\\par}\r\n")) return FALSE; } else { - if (!ME_StreamOutPrint(pStream, "\\row \r\n")) + if (!ME_StreamOutPrint(pStream, "\\row\r\n")) return FALSE; } return TRUE; @@ -1078,7 +1078,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, cursor.pPara->member.para.fmt.wEffects & PFE_TABLE && !(cursor.pPara->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL))) { - if (!ME_StreamOutPrint(pStream, "\\row \r\n")) + if (!ME_StreamOutPrint(pStream, "\\row\r\n")) return FALSE; } else { if (!ME_StreamOutPrint(pStream, "\\par\r\n")) @@ -1087,7 +1087,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, /* Skip as many characters as required by current line break */ nChars = max(0, nChars - cursor.pRun->member.run.len); } else if (cursor.pRun->member.run.nFlags & MERF_ENDROW) { - if (!ME_StreamOutPrint(pStream, "\\line \r\n")) + if (!ME_StreamOutPrint(pStream, "\\line\r\n")) return FALSE; nChars--; } else {

1 0

Kim Malmo : po: Some more updates to Norwegian translation.
by Alexandre Julliard 14 Oct '16

14 Oct '16

Module: wine Branch: master Commit: c4c45dc5fe4f5f9a89bb2d1dcd37170c61a8a316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c45dc5fe4f5f9a89bb2d1dc… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Oct 14 09:58:02 2016 +0000 po: Some more updates to Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b52da32..46094df 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -10506,10 +10506,8 @@ msgid "IPv6 address" msgstr "IPv6-adresse" #: msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "Systemoppsett" +msgstr "Systeminformasjon" #: net.rc:30 msgid "" @@ -14584,36 +14582,32 @@ msgid "F&ormat" msgstr "F&ormat" #: wordpad.rc:85 -#, fuzzy -#| msgid "&List" msgid "&Lists" -msgstr "&Liste" +msgstr "&Lister" #: wordpad.rc:87 wordpad.rc:116 msgid "&Bullet points" msgstr "&Punktmerking" #: wordpad.rc:88 -#, fuzzy -#| msgid "CRL Number" msgid "Numbers" -msgstr "CRL-nummer" +msgstr "Numre" #: wordpad.rc:89 msgid "Letters - lower case" -msgstr "" +msgstr "Små bokstaver" #: wordpad.rc:90 msgid "Letters - upper case" -msgstr "" +msgstr "Store bokstaver" #: wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "" +msgstr "Små romertall" #: wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "" +msgstr "Store romertall" #: wordpad.rc:94 wordpad.rc:117 msgid "&Paragraph..."

1 0