wine-devel May 2018

wine-devel@winehq.org

74 participants
631 discussions

Start a nNew thread

[website] German translation for release 3.5
by Julian Rüger 18 May '18

18 May '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 2.0.5
by Julian Rüger 18 May '18

18 May '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 3.4
by Julian Rüger 18 May '18

18 May '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation of the WineConf announcement
by Julian Rüger 18 May '18

18 May '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 2/2] mshtml: Expose IHTMLWindow7 interface to scripts.
by Jacek Caban 18 May '18

18 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 9 +++++++++ dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 11 insertions(+)

1 0

[PATCH 1/2] mshtml: Added IHTMLWindow7::innerWidth and innerHeight implementation.
by Jacek Caban 18 May '18

18 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)

1 0

[PATCH] po: Update Norwegian translation.
by Kim Malmo 18 May '18

18 May '18

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 64 +++++++++++++++-------------------------------------- 1 file changed, 18 insertions(+), 46 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b0912a7b42..ada37a6513 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-03-01 23:15+0100\n" +"PO-Revision-Date: 2018-05-18 13:47+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.4\n" +"X-Generator: Poedit 2.0.6\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -8514,10 +8514,8 @@ msgid "&Browse..." msgstr "&Bla..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Filtype" +msgstr "Filtype:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8528,16 +8526,12 @@ msgid "Size:" msgstr "Størrelse:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Dato opprettet" +msgstr "Dato opprettet:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Attributter:" +msgstr "Attributter:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8548,28 +8542,20 @@ msgid "&Archive" msgstr "&Arkiv" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Åpne:" +msgstr "Åpne med:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "Endre &ikon..." +msgstr "&Endre..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Endret" +msgstr "Sist endret:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Sist endret:" +msgstr "Siste tilgang:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -9181,38 +9167,28 @@ msgstr "" "Det er minst ett uspesifisert sikkerhetsproblem med dette sertifikatet." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Tidsavbrudd for tjenesteforespørsel.\n" +msgstr "Forespørselen ble tidsavbrutt.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "En skriverfeil har oppstått." +msgstr "En intern feil har oppstått.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Stien er ugyldig.\n" +msgstr "URL'en er ugyldig.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL-skjemaet ble ikke gjenkjent eller er ikke støttet.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Brukernavnet finnes ikke.\n" +msgstr "Tjenernavnet kunne ikke slåes opp.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Brukerprofilen er ugyldig.\n" +msgstr "Den forespurte operasjonen er ugyldig.\n" #: winineterror.mc:56 msgid "" @@ -9221,20 +9197,16 @@ msgid "" msgstr "" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Klarte ikke legge til profilen.\n" +msgstr "Det forespurte elementet kunne ikke lokaliseres.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Kan ikke koble til LDAP-tjeneren" +msgstr "Tilkoblingsforsøk til tjeneren mislyktes.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Tilkoblingen til tjeneren har blitt terminert.\n" #: winineterror.mc:76 msgid "" -- 2.17.0

1 0

[Resend PATCH v2 4/4] comctl32/taskdialog: Add support for timer.
by Zhiyi Zhang 18 May '18

18 May '18

Supersede 146124 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 25 ++++++++++++++++++++++++- dlls/comctl32/tests/taskdialog.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ba19ed51a6..f458e32002 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -48,10 +48,13 @@ static const UINT DIALOG_MIN_WIDTH = 240; static const UINT DIALOG_SPACING = 5; static const UINT DIALOG_BUTTON_WIDTH = 50; static const UINT DIALOG_BUTTON_HEIGHT = 14; +static const UINT DIALOG_TIMER_MS = 200; static const UINT ID_MAIN_INSTRUCTION = 0xf000; static const UINT ID_CONTENT = 0xf001; +static const UINT ID_TIMER = 1; + struct taskdialog_control { struct list entry; @@ -85,6 +88,7 @@ struct taskdialog_info { HWND hwnd; const TASKDIALOGCONFIG *taskconfig; + DWORD last_timer_tick; }; static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) @@ -533,6 +537,19 @@ static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD EndDialog(dialog_info->hwnd, command_id); } +static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + + dialog_info->hwnd = hwnd; + + if (taskconfig->dwFlags & TDF_CALLBACK_TIMER) + { + SetTimer(hwnd, ID_TIMER, DIALOG_TIMER_MS, NULL); + dialog_info->last_timer_tick = GetTickCount(); + } +} + static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { static const WCHAR taskdialog_info_propnameW[] = {'T','a','s','k','D','i','a','l','o','g','I','n','f','o',0}; @@ -550,8 +567,8 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; - dialog_info->hwnd = hwnd; SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); + taskdialog_init(dialog_info, hwnd); taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); break; @@ -568,9 +585,15 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_HELP: taskdialog_notify(dialog_info, TDN_HELP, 0, 0); break; + case WM_TIMER: + if (ID_TIMER == wParam + && taskdialog_notify(dialog_info, TDN_TIMER, GetTickCount() - dialog_info->last_timer_tick, 0) == S_FALSE) + dialog_info->last_timer_tick = GetTickCount(); + break; case WM_DESTROY: taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); RemovePropW(hwnd, taskdialog_info_propnameW); + if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER) KillTimer(dialog_info->hwnd, ID_TIMER); break; default: return FALSE; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index ad455554b2..932c330c8e 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -323,6 +323,37 @@ static void test_help(void) run_test(&info, IDOK, msg_got_tdn_help, "send f1"); } +static HRESULT CALLBACK taskdialog_callback_proc_timer(HWND hwnd, UINT notification, WPARAM wParam, LPARAM lParam, + LONG_PTR ref_data) +{ + DWORD elapsed_ms; + int delta; + static int last_elapsed_ms = 0; + static int fired_count = 0; + if (notification == TDN_TIMER) + { + if (++fired_count == 3) SendMessageW(hwnd, TDM_CLICK_BUTTON, IDOK, 0); + elapsed_ms = (DWORD)wParam; + delta = elapsed_ms - last_elapsed_ms; + ok(delta > 0, "Expect timer delta positive\n"); + last_elapsed_ms = elapsed_ms; + } + + return S_OK; +} + +static void test_timer(void) +{ + TASKDIALOGCONFIG info = {0}; + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc_timer; + info.dwFlags = TDF_CALLBACK_TIMER; + info.dwCommonButtons = TDCBF_OK_BUTTON; + + pTaskDialogIndirect(&info, NULL, NULL, NULL); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -360,6 +391,7 @@ START_TEST(taskdialog) test_callback(); test_buttons(); test_help(); + test_timer(); unload_v6_module(ctx_cookie, hCtx); } -- 2.17.0

1 0

[PATCH v2 3/4] comctl32/taskdialog: Add support for TDF_RTL_LAYOUT.
by Zhiyi Zhang 18 May '18

18 May '18

Supersedes 146031 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 73ec234f1a..ba19ed51a6 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -489,6 +489,7 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi template->style = DS_MODALFRAME | DS_SETFONT | WS_CAPTION | WS_VISIBLE | WS_SYSMENU; if (taskconfig->dwFlags & TDF_CAN_BE_MINIMIZED) template->style |= WS_MINIMIZEBOX; if (!(taskconfig->dwFlags & TDF_NO_SET_FOREGROUND)) template->style |= DS_SETFOREGROUND; + if (taskconfig->dwFlags & TDF_RTL_LAYOUT) template->dwExtendedStyle = WS_EX_LAYOUTRTL | WS_EX_RIGHT | WS_EX_RTLREADING; template->cdit = desc.control_count; template->x = (ref_rect.left + ref_rect.right + desc.dialog_width) / 2; template->y = (ref_rect.top + ref_rect.bottom + desc.dialog_height) / 2; -- 2.17.0

2 1

[PATCH v2 2/4] comctl32/taskdialog: Add support for TDF_NO_SET_FOREGROUND.
by Zhiyi Zhang 18 May '18

18 May '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 6471eac203..73ec234f1a 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -488,6 +488,7 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi template->style = DS_MODALFRAME | DS_SETFONT | WS_CAPTION | WS_VISIBLE | WS_SYSMENU; if (taskconfig->dwFlags & TDF_CAN_BE_MINIMIZED) template->style |= WS_MINIMIZEBOX; + if (!(taskconfig->dwFlags & TDF_NO_SET_FOREGROUND)) template->style |= DS_SETFOREGROUND; template->cdit = desc.control_count; template->x = (ref_rect.left + ref_rect.right + desc.dialog_width) / 2; template->y = (ref_rect.top + ref_rect.bottom + desc.dialog_height) / 2; -- 2.17.0

2 1

← Newer
1
...
26
27
28
29
30
31
32
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel May 2018